projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100419-1-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 5acf09fe627d151743b3beb5362c25cde2ce455d..b9e35e2b568e7c04b49d62aec00ffd980a8c94fc 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-39,7
+39,11
@@
SDL_Thread *server_thread;
int key_joystick_mapping = 0;
int key_joystick_mapping = 0;
+#if 1
+boolean redraw[MAX_LEV_FIELDX + 2][MAX_LEV_FIELDY + 2];
+#else
boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
+#endif
int redraw_x1 = 0, redraw_y1 = 0;
short Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int redraw_x1 = 0, redraw_y1 = 0;
short Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@
-84,15
+88,32
@@
int ActiveFont[NUM_FONTS];
int lev_fieldx, lev_fieldy;
int scroll_x, scroll_y;
int lev_fieldx, lev_fieldy;
int scroll_x, scroll_y;
+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 DX = 566, DY = 60;
+int VX = 566, VY = 400;
+int EX = 566, EY = 356;
+
+#if 1
+int FX, FY;
+#else
int FX = SX, FY = SY;
int FX = SX, FY = SY;
+#endif
int ScrollStepSize;
int ScreenMovDir = MV_NONE, ScreenMovPos = 0;
int ScreenGfxPos = 0;
int BorderElement = EL_STEELWALL;
int GameFrameDelay = GAME_FRAME_DELAY;
int FfwdFrameDelay = FFWD_FRAME_DELAY;
int ScrollStepSize;
int ScreenMovDir = MV_NONE, ScreenMovPos = 0;
int ScreenGfxPos = 0;
int BorderElement = EL_STEELWALL;
int GameFrameDelay = GAME_FRAME_DELAY;
int FfwdFrameDelay = FFWD_FRAME_DELAY;
+#if 1
+int BX1, BY1;
+int BX2, BY2;
+#else
int BX1 = 0, BY1 = 0;
int BX2 = SCR_FIELDX - 1, BY2 = SCR_FIELDY - 1;
int BX1 = 0, BY1 = 0;
int BX2 = SCR_FIELDX - 1, BY2 = SCR_FIELDY - 1;
+#endif
int SBX_Left, SBX_Right;
int SBY_Upper, SBY_Lower;
int ZX, ZY;
int SBX_Left, SBX_Right;
int SBY_Upper, SBY_Lower;
int ZX, ZY;
@@
-112,6
+133,7
@@
struct SetupInfo setup;
struct GameInfo game;
struct GlobalInfo global;
struct BorderInfo border;
struct GameInfo game;
struct GlobalInfo global;
struct BorderInfo border;
+struct ViewportInfo viewport;
struct TitleFadingInfo fading;
struct TitleFadingInfo title_initial_default;
struct TitleFadingInfo title_default;
struct TitleFadingInfo fading;
struct TitleFadingInfo title_initial_default;
struct TitleFadingInfo title_default;
@@
-120,7
+142,7
@@
struct TitleMessageInfo titlemessage_initial[MAX_NUM_TITLE_MESSAGES];
struct TitleMessageInfo titlemessage_default;
struct TitleMessageInfo titlemessage[MAX_NUM_TITLE_MESSAGES];
struct TitleMessageInfo readme;
struct TitleMessageInfo titlemessage_default;
struct TitleMessageInfo titlemessage[MAX_NUM_TITLE_MESSAGES];
struct TitleMessageInfo readme;
-struct InitInfo init;
+struct InitInfo init
, init_last
;
struct MenuInfo menu;
struct DoorInfo door_1, door_2;
struct PreviewInfo preview;
struct MenuInfo menu;
struct DoorInfo door_1, door_2;
struct PreviewInfo preview;
@@
-1262,23
+1284,23
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
},
{
"sp_gravity_port_right",
},
{
"sp_gravity_port_right",
- "sp_port",
- "gravity port (leading right)"
+ "sp_
gravity_
port",
+ "gravity
-on/off
port (leading right)"
},
{
"sp_gravity_port_down",
},
{
"sp_gravity_port_down",
- "sp_port",
- "gravity port (leading down)"
+ "sp_
gravity_
port",
+ "gravity
-on/off
port (leading down)"
},
{
"sp_gravity_port_left",
},
{
"sp_gravity_port_left",
- "sp_port",
- "gravity port (leading left)"
+ "sp_
gravity_
port",
+ "gravity
-on/off
port (leading left)"
},
{
"sp_gravity_port_up",
},
{
"sp_gravity_port_up",
- "sp_port",
- "gravity port (leading up)"
+ "sp_
gravity_
port",
+ "gravity
-on/off
port (leading up)"
},
{
"sp_sniksnak",
},
{
"sp_sniksnak",
@@
-3442,43
+3464,43
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
},
{
"sp_gravity_on_port_right",
},
{
"sp_gravity_on_port_right",
- "sp_port",
- "gravity
on port (leading right)"
+ "sp_
gravity_on_
port",
+ "gravity
-
on port (leading right)"
},
{
"sp_gravity_on_port_down",
},
{
"sp_gravity_on_port_down",
- "sp_port",
- "gravity
on port (leading down)"
+ "sp_
gravity_on_
port",
+ "gravity
-
on port (leading down)"
},
{
"sp_gravity_on_port_left",
},
{
"sp_gravity_on_port_left",
- "sp_port",
- "gravity
on port (leading left)"
+ "sp_
gravity_on_
port",
+ "gravity
-
on port (leading left)"
},
{
"sp_gravity_on_port_up",
},
{
"sp_gravity_on_port_up",
- "sp_port",
- "gravity
on port (leading up)"
+ "sp_
gravity_on_
port",
+ "gravity
-
on port (leading up)"
},
{
"sp_gravity_off_port_right",
},
{
"sp_gravity_off_port_right",
- "sp_port",
- "gravity
off port (leading right)"
+ "sp_
gravity_off_
port",
+ "gravity
-
off port (leading right)"
},
{
"sp_gravity_off_port_down",
},
{
"sp_gravity_off_port_down",
- "sp_port",
- "gravity
off port (leading down)"
+ "sp_
gravity_off_
port",
+ "gravity
-
off port (leading down)"
},
{
"sp_gravity_off_port_left",
},
{
"sp_gravity_off_port_left",
- "sp_port",
- "gravity
off port (leading left)"
+ "sp_
gravity_off_
port",
+ "gravity
-
off port (leading left)"
},
{
"sp_gravity_off_port_up",
},
{
"sp_gravity_off_port_up",
- "sp_port",
- "gravity
off port (leading up)"
+ "sp_
gravity_off_
port",
+ "gravity
-
off port (leading up)"
},
{
"balloon_switch_none",
},
{
"balloon_switch_none",
@@
-4460,6
+4482,11
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"quicksand",
"fast quicksand (with rock)"
},
"quicksand",
"fast quicksand (with rock)"
},
+ {
+ "from_level_template",
+ "from_level_template",
+ "element taken from level template"
+ },
/* ----------------------------------------------------------------------- */
/* "real" (and therefore drawable) runtime elements */
/* ----------------------------------------------------------------------- */
/* "real" (and therefore drawable) runtime elements */
@@
-5509,16
+5536,6
@@
struct MusicPrefixInfo music_prefix_info[NUM_MUSIC_PREFIXES + 1] =
/* main() */
/* ========================================================================= */
/* main() */
/* ========================================================================= */
-static unsigned long get_cmd_switch(char *switch_string)
-{
- unsigned long switch_value = 0;
-
- if (strEqual(switch_string, "load_xsb_to_ces"))
- switch_value = CMD_SWITCH_LOAD_XSB_TO_CES;
-
- return switch_value;
-}
-
static void print_usage()
{
printf("\n"
static void print_usage()
{
printf("\n"
@@
-5567,7
+5584,7
@@
int main(int argc, char *argv[])
InitExitFunction(CloseAllAndExit);
InitPlatformDependentStuff();
InitExitFunction(CloseAllAndExit);
InitPlatformDependentStuff();
- GetOptions(argv, print_usage
, get_cmd_switch
);
+ GetOptions(argv, print_usage);
OpenAll();
EventLoop();
OpenAll();
EventLoop();