projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020908-3-src
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index 976325dac8d68b13216a2f4f69d0563cebe76b4e..c8f30b68872f75ec6f4d31b97f65c3d99afb5507 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-158,20
+158,21
@@
/* Bitmaps with graphic file */
#define PIX_BACK 0
/* Bitmaps with graphic file */
#define PIX_BACK 0
-#define PIX_DOOR 1
-#define PIX_HEROES 2
-#define PIX_TOONS 3
-#define PIX_SP 4
-#define PIX_DC 5
-#define PIX_MORE 6
-#define PIX_BIGFONT 7
-#define PIX_SMALLFONT 8
-#define PIX_MEDIUMFONT 9
+#define PIX_ELEMENTS 1
+#define PIX_DOOR 2
+#define PIX_HEROES 3
+#define PIX_TOONS 4
+#define PIX_SP 5
+#define PIX_DC 6
+#define PIX_MORE 7
+#define PIX_BIGFONT 8
+#define PIX_SMALLFONT 9
+#define PIX_MEDIUMFONT 10
/* Bitmaps without graphic file */
/* Bitmaps without graphic file */
-#define PIX_DB_DOOR 1
0
-#define PIX_DB_FIELD 1
1
+#define PIX_DB_DOOR 1
1
+#define PIX_DB_FIELD 1
2
-#define NUM_PICTURES 1
0
+#define NUM_PICTURES 1
1
#define NUM_BITMAPS 12
/* boundaries of arrays etc. */
#define NUM_BITMAPS 12
/* boundaries of arrays etc. */
@@
-416,8
+417,8
@@
extern struct GlobalInfo global;
extern struct ElementInfo element_info[];
extern struct GraphicInfo graphic_info[];
extern struct ConfigInfo image_config[], sound_config[];
extern struct ElementInfo element_info[];
extern struct GraphicInfo graphic_info[];
extern struct ConfigInfo image_config[], sound_config[];
+extern struct ConfigInfo image_config_suffix[], sound_config_suffix[];
extern struct FileInfo *image_files, *sound_files;
extern struct FileInfo *image_files, *sound_files;
-extern char *image_config_suffix[], *sound_config_suffix[];
/* often used screen positions */
#define SX 8
/* often used screen positions */
#define SX 8
@@
-456,12
+457,10
@@
extern char *image_config_suffix[], *sound_config_suffix[];
#define MICROLEV_YPOS (SX + 12 * TILEY - MICRO_TILEY)
#define MICROLABEL_YPOS (MICROLEV_YPOS + MICROLEV_YSIZE + 7)
#define MICROLEV_YPOS (SX + 12 * TILEY - MICRO_TILEY)
#define MICROLABEL_YPOS (MICROLEV_YPOS + MICROLEV_YSIZE + 7)
-#define GFX_STARTX SX
-#define GFX_STARTY SY
-#define MINI_GFX_STARTX SX
-#define MINI_GFX_STARTY 424
-#define MICRO_GFX_STARTX SX
-#define MICRO_GFX_STARTY 536
+#define MINI_GFX_STARTX 0
+#define MINI_GFX_STARTY 416
+#define MICRO_GFX_STARTX 0
+#define MICRO_GFX_STARTY 528
#define GFX_PER_LINE 16
#define MINI_GFX_PER_LINE 32
#define MICRO_GFX_PER_LINE 128
#define GFX_PER_LINE 16
#define MINI_GFX_PER_LINE 32
#define MICRO_GFX_PER_LINE 128
@@
-894,7
+893,7
@@
extern char *image_config_suffix[], *sound_config_suffix[];
#define EL_MAGIC_WALL_BD_FILLING 612
/* game graphics:
#define EL_MAGIC_WALL_BD_FILLING 612
/* game graphics:
-** 0 - 255: graphics from "Rocks
Screen
"
+** 0 - 255: graphics from "Rocks
Elements
"
** 256 - 511: graphics from "RocksFont"
** 512 - 767: graphics from "RocksHeroes"
** 768 - 1023: graphics from "RocksSP"
** 256 - 511: graphics from "RocksFont"
** 512 - 767: graphics from "RocksHeroes"
** 768 - 1023: graphics from "RocksSP"
@@
-902,8
+901,8
@@
extern char *image_config_suffix[], *sound_config_suffix[];
** 1280 - 1535: graphics from "RocksMore"
*/
** 1280 - 1535: graphics from "RocksMore"
*/
-#define GFX_START_ROCKS
SCREEN
0
-#define GFX_END_ROCKS
SCREEN
255
+#define GFX_START_ROCKS
ELEMENTS
0
+#define GFX_END_ROCKS
ELEMENTS
255
#define GFX_START_ROCKSFONT 256
#define GFX_END_ROCKSFONT 511
#define GFX_START_ROCKSHEROES 512
#define GFX_START_ROCKSFONT 256
#define GFX_END_ROCKSFONT 511
#define GFX_START_ROCKSHEROES 512
@@
-1460,12
+1459,19
@@
extern char *image_config_suffix[], *sound_config_suffix[];
#define NUM_SOUNDS 55
#define NUM_SOUNDS 55
+/* values for image configuration suffixes */
+#define GFXARG_FRAME_XPOS 0
+#define GFXARG_FRAME_YPOS 1
+#define GFXARG_NUM_FRAMES 2
+
/* values for image configuration */
#define GFX_BD_DIAMOND 0
#define GFX_ROBOT_WHEEL 1
#define NUM_IMAGE_FILES 2
/* values for image configuration */
#define GFX_BD_DIAMOND 0
#define GFX_ROBOT_WHEEL 1
#define NUM_IMAGE_FILES 2
+/* values for sound configuration suffixes */
+/* (currently none) */
/* values for sound configuration */
#define SND_BD_EMPTY_SPACE_DIGGING 0
/* values for sound configuration */
#define SND_BD_EMPTY_SPACE_DIGGING 0