diff options
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/client/menu.cpp | 7 | ||||
| -rw-r--r-- | src/game/game.h | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/game/client/menu.cpp b/src/game/client/menu.cpp index a106df91..dbcf60ba 100644 --- a/src/game/client/menu.cpp +++ b/src/game/client/menu.cpp @@ -126,6 +126,9 @@ void draw_box(int box_type, gui_tileset_enum tileset, float x, float y, float w, draw_area(tileset, cx, cy, dx-cx, dy-cy, x+w-(dx-cx), y+h-(dy-cy), dx-cx, dy-cy); } +extern "C" +{ + struct pretty_font { float m_CharStartTable[256]; @@ -135,6 +138,8 @@ struct pretty_font extern pretty_font *current_font; +} + extern void render_sun(float x, float y); extern void select_sprite(int id, int flags=0, int sx=0, int sy=0); extern void draw_sprite(float x, float y, float size); @@ -1263,7 +1268,7 @@ static int ingame_main_render() return 0; } -extern double extra_kerning[256*256]; +extern "C" double extra_kerning[256*256]; static int kerning_render() { diff --git a/src/game/game.h b/src/game/game.h index d3b491fc..4fa22c08 100644 --- a/src/game/game.h +++ b/src/game/game.h @@ -109,7 +109,7 @@ inline bool col_check_point(vec2 p) { return col_check_point(p.x, p.y); } struct mapres_entity { int x, y; - int data[]; + int *data; }; struct mapres_spawnpoint |