summaryrefslogtreecommitdiff
path: root/apps/plugins/sdl/progs/wolf3d/wl_def.h
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-04-04 20:24:33 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-04-11 19:29:47 +0200
commite28d1fe91671f64ce30d6e439787a48d71de5616 (patch)
treef787aaac6e894abf7e3f4144cd1b827e65db673d /apps/plugins/sdl/progs/wolf3d/wl_def.h
parent2ad6c3438e53ddaa80c0aa43e995376495ce1a77 (diff)
downloadrockbox-e28d1fe91671f64ce30d6e439787a48d71de5616.tar.gz
rockbox-e28d1fe91671f64ce30d6e439787a48d71de5616.zip
SDL: Silence a large number of compile warnings (WIP)
There are some real bugs in here, but we're drowning in warnings. Change-Id: I7c2c0eafc8426327521bdd8a3ac2d3742ac16864
Diffstat (limited to 'apps/plugins/sdl/progs/wolf3d/wl_def.h')
-rw-r--r--apps/plugins/sdl/progs/wolf3d/wl_def.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/plugins/sdl/progs/wolf3d/wl_def.h b/apps/plugins/sdl/progs/wolf3d/wl_def.h
index af74a5315c..63cd22f4e8 100644
--- a/apps/plugins/sdl/progs/wolf3d/wl_def.h
+++ b/apps/plugins/sdl/progs/wolf3d/wl_def.h
@@ -961,7 +961,7 @@ void DrawPlayBorder (void);
961void DrawStatusBorder (byte color); 961void DrawStatusBorder (byte color);
962void DrawPlayScreen (void); 962void DrawPlayScreen (void);
963void DrawPlayBorderSides (void); 963void DrawPlayBorderSides (void);
964void ShowActStatus(); 964void ShowActStatus(void);
965 965
966void PlayDemo (int demonumber); 966void PlayDemo (int demonumber);
967void RecordDemo (void); 967void RecordDemo (void);
@@ -1372,7 +1372,7 @@ void GP2X_ButtonUp(int button);
1372============================================================================= 1372=============================================================================
1373*/ 1373*/
1374 1374
1375static fixed FixedMul(fixed a, fixed b) 1375static inline fixed FixedMul(fixed a, fixed b)
1376{ 1376{
1377 return (fixed)(((int64_t)a * b + 0x8000) >> 16); 1377 return (fixed)(((int64_t)a * b + 0x8000) >> 16);
1378} 1378}
@@ -1394,13 +1394,13 @@ static fixed FixedMul(fixed a, fixed b)
1394 1394
1395#define CHECKMALLOCRESULT(x) if(!(x)) Quit("Out of memory at %s:%i", __FILE__, __LINE__) 1395#define CHECKMALLOCRESULT(x) if(!(x)) Quit("Out of memory at %s:%i", __FILE__, __LINE__)
1396 1396
1397static char* itoa(int value, char* string, int radix) 1397static inline char* itoa(int value, char* string, int radix)
1398{ 1398{
1399 sprintf(string, "%d", value); 1399 sprintf(string, "%d", value);
1400 return string; 1400 return string;
1401} 1401}
1402 1402
1403static char* ltoa(long value, char* string, int radix) 1403static inline char* ltoa(long value, char* string, int radix)
1404{ 1404{
1405 sprintf(string, "%ld", value); 1405 sprintf(string, "%ld", value);
1406 return string; 1406 return string;
@@ -1409,14 +1409,14 @@ static char* ltoa(long value, char* string, int radix)
1409#define lengthof(x) (sizeof(x) / sizeof(*(x))) 1409#define lengthof(x) (sizeof(x) / sizeof(*(x)))
1410#define endof(x) ((x) + lengthof(x)) 1410#define endof(x) ((x) + lengthof(x))
1411 1411
1412static word READWORD(byte **ptr) 1412static inline word READWORD(byte **ptr)
1413{ 1413{
1414 word val = (*ptr)[0] | (*ptr)[1] << 8; 1414 word val = (*ptr)[0] | (*ptr)[1] << 8;
1415 *ptr += 2; 1415 *ptr += 2;
1416 return val; 1416 return val;
1417} 1417}
1418 1418
1419static longword READLONGWORD(byte **ptr) 1419static inline longword READLONGWORD(byte **ptr)
1420{ 1420{
1421 longword val = (*ptr)[0] | (*ptr)[1] << 8 | (*ptr)[2] << 16 | (*ptr)[3] << 24; 1421 longword val = (*ptr)[0] | (*ptr)[1] << 8 | (*ptr)[2] << 16 | (*ptr)[3] << 24;
1422 *ptr += 4; 1422 *ptr += 4;
@@ -1454,7 +1454,7 @@ static longword READLONGWORD(byte **ptr)
1454 *************************************************************/ 1454 *************************************************************/
1455 1455
1456 // The feature flags are stored as a wall in the upper right corner of each level 1456 // The feature flags are stored as a wall in the upper right corner of each level
1457 static word GetFeatureFlags() 1457 static inline word GetFeatureFlags()
1458 { 1458 {
1459 return ffDataTopRight; 1459 return ffDataTopRight;
1460 } 1460 }