X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fglobal.h;h=b3c5ceaa266ae529f0895d2fcc123297b210d924;hb=f13a8935ca1a7eeb3406d02f49b2df1490504017;hp=88c6a5e22f5f55046161abf07eacd95520cadba0;hpb=2c89261a1186ffc19bd6e5f82e9369bee1545e2f;p=rocksndiamonds.git

diff --git a/src/game_em/global.h b/src/game_em/global.h
index 88c6a5e2..b3c5ceaa 100644
--- a/src/game_em/global.h
+++ b/src/game_em/global.h
@@ -1,7 +1,7 @@
 #ifndef GLOBAL_H
 #define GLOBAL_H
 
-#include "game_em.h"
+#include "main_em.h"
 
 #define EM_GFX_DIR	"graphics.EM"
 #define EM_SND_DIR	"sounds.EM"
@@ -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,7 +24,7 @@ extern unsigned char linear_to_ulaw[65536];
 int open_all(void);
 void close_all(void);
 
-void readjoy(byte);
+void readjoy(byte, struct PLAYER *);
 void input_eventloop(void);
 
 void blitscreen(void);
@@ -35,7 +35,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 *);
@@ -45,12 +44,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);