projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed unneccessarily complex code
[rocksndiamonds.git]
/
src
/
game_mm
/
export.h
diff --git
a/src/game_mm/export.h
b/src/game_mm/export.h
index 07ebf934e92d01804b5ac6151de36a51b1fdba1a..7f31d68cdb2eeb741e6b8b06d5c166049997a12e 100644
(file)
--- a/
src/game_mm/export.h
+++ b/
src/game_mm/export.h
@@
-27,12
+27,14
@@
#define MM_LEVEL_SCORE_ELEMENTS 16
#define MM_LEVEL_SCORE_ELEMENTS 16
+#define MM_MAX_BALL_CONTENTS 16
+
#define MM_MAX_LEVEL_NAME_LEN 32
#define MM_MAX_LEVEL_AUTHOR_LEN 32
#define EL_MM_START_1_NATIVE 0
#define MM_MAX_LEVEL_NAME_LEN 32
#define MM_MAX_LEVEL_AUTHOR_LEN 32
#define EL_MM_START_1_NATIVE 0
-#define EL_MM_END_1_NATIVE 15
5
+#define EL_MM_END_1_NATIVE 15
9
#define EL_MM_CHAR_START_NATIVE 160
#define EL_MM_CHAR_END_NATIVE 239
#define EL_MM_CHAR_START_NATIVE 160
#define EL_MM_CHAR_END_NATIVE 239
@@
-43,9
+45,6
@@
#define EL_MM_RUNTIME_START_NATIVE 500
#define EL_MM_RUNTIME_END_NATIVE 504
#define EL_MM_RUNTIME_START_NATIVE 500
#define EL_MM_RUNTIME_END_NATIVE 504
-#define EL_MM_DUMMY_START_NATIVE 700
-#define EL_MM_DUMMY_END_NATIVE 709
-
// elements to be specially mapped
#define EL_MM_EMPTY_NATIVE 0
#define EL_DF_EMPTY_NATIVE 304
// elements to be specially mapped
#define EL_MM_EMPTY_NATIVE 0
#define EL_DF_EMPTY_NATIVE 304
@@
-115,6
+114,9
@@
struct LaserInfo
int fuse_x, fuse_y;
int dest_element;
int fuse_x, fuse_y;
int dest_element;
+ int dest_element_last;
+ int dest_element_last_x;
+ int dest_element_last_y;
boolean stops_inside_element;
boolean redraw;
boolean stops_inside_element;
boolean redraw;
@@
-138,6
+140,8
@@
struct GameInfo_MM
int kettles_still_needed;
int lights_still_needed;
int num_keys;
int kettles_still_needed;
int lights_still_needed;
int num_keys;
+ int ball_choice_pos; // current content element choice position
+ boolean laser_red, laser_green, laser_blue;
boolean level_solved;
boolean game_over;
boolean level_solved;
boolean game_over;
@@
-161,7
+165,8
@@
struct LevelInfo_MM
int time;
int kettles_needed;
boolean auto_count_kettles;
int time;
int kettles_needed;
boolean auto_count_kettles;
- boolean laser_red, laser_green, laser_blue;
+ boolean mm_laser_red, mm_laser_green, mm_laser_blue;
+ boolean df_laser_red, df_laser_green, df_laser_blue;
char name[MM_MAX_LEVEL_NAME_LEN + 1];
char author[MM_MAX_LEVEL_AUTHOR_LEN + 1];
int score[MM_LEVEL_SCORE_ELEMENTS];
char name[MM_MAX_LEVEL_NAME_LEN + 1];
char author[MM_MAX_LEVEL_AUTHOR_LEN + 1];
int score[MM_LEVEL_SCORE_ELEMENTS];
@@
-171,6
+176,11
@@
struct LevelInfo_MM
int time_ball;
int time_block;
int time_ball;
int time_block;
+ int num_ball_contents;
+ int ball_choice_mode;
+ int ball_content[MM_MAX_BALL_CONTENTS];
+ boolean rotate_ball_content;
+
short field[MAX_PLAYFIELD_WIDTH][MAX_PLAYFIELD_HEIGHT];
};
short field[MAX_PLAYFIELD_WIDTH][MAX_PLAYFIELD_HEIGHT];
};