edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-12 19:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

compile fixes

Browse source
This commit is contained in:
Magnus Auvinen 2007-12-25 11:56:11 +00:00
parent cd6d5e6237
commit 5050c0ca4f
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/engine/client/ec_gfx.c
View file

@ -899,22 +899,22 @@ float gfx_text_raw(void *font_set_v, float x, float y, float size, const char *t
float fake_to_screen_y = (screen_height/(screen_y1-screen_y0)); float fake_to_screen_y = (screen_height/(screen_y1-screen_y0));
FONT *font; FONT *font;
int actual_size;
int i;
float draw_x;
// to correct coords, convert to screen coords, round, and convert back /* to correct coords, convert to screen coords, round, and convert back */
int actual_x = x * fake_to_screen_x; int actual_x = x * fake_to_screen_x;
int actual_y = y * fake_to_screen_y; int actual_y = y * fake_to_screen_y;
x = actual_x / fake_to_screen_x; x = actual_x / fake_to_screen_x;
y = actual_y / fake_to_screen_y; y = actual_y / fake_to_screen_y;
// same with size /* same with size */
int actual_size = size * fake_to_screen_y; actual_size = size * fake_to_screen_y;
size = actual_size / fake_to_screen_y; size = actual_size / fake_to_screen_y;
font = font_set_pick(font_set, actual_size); font = font_set_pick(font_set, actual_size);
int i;
float draw_x;
if (length < 0) if (length < 0)
length = strlen(text); length = strlen(text);
@ -1052,8 +1052,8 @@ float gfx_pretty_text_raw(float x, float y, float size, const char *text_, int l
void gfx_pretty_text(float x, float y, float size, const char *text, int max_width) void gfx_pretty_text(float x, float y, float size, const char *text, int max_width)
{ {
//gfx_text(gfx_font_set, x, y, 0.8*size, text, max_width); /*gfx_text(gfx_font_set, x, y, 0.8*size, text, max_width);
//return; return;*/
if(max_width == -1) if(max_width == -1)
gfx_pretty_text_raw(x, y, size, text, -1); gfx_pretty_text_raw(x, y, size, text, -1);
else else
@ -1078,7 +1078,7 @@ void gfx_pretty_text(float x, float y, float size, const char *text, int max_wid
float gfx_pretty_text_width(float size, const char *text_, int length) float gfx_pretty_text_width(float size, const char *text_, int length)
{ {
//return gfx_text_width(gfx_font_set, 0.8*size, text_, length); /*return gfx_text_width(gfx_font_set, 0.8*size, text_, length);*/
const float spacing = 0.05f; const float spacing = 0.05f;
float w = 0.0f; float w = 0.0f;

1
src/engine/client/ec_ui.c
View file

@ -275,4 +275,3 @@ void ui_margin(const struct rect *original, int pixels, struct rect *other_rect)
other_rect->w = r.w - 2*pixels; other_rect->w = r.w - 2*pixels;
other_rect->h = r.h - 2*pixels; other_rect->h = r.h - 2*pixels;
} }

2
src/engine/e_snapshot.c
View file

@ -427,7 +427,7 @@ void snapstorage_purge_until(SNAPSTORAGE *ss, int tick)
return; /* no more to remove */ return; /* no more to remove */
mem_free(h); mem_free(h);
// did we come to the end of the list? /* did we come to the end of the list? */
if (!next) if (!next)
break; break;

3
src/game/client/gc_client.cpp
View file

@ -3066,6 +3066,9 @@ extern "C" int modc_snap_input(int *data)
{ {
input_data.target_x = (int)mouse_pos.x; input_data.target_x = (int)mouse_pos.x;
input_data.target_y = (int)mouse_pos.y; input_data.target_y = (int)mouse_pos.y;
if(!input_data.target_x && !input_data.target_y)
input_data.target_y = 1;
} }
input_target_lock = 0; input_target_lock = 0;

2
src/game/client/gc_menu.cpp
View file

@ -1848,8 +1848,6 @@ void menu_do_connected()
void menu_init() void menu_init()
{ {
int i;
if(config.cl_show_welcome) if(config.cl_show_welcome)
popup = POPUP_FIRST_LAUNCH; popup = POPUP_FIRST_LAUNCH;
config.cl_show_welcome = 0; config.cl_show_welcome = 0;