mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-05 07:38:19 +00:00
Fixed win32 compile.
This commit is contained in:
parent
b3f5ce5482
commit
f6216e9a3a
BIN
other/icons/Teewars.ico
Normal file
BIN
other/icons/Teewars.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 25 KiB |
1
other/icons/teewars.rc
Normal file
1
other/icons/teewars.rc
Normal file
|
@ -0,0 +1 @@
|
|||
50h ICON "teewars.ico"
|
|
@ -1,6 +1,10 @@
|
|||
#ifndef _CONFIG_H
|
||||
#define _CONFIG_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"{
|
||||
#endif
|
||||
|
||||
typedef struct
|
||||
{
|
||||
#define MACRO_CONFIG_INT(name,def,min,max) int name;
|
||||
|
@ -29,4 +33,8 @@ void config_save(const char *filename);
|
|||
#undef MACRO_CONFIG_INT
|
||||
#undef MACRO_CONFIG_STR
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
|
@ -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()
|
||||
{
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue