X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgame_em%2Fglobal.h;h=0bad3d3da7634e4e8efe0628362a5e5663e9e754;hb=3ff2e8a0b5c27b99a9920bdf5ed82bc41bf40181;hp=1a6e77ada027f16d3a4aeb211b26a1a965960702;hpb=d4b0925a000fb490f5ade0feecdd4781fc8d0bd5;p=rocksndiamonds.git

diff --git a/src/game_em/global.h b/src/game_em/global.h
index 1a6e77ad..0bad3d3d 100644
--- a/src/game_em/global.h
+++ b/src/game_em/global.h
@@ -14,7 +14,7 @@ extern int debug;
 extern char *progname;
 extern char *arg_basedir;
 
-extern unsigned int frame;
+extern int frame;
 
 extern short ulaw_to_linear[256];
 extern unsigned char linear_to_ulaw[65536];
@@ -24,11 +24,7 @@ extern unsigned char linear_to_ulaw[65536];
 int open_all(void);
 void close_all(void);
 
-#if 1
-void readjoy(byte, int);
-#else
-void readjoy(byte);
-#endif
+void readjoy(byte, struct PLAYER *);
 void input_eventloop(void);
 
 void blitscreen(void);
@@ -41,7 +37,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 *);
@@ -51,12 +46,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);