ioquake/jedi-academy
0
0
Fork 0
mirror of https://github.com/ioquake/jedi-academy.git synced 2025-02-11 06:30:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

locally define min()/max() so there won't be unresolved symbols

Browse source
This commit is contained in:
Jonathan Gray 2013-04-26 03:49:22 +10:00
parent 80b273bbaa
commit ecd674b852
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
codemp/cgame/cg_players.c
View file

@ -5,6 +5,8 @@
#include "../ghoul2/G2.h" #include "../ghoul2/G2.h"
#include "../game/bg_saga.h" #include "../game/bg_saga.h"
#define max(x,y) ((x)>(y)?(x):(y))
extern vmCvar_t cg_thirdPersonAlpha; extern vmCvar_t cg_thirdPersonAlpha;
extern int cgSiegeTeam1PlShader; extern int cgSiegeTeam1PlShader;

4
codemp/ui/ui_main.c
View file

@ -21,6 +21,10 @@ USER INTERFACE MAIN
#include "../cgame/holocronicons.h" #include "../cgame/holocronicons.h"
#ifndef min
#define min(a, b) ((a) < (b) ? (a) : (b))
#endif
extern void UI_SaberAttachToChar( itemDef_t *item ); extern void UI_SaberAttachToChar( itemDef_t *item );
char *forcepowerDesc[NUM_FORCE_POWERS] = char *forcepowerDesc[NUM_FORCE_POWERS] =