X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fglobal.h;h=2da0ec8eb61a19c265d343d36ade15105a8146d3;hb=358fe8d37855c22ee5ee4e24d486757500043178;hp=2d30f24ecc522297252bfab894fb4241d6685cef;hpb=2d235297197dd0c325184f7fc401d9c5c41c2616;p=rocksndiamonds.git

diff --git a/src/game_em/global.h b/src/game_em/global.h
index 2d30f24e..2da0ec8e 100644
--- a/src/game_em/global.h
+++ b/src/game_em/global.h
@@ -14,7 +14,11 @@ extern int debug;
 extern char *progname;
 extern char *arg_basedir;
 
-extern unsigned int frame;
+#if 0
+extern int TILEX, TILEY;
+#endif
+
+extern int frame;
 
 extern short ulaw_to_linear[256];
 extern unsigned char linear_to_ulaw[65536];
@@ -24,7 +28,11 @@ 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);
@@ -37,7 +45,6 @@ void play_sound(int, int, int);
 void sound_play(void);
 
 int cave_convert(char *);
-boolean LoadNativeLevel_EM(char *);
 
 void game_init_vars(void);
 void game_play_init(int, char *);
@@ -47,12 +54,12 @@ void synchro_1(void);
 void synchro_2(void);
 void synchro_3(void);
 
-int  cleanup_em_level(unsigned char *, int);
+int  cleanup_em_level(unsigned char *, int, char *);
 void convert_em_level(unsigned char *, int);
 void prepare_em_level(void);
 
 int sound_thread(void);
-int read_sample(char *, short **, long *);
+int read_sample(char *, short **, int *);
 
 void read_cave_list(void);
 void free_cave_list(void);