diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 341322ca3..c77da52a1 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -271,29 +271,29 @@ inline void G_SetStatusBarScale(int32_t sc) G_UpdateScreenArea(); } -static inline int32_t sbarx(int32_t x) +static int32_t sbarx(int32_t x) { if (ud.screen_size == 4 /*|| ud.statusbarmode == 1*/) return scale(x<<16,ud.statusbarscale,100); return (((320l<<16) - scale(320l<<16,ud.statusbarscale,100)) >> 1) + scale(x<<16,ud.statusbarscale,100); } -static inline int32_t sbarxr(int32_t x) +static int32_t sbarxr(int32_t x) { if (ud.screen_size == 4 /*|| ud.statusbarmode == 1*/) return (320l<<16) - scale(x<<16,ud.statusbarscale,100); return (((320l<<16) - scale(320l<<16,ud.statusbarscale,100)) >> 1) + scale(x<<16,ud.statusbarscale,100); } -static inline int32_t sbary(int32_t y) +static int32_t sbary(int32_t y) { return ((200l<<16) - scale(200l<<16,ud.statusbarscale,100) + scale(y<<16,ud.statusbarscale,100)); } -static inline int32_t sbarsc(int32_t sc) +static int32_t sbarsc(int32_t sc) { return scale(sc,ud.statusbarscale,100); } -static inline int32_t textsc(int32_t sc) +static int32_t textsc(int32_t sc) { // prevent ridiculousness to a degree if (xdim <= 320) return sc; @@ -498,7 +498,7 @@ int32_t G_GameTextLen(int32_t x,const char *t) return (textsc(x)); } -inline int32_t mpgametext(int32_t y,const char *t,int32_t s,int32_t dabits) +int32_t mpgametext(int32_t y,const char *t,int32_t s,int32_t dabits) { return(G_PrintGameText(4,STARTALPHANUM, 5,y,t,s,0,dabits,0, 0, xdim-1, ydim-1, 65536)); } diff --git a/polymer/eduke32/source/game.h b/polymer/eduke32/source/game.h index bccbef92b..370055346 100644 --- a/polymer/eduke32/source/game.h +++ b/polymer/eduke32/source/game.h @@ -257,7 +257,7 @@ int32_t _EnterText(int32_t small,int32_t x,int32_t y,char *t,int32_t dalen,int32 int32_t kopen4loadfrommod(const char *filename,char searchfirst); char * defaultconfile(void); int32_t minitext_(int32_t x,int32_t y,const char *t,int32_t s,int32_t p,int32_t sb); -extern inline int32_t mpgametext(int32_t y,const char *t,int32_t s,int32_t dabits); +int32_t mpgametext(int32_t y,const char *t,int32_t s,int32_t dabits); int32_t startwin_run(void); #ifdef YAX_ENABLE diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c index 16be1dd39..a520ec6d4 100644 --- a/polymer/eduke32/source/gamedef.c +++ b/polymer/eduke32/source/gamedef.c @@ -1276,7 +1276,7 @@ static int32_t C_SetScriptSize(int32_t newsize) return 0; } -static inline int32_t ispecial(const char c) +static int32_t ispecial(const char c) { if (c == ' ' || c == 0x0d || c == '(' || c == ')' || c == ',' || c == ';' || (c == 0x0a /*&& ++g_lineNumber*/)) @@ -1355,7 +1355,7 @@ static int32_t C_SkipComments(void) #define GetDefID(szGameLabel) hash_find(&h_gamevars,szGameLabel) #define GetADefID(szGameLabel) hash_find(&h_arrays,szGameLabel) -static inline int32_t isaltok(const char c) +static int32_t isaltok(const char c) { return (isalnum(c) || c == '{' || c == '}' || c == '/' || c == '\\' || c == '*' || c == '-' || c == '_' || c == '.'); diff --git a/polymer/eduke32/source/m32def.c b/polymer/eduke32/source/m32def.c index 3553b3f82..5fb7d2ffa 100644 --- a/polymer/eduke32/source/m32def.c +++ b/polymer/eduke32/source/m32def.c @@ -658,12 +658,12 @@ static int32_t C_SetScriptSize(int32_t size) return 0; } -static inline int32_t char_whitespace(char c) +static int32_t char_whitespace(char c) { return c==' ' || c=='\t' || c=='\n' || c=='\r' || c=='(' || c==')' || c==',' || c==';'; } -static inline int32_t char_alnumtok(char c) +static int32_t char_alnumtok(char c) { return isalnum(c) || c == '#' || c == '{' || c == '}' || c == '/' || c == '\\' || c == '*' || c == '-' || c == '_' || c == '.' || c == '"';