X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fglobal.h;h=2da0ec8eb61a19c265d343d36ade15105a8146d3;hb=61c3da024802ecc0268bab42d7499fc0346e4fd3;hp=bf4d26ed1af9a3cfeb8b77ca4b76aedaf610b4eb;hpb=9583e9c55b889974e0df9a8ca1930efdf29bda29;p=rocksndiamonds.git

diff --git a/src/game_em/global.h b/src/game_em/global.h
index bf4d26ed..2da0ec8e 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,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,18 +28,23 @@ 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);
 void game_initscreen(void);
 void game_animscreen(void);
 
+void DrawGameDoorValues_EM();
+
 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 +54,12 @@ void synchro_1(void);
 void synchro_2(void);
 void synchro_3(void);
 
-boolean cleanup_em_level(unsigned char *src, int *length);
-void    convert_em_level(unsigned char *src);
-void    prepare_em_level(void);
+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 *name, short **data, long *length);
+int read_sample(char *, short **, int *);
 
 void read_cave_list(void);
 void free_cave_list(void);