projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100407-1-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index a86ed44786697fa199b13b2a539126caa2ba3103..aab51a3824fce88fde27434e27eb7497915e3a4b 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];
@@
-75,6
+79,7
@@
int GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+int GfxRedraw[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int ActiveElement[MAX_NUM_ELEMENTS];
int ActiveButton[NUM_IMAGE_FILES];
int ActiveElement[MAX_NUM_ELEMENTS];
int ActiveButton[NUM_IMAGE_FILES];
@@
-83,6
+88,12
@@
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 DX = 566, DY = 60;
+int VX = 566, VY = 400;
+int EX = 566, EY = 356;
+
int FX = SX, FY = SY;
int ScrollStepSize;
int ScreenMovDir = MV_NONE, ScreenMovPos = 0;
int FX = SX, FY = SY;
int ScrollStepSize;
int ScreenMovDir = MV_NONE, ScreenMovPos = 0;
@@
-90,8
+101,13
@@
int ScreenGfxPos = 0;
int BorderElement = EL_STEELWALL;
int GameFrameDelay = GAME_FRAME_DELAY;
int FfwdFrameDelay = FFWD_FRAME_DELAY;
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;
@@
-111,6
+127,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;
@@
-119,7
+136,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;
@@
-1261,23
+1278,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",
@@
-3441,43
+3458,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",
@@
-4459,6
+4476,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 */
@@
-5524,6
+5546,7
@@
static void print_usage()
" --serveronly only start network server\n"
" -v, --verbose verbose mode\n"
" --debug display debugging information\n"
" --serveronly only start network server\n"
" -v, --verbose verbose mode\n"
" --debug display debugging information\n"
+ " --debug-x11-sync enable X11 synchronous mode\n"
" -e, --execute COMMAND execute batch COMMAND\n"
"\n"
"Valid commands for '--execute' option:\n"
" -e, --execute COMMAND execute batch COMMAND\n"
"\n"
"Valid commands for '--execute' option:\n"
@@
-5537,6
+5560,7
@@
static void print_usage()
" \"dump tape FILE\" dump tape data from FILE\n"
" \"autoplay LEVELDIR [NR ...]\" play level tapes for LEVELDIR\n"
" \"convert LEVELDIR [NR]\" convert levels in LEVELDIR\n"
" \"dump tape FILE\" dump tape data from FILE\n"
" \"autoplay LEVELDIR [NR ...]\" play level tapes for LEVELDIR\n"
" \"convert LEVELDIR [NR]\" convert levels in LEVELDIR\n"
+ " \"create images DIRECTORY\" write BMP images to DIRECTORY\n"
"\n",
program.command_basename);
}
"\n",
program.command_basename);
}