projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19980810
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 0c9d1f18ec99041ea7205fc22e8297175b13ea15..9918892c00c6b7c814775755132fc82d0ec4a0cf 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-16,6
+16,7
@@
#include "init.h"
#include "events.h"
#include "sound.h"
#include "init.h"
#include "events.h"
#include "sound.h"
+#include "joystick.h"
Display *display;
int screen;
Display *display;
int screen;
@@
-23,8
+24,12
@@
Window window;
GC gc, clip_gc[NUM_PIXMAPS];
Pixmap pix[NUM_PIXMAPS];
Pixmap clipmask[NUM_PIXMAPS];
GC gc, clip_gc[NUM_PIXMAPS];
Pixmap pix[NUM_PIXMAPS];
Pixmap clipmask[NUM_PIXMAPS];
+
+#ifdef XPM_INCLUDE_FILE
XpmAttributes xpm_att[NUM_PICTURES];
XpmAttributes xpm_att[NUM_PICTURES];
-Drawable drawto, drawto_field, backbuffer;
+#endif
+
+Drawable drawto, drawto_field, backbuffer, fieldbuffer;
Colormap cmap;
int sound_pipe[2];
Colormap cmap;
int sound_pipe[2];
@@
-75,9
+80,12
@@
long Elementeigenschaften[MAX_ELEMENTS];
int level_nr, leveldir_nr, num_leveldirs;
int lev_fieldx,lev_fieldy, scroll_x,scroll_y;
int level_nr, leveldir_nr, num_leveldirs;
int lev_fieldx,lev_fieldy, scroll_x,scroll_y;
-int LevelSolved,GameOver, JX,JY, ZX,ZY;
+int JX,JY, JX2,JY2, ZX,ZY, ExitX,ExitY;
+int PlayerMovDir, PlayerMovPos, PlayerFrame, PlayerPushing;
+int PlayerGone,LevelSolved,GameOver;
int FrameCounter,TimeFrames,TimeLeft,Score;
int FrameCounter,TimeFrames,TimeLeft,Score;
-int Gems,SokobanFields,Lights,Dynamite,Key[4],MampferNr;
+int Gems,SokobanFields,Lights,Friends;
+int Dynamite,Key[4],MampferNr;
int DynaBombCount, DynaBombSize, DynaBombsLeft, DynaBombXL;
int SiebAktiv;
int DynaBombCount, DynaBombSize, DynaBombsLeft, DynaBombXL;
int SiebAktiv;