projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20061003-1-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 1d48c5d8ac4759147b5a0414f668358aafb242cd..25bdd22b41086c82189de274f0d9cc67782c00a7 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
2
Artsoft Entertainment *
+* (c) 1995-200
6
Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
@@
-20,7
+20,7
@@
#include "events.h"
#include "config.h"
#include "events.h"
#include "config.h"
-Bitmap *bitmap_db_
title
;
+Bitmap *bitmap_db_
cross
;
Bitmap *bitmap_db_field;
Bitmap *bitmap_db_panel;
Bitmap *bitmap_db_door;
Bitmap *bitmap_db_field;
Bitmap *bitmap_db_panel;
Bitmap *bitmap_db_door;
@@
-68,10
+68,6
@@
short ExplodeDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-#if 0
-unsigned long Properties[MAX_NUM_ELEMENTS][NUM_EP_BITFIELDS];
-#endif
-
int GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@
-3699,43
+3695,43
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"growing wall (horizontal, BD style)"
},
{
"growing wall (horizontal, BD style)"
},
{
- "
last
_ce_8",
- "
last
_ce",
+ "
prev
_ce_8",
+ "
prev
_ce",
"CE 8 positions earlier in list"
},
{
"CE 8 positions earlier in list"
},
{
- "
last
_ce_7",
- "
last
_ce",
+ "
prev
_ce_7",
+ "
prev
_ce",
"CE 7 positions earlier in list"
},
{
"CE 7 positions earlier in list"
},
{
- "
last
_ce_6",
- "
last
_ce",
+ "
prev
_ce_6",
+ "
prev
_ce",
"CE 6 positions earlier in list"
},
{
"CE 6 positions earlier in list"
},
{
- "
last
_ce_5",
- "
last
_ce",
+ "
prev
_ce_5",
+ "
prev
_ce",
"CE 5 positions earlier in list"
},
{
"CE 5 positions earlier in list"
},
{
- "
last
_ce_4",
- "
last
_ce",
+ "
prev
_ce_4",
+ "
prev
_ce",
"CE 4 positions earlier in list"
},
{
"CE 4 positions earlier in list"
},
{
- "
last
_ce_3",
- "
last
_ce",
+ "
prev
_ce_3",
+ "
prev
_ce",
"CE 3 positions earlier in list"
},
{
"CE 3 positions earlier in list"
},
{
- "
last
_ce_2",
- "
last
_ce",
+ "
prev
_ce_2",
+ "
prev
_ce",
"CE 2 positions earlier in list"
},
{
"CE 2 positions earlier in list"
},
{
- "
last
_ce_1",
- "
last
_ce",
+ "
prev
_ce_1",
+ "
prev
_ce",
"CE 1 position earlier in list"
},
{
"CE 1 position earlier in list"
},
{
@@
-4664,6
+4660,9
@@
struct TokenIntPtrInfo image_config_vars[] =
{ "menu.list_size.SCORES", &menu.list_size[GFX_SPECIAL_ARG_SCORES] },
{ "menu.list_size.INFO", &menu.list_size[GFX_SPECIAL_ARG_INFO] },
{ "menu.list_size.SCORES", &menu.list_size[GFX_SPECIAL_ARG_SCORES] },
{ "menu.list_size.INFO", &menu.list_size[GFX_SPECIAL_ARG_INFO] },
+ { "menu.fade_delay", &menu.fade_delay },
+ { "menu.post_delay", &menu.post_delay },
+
{ "door_1.width", &door_1.width },
{ "door_1.height", &door_1.height },
{ "door_1.step_offset", &door_1.step_offset },
{ "door_1.width", &door_1.width },
{ "door_1.height", &door_1.height },
{ "door_1.step_offset", &door_1.step_offset },