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 c168a62b7d938d9d7c263b2f8cd547191677bf49..0bad3d3da7634e4e8efe0628362a5e5663e9e754 100644 (file)
--- 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"
@@ -10,17 +10,11 @@
 /* arbitrary maximum length of filenames (cos i am lazy) */
 #define MAXNAME 1024
 
-extern void snprintf_overflow(char *);
-
 extern int debug;
 extern char *progname;
 extern char *arg_basedir;
-extern char *arg_display;
-extern char *arg_geometry;
-extern int arg_install;
-extern int arg_silence;
 
-extern unsigned int frame;
+extern int frame;
 
 extern short ulaw_to_linear[256];
 extern unsigned char linear_to_ulaw[65536];
@@ -30,17 +24,19 @@ 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);
 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 *);
@@ -50,12 +46,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);