projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020324-1-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 0ef3af3bf416752680d24a6bf2b7bc030059b613..8533d336d74f9b5479151118d3a12a00f2668bc7 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-1,7
+1,7
@@
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-200
0
Artsoft Entertainment *
+* (c) 1995-200
1
Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
@@
-17,7
+17,6
@@
#include "init.h"
#include "game.h"
#include "events.h"
#include "init.h"
#include "game.h"
#include "events.h"
-#include "joystick.h"
GC tile_clip_gc;
Bitmap *pix[NUM_BITMAPS];
GC tile_clip_gc;
Bitmap *pix[NUM_BITMAPS];
@@
-25,22
+24,11
@@
Pixmap tile_clipmask[NUM_TILES];
DrawBuffer *fieldbuffer;
DrawBuffer *drawto_field;
DrawBuffer *fieldbuffer;
DrawBuffer *drawto_field;
-int joystick_device = 0;
-char *joystick_device_name[MAX_PLAYERS] =
-{
- DEV_JOYSTICK_0,
- DEV_JOYSTICK_1,
- DEV_JOYSTICK_2,
- DEV_JOYSTICK_3
-};
-
int game_status = MAINMENU;
boolean level_editor_test_game = FALSE;
boolean network_playing = FALSE;
int key_joystick_mapping = 0;
int game_status = MAINMENU;
boolean level_editor_test_game = FALSE;
boolean network_playing = FALSE;
int key_joystick_mapping = 0;
-int global_joystick_status = JOYSTICK_STATUS;
-int joystick_status = JOYSTICK_STATUS;
boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
int redraw_x1 = 0, redraw_y1 = 0;
boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
int redraw_x1 = 0, redraw_y1 = 0;
@@
-58,10
+46,10
@@
boolean Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
short JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
+short ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
unsigned long Elementeigenschaften1[MAX_ELEMENTS];
unsigned long Elementeigenschaften2[MAX_ELEMENTS];
unsigned long Elementeigenschaften1[MAX_ELEMENTS];
unsigned long Elementeigenschaften2[MAX_ELEMENTS];
-int level_nr;
int lev_fieldx,lev_fieldy, scroll_x,scroll_y;
int FX = SX, FY = SY, ScrollStepSize;
int lev_fieldx,lev_fieldy, scroll_x,scroll_y;
int FX = SX, FY = SY, ScrollStepSize;
@@
-273,7
+261,7
@@
char *element_info[] =
"normal wall (BD style)",
"rock (BD style)",
"open exit",
"normal wall (BD style)",
"rock (BD style)",
"open exit",
- "
unknown
",
+ "
black orb bomb
",
"amoeba",
"mole", /* 110 */
"penguin",
"amoeba",
"mole", /* 110 */
"penguin",
@@
-284,7
+272,7
@@
char *element_info[] =
"arrow down",
"pig",
"fire breathing dragon",
"arrow down",
"pig",
"fire breathing dragon",
- "
unknown
",
+ "
red key (EM style)
",
"letter ' '", /* 120 */
"letter '!'",
"letter '\"'",
"letter ' '", /* 120 */
"letter '!'",
"letter '\"'",
@@
-368,13
+356,13
@@
char *element_info[] =
"growing wall (horizontal)", /* 200 */
"growing wall (vertical)",
"growing wall (all directions)",
"growing wall (horizontal)", /* 200 */
"growing wall (vertical)",
"growing wall (all directions)",
- "
unused
",
- "
unused
",
- "
unused
",
- "
unused
",
- "
unused
",
- "
unused
",
- "
unused
",
+ "
red door (EM style)
",
+ "
yellow door (EM style)
",
+ "
green door (EM style)
",
+ "
blue door (EM style)
",
+ "
yellow key (EM style)
",
+ "
green key (EM style)
",
+ "
blue key (EM style)
",
"empty space", /* 210 */
"zonk",
"base",
"empty space", /* 210 */
"zonk",
"base",
@@
-415,10
+403,10
@@
char *element_info[] =
"hardware",
"chip (upper half)",
"chip (lower half)",
"hardware",
"chip (upper half)",
"chip (lower half)",
- "
unknown",
/* 250 */
- "
unknown
",
- "
unknown
",
- "
unknown
",
+ "
gray door (EM style, red key)",
/* 250 */
+ "
gray door (EM style, yellow key)
",
+ "
gray door (EM style, green key)
",
+ "
gray door (EM style, blue key)
",
"unknown",
"unknown",
"unknown",
"unknown",