major cleanup of preprocessor hell

[rocksndiamonds.git] / src / game_em / global.h

diff --git a/src/game_em/global.h b/src/game_em/global.h
index 2da0ec8eb61a19c265d343d36ade15105a8146d3..0bad3d3da7634e4e8efe0628362a5e5663e9e754 100644 (file)
--- a/src/game_em/global.h
+++ b/src/game_em/global.h
@@ -14,10 +14,6 @@ extern int debug;
 extern char *progname;
 extern char *arg_basedir;
 
-#if 0
-extern int TILEX, TILEY;
-#endif
-
 extern int frame;
 
 extern short ulaw_to_linear[256];
@@ -28,11 +24,7 @@ extern unsigned char linear_to_ulaw[65536];
 int open_all(void);
 void close_all(void);
 
-#if 1
 void readjoy(byte, struct PLAYER *);
-#else
-void readjoy(byte);
-#endif
 void input_eventloop(void);
 
 void blitscreen(void);