projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20140212-1-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 5c25fc6b9d0631a0aec077c87be7b628549efdb3..dcd5075ef164f98fc3544cda1e543aac931dbde9 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-17,6
+17,7
@@
#include "init.h"
#include "game.h"
#include "tape.h"
#include "init.h"
#include "game.h"
#include "tape.h"
+#include "tools.h"
#include "events.h"
#include "config.h"
#include "events.h"
#include "config.h"
@@
-95,16
+96,22
@@
int scroll_x, scroll_y;
int WIN_XSIZE = 672, WIN_YSIZE = 560;
int SCR_FIELDX = 17, SCR_FIELDY = 17;
int WIN_XSIZE = 672, WIN_YSIZE = 560;
int SCR_FIELDX = 17, SCR_FIELDY = 17;
-int SX = 8, SY = 8;
int REAL_SX = 6, REAL_SY = 6;
int REAL_SX = 6, REAL_SY = 6;
+int SX = 8, SY = 8;
int DX = 566, DY = 60;
int VX = 566, VY = 400;
int EX = 566, EY = 356;
int dDX, dDY;
int DX = 566, DY = 60;
int VX = 566, VY = 400;
int EX = 566, EY = 356;
int dDX, dDY;
-int SXSIZE = 17 * TILEX; /* SCR_FIELDX * TILEX */
-int SYSIZE = 17 * TILEY; /* SCR_FIELDY * TILEY */
int FULL_SXSIZE = 2 + 17 * TILEX + 2; /* 2 + SXSIZE + 2 */
int FULL_SYSIZE = 2 + 17 * TILEY + 2; /* 2 + SYSIZE + 2 */
int FULL_SXSIZE = 2 + 17 * TILEX + 2; /* 2 + SXSIZE + 2 */
int FULL_SYSIZE = 2 + 17 * TILEY + 2; /* 2 + SYSIZE + 2 */
+int SXSIZE = 17 * TILEX; /* SCR_FIELDX * TILEX */
+int SYSIZE = 17 * TILEY; /* SCR_FIELDY * TILEY */
+int DXSIZE = 100;
+int DYSIZE = 280;
+int VXSIZE = 100;
+int VYSIZE = 100;
+int EXSIZE = 100;
+int EYSIZE = 144;
int TILESIZE_VAR = TILESIZE;
#if 1
int TILESIZE_VAR = TILESIZE;
#if 1
@@
-156,12
+163,15
@@
struct TitleMessageInfo readme;
struct InitInfo init, init_last;
struct MenuInfo menu;
struct DoorInfo door_1, door_2;
struct InitInfo init, init_last;
struct MenuInfo menu;
struct DoorInfo door_1, door_2;
+struct RequestInfo request;
struct PreviewInfo preview;
struct PreviewInfo preview;
+
struct GraphicInfo *graphic_info = NULL;
struct SoundInfo *sound_info = NULL;
struct MusicInfo *music_info = NULL;
struct MusicFileInfo *music_file_info = NULL;
struct HelpAnimInfo *helpanim_info = NULL;
struct GraphicInfo *graphic_info = NULL;
struct SoundInfo *sound_info = NULL;
struct MusicInfo *music_info = NULL;
struct MusicFileInfo *music_file_info = NULL;
struct HelpAnimInfo *helpanim_info = NULL;
+
SetupFileHash *helptext_info = NULL;
SetupFileHash *image_config_hash = NULL;
SetupFileHash *element_token_hash = NULL;
SetupFileHash *helptext_info = NULL;
SetupFileHash *image_config_hash = NULL;
SetupFileHash *element_token_hash = NULL;
@@
-5467,6
+5477,7
@@
struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
{ ".SETUP", GFX_SPECIAL_ARG_SETUP, },
{ ".PLAYING", GFX_SPECIAL_ARG_PLAYING, },
{ ".DOOR", GFX_SPECIAL_ARG_DOOR, },
{ ".SETUP", GFX_SPECIAL_ARG_SETUP, },
{ ".PLAYING", GFX_SPECIAL_ARG_PLAYING, },
{ ".DOOR", GFX_SPECIAL_ARG_DOOR, },
+ { ".TAPE", GFX_SPECIAL_ARG_TAPE, },
{ ".PANEL", GFX_SPECIAL_ARG_PANEL, },
{ ".PREVIEW", GFX_SPECIAL_ARG_PREVIEW, },
{ ".CRUMBLED", GFX_SPECIAL_ARG_CRUMBLED, },
{ ".PANEL", GFX_SPECIAL_ARG_PANEL, },
{ ".PREVIEW", GFX_SPECIAL_ARG_PREVIEW, },
{ ".CRUMBLED", GFX_SPECIAL_ARG_CRUMBLED, },
@@
-5512,6
+5523,7
@@
struct FontInfo font_info[NUM_FONTS + 1] =
{ "font.envelope_2" },
{ "font.envelope_3" },
{ "font.envelope_4" },
{ "font.envelope_2" },
{ "font.envelope_3" },
{ "font.envelope_4" },
+ { "font.request" },
{ "font.input_1.active" },
{ "font.input_2.active" },
{ "font.input_1" },
{ "font.input_1.active" },
{ "font.input_2.active" },
{ "font.input_1" },
@@
-5593,6
+5605,7
@@
int main(int argc, char *argv[])
MSDOS_POINTER_FILENAME,
COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
MSDOS_POINTER_FILENAME,
COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
+ InitExitMessageFunction(DisplayExitMessage);
InitExitFunction(CloseAllAndExit);
InitPlatformDependentStuff();
InitExitFunction(CloseAllAndExit);
InitPlatformDependentStuff();