projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed comments from old to new style (auto-generated files)
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 3f4ea31df2099d85dd489185883c8192c7e2c849..f35974bce5fd4c18a40ff7e1bd615522a0f9c83f 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-42,6
+42,7
@@
SDL_Thread *server_thread;
int key_joystick_mapping = 0;
short Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int key_joystick_mapping = 0;
short Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short Last[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@
-185,20
+186,20
@@
SetupFileHash *font_token_hash = NULL;
SetupFileHash *hide_setup_hash = NULL;
SetupFileHash *hide_setup_hash = NULL;
-/
* ------------------------------------------------------------------------- */
-/
* element definitions */
-/
* ------------------------------------------------------------------------- */
+/
/ ----------------------------------------------------------------------------
+/
/ element definitions
+/
/ ----------------------------------------------------------------------------
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1];
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1];
-/
* this contains predefined structure elements to initialize "element_info" */
+/
/ this contains predefined structure elements to initialize "element_info"
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
{
- /
* keyword to start parser: "ELEMENT_INFO_START" <-- do not change! */
+ /
/ keyword to start parser: "ELEMENT_INFO_START" <-- do not change!
- /
* ----------------------------------------------------------------------- */
- /
* "real" level file elements */
- /
* ----------------------------------------------------------------------- */
+ /
/ --------------------------------------------------------------------------
+ /
/ "real" level file elements
+ /
/ --------------------------------------------------------------------------
{
"empty_space",
{
"empty_space",
@@
-6270,9
+6271,9
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"wooden wall (DF style)",
},
"wooden wall (DF style)",
},
- /
* ----------------------------------------------------------------------- */
- /
* "real" (and therefore drawable) runtime elements */
- /
* ----------------------------------------------------------------------- */
+ /
/ --------------------------------------------------------------------------
+ /
/ "real" (and therefore drawable) runtime elements
+ /
/ --------------------------------------------------------------------------
{
"dynabomb_player_1.active",
{
"dynabomb_player_1.active",
@@
-6681,9
+6682,9
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"pac man (eating down)"
},
"pac man (eating down)"
},
- /
* ----------------------------------------------------------------------- */
- /
* "unreal" (and therefore not drawable) runtime elements */
- /
* ----------------------------------------------------------------------- */
+ /
/ --------------------------------------------------------------------------
+ /
/ "unreal" (and therefore not drawable) runtime elements
+ /
/ --------------------------------------------------------------------------
{
"blocked",
{
"blocked",
@@
-6806,9
+6807,9
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"-"
},
"-"
},
- /
* ----------------------------------------------------------------------- */
- /
* dummy elements (never used as game elements, only used as graphics) */
- /
* ----------------------------------------------------------------------- */
+ /
/ --------------------------------------------------------------------------
+ /
/ dummy elements (never used as game elements, only used as graphics)
+ /
/ --------------------------------------------------------------------------
{
"steelwall_topleft",
{
"steelwall_topleft",
@@
-7236,7
+7237,7
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"hide elements used in this level"
},
"hide elements used in this level"
},
- /
* keyword to stop parser: "ELEMENT_INFO_END" <-- do not change! */
+ /
/ keyword to stop parser: "ELEMENT_INFO_END" <-- do not change!
{
NULL,
{
NULL,
@@
-7246,9
+7247,9
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
};
};
-/
* ------------------------------------------------------------------------- */
-/
* element action and direction definitions */
-/
* ------------------------------------------------------------------------- */
+/
/ ----------------------------------------------------------------------------
+/
/ element action and direction definitions
+/
/ ----------------------------------------------------------------------------
struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
{
struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
{
@@
-7371,7
+7372,7
@@
struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
{ ".part_32", ACTION_PART_32, FALSE },
{ ".other", ACTION_OTHER, FALSE },
{ ".part_32", ACTION_PART_32, FALSE },
{ ".other", ACTION_OTHER, FALSE },
- /
* empty suffix always matches -- check as last entry in InitSoundInfo() */
+ /
/ empty suffix always matches -- check as last entry in InitSoundInfo()
{ "", ACTION_DEFAULT, TRUE },
{ NULL, 0, 0 }
{ "", ACTION_DEFAULT, TRUE },
{ NULL, 0, 0 }
@@
-7430,22
+7431,22
@@
struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
{ ".FADING", GFX_SPECIAL_ARG_FADING, },
{ ".QUIT", GFX_SPECIAL_ARG_QUIT, },
{ ".FADING", GFX_SPECIAL_ARG_FADING, },
{ ".QUIT", GFX_SPECIAL_ARG_QUIT, },
- /
* empty suffix always matches -- check as last entry in InitMusicInfo() */
+ /
/ empty suffix always matches -- check as last entry in InitMusicInfo()
{ "", GFX_SPECIAL_ARG_DEFAULT, },
{ NULL, 0, }
};
{ "", GFX_SPECIAL_ARG_DEFAULT, },
{ NULL, 0, }
};
-#include "conf_var.c" /
* include auto-generated data structure definitions */
+#include "conf_var.c" /
/ include auto-generated data structure definitions
-/
* ------------------------------------------------------------------------- */
-/
* font definitions */
-/
* ------------------------------------------------------------------------- */
+/
/ ----------------------------------------------------------------------------
+/
/ font definitions
+/
/ ----------------------------------------------------------------------------
-/
*
Important: When one entry is a prefix of another entry, the longer entry
-
must come first, because the dynamic configuration does prefix matching!
- (These definitions must match the corresponding definitions in "main.h"!) */
+/
/
Important: When one entry is a prefix of another entry, the longer entry
+
//
must come first, because the dynamic configuration does prefix matching!
+// (These definitions must match the corresponding definitions in "main.h"!)
struct FontInfo font_info[NUM_FONTS + 1] =
{
struct FontInfo font_info[NUM_FONTS + 1] =
{
@@
-7498,10
+7499,10
@@
struct FontInfo font_info[NUM_FONTS + 1] =
struct GlobalAnimInfo global_anim_info[NUM_GLOBAL_ANIM_TOKENS + 1];
struct GlobalAnimInfo global_anim_info[NUM_GLOBAL_ANIM_TOKENS + 1];
-/
* this contains predefined structure elements to init "global_anim_info" */
+/
/ this contains predefined structure elements to init "global_anim_info"
struct GlobalAnimNameInfo global_anim_name_info[NUM_GLOBAL_ANIM_TOKENS + 1] =
{
struct GlobalAnimNameInfo global_anim_name_info[NUM_GLOBAL_ANIM_TOKENS + 1] =
{
- /
* (real) graphic definitions used to define animation graphics */
+ /
/ (real) graphic definitions used to define animation graphics
{ "gfx.global.anim_1", },
{ "gfx.global.anim_2", },
{ "gfx.global.anim_3", },
{ "gfx.global.anim_1", },
{ "gfx.global.anim_2", },
{ "gfx.global.anim_3", },
@@
-7535,7
+7536,7
@@
struct GlobalAnimNameInfo global_anim_name_info[NUM_GLOBAL_ANIM_TOKENS + 1] =
{ "gfx.global.anim_31", },
{ "gfx.global.anim_32", },
{ "gfx.global.anim_31", },
{ "gfx.global.anim_32", },
- /
* (dummy) graphic definitions used to define animation controls */
+ /
/ (dummy) graphic definitions used to define animation controls
{ "global.anim_1", },
{ "global.anim_2", },
{ "global.anim_3", },
{ "global.anim_1", },
{ "global.anim_2", },
{ "global.anim_3", },
@@
-7573,9
+7574,9
@@
struct GlobalAnimNameInfo global_anim_name_info[NUM_GLOBAL_ANIM_TOKENS + 1] =
};
};
-/
* ------------------------------------------------------------------------- */
-/
* music token prefix definitions */
-/
* ------------------------------------------------------------------------- */
+/
/ ----------------------------------------------------------------------------
+/
/ music token prefix definitions
+/
/ ----------------------------------------------------------------------------
struct MusicPrefixInfo music_prefix_info[NUM_MUSIC_PREFIXES + 1] =
{
struct MusicPrefixInfo music_prefix_info[NUM_MUSIC_PREFIXES + 1] =
{
@@
-7585,9
+7586,9
@@
struct MusicPrefixInfo music_prefix_info[NUM_MUSIC_PREFIXES + 1] =
};
};
-/
* ========================================================================= */
-/
* main() */
-/
* ========================================================================= */
+/
/ ============================================================================
+/
/ main()
+/
/ ============================================================================
static void print_usage(void)
{
static void print_usage(void)
{
@@
-7761,5
+7762,5
@@
int main(int argc, char *argv[])
EventLoop();
CloseAllAndExit(0);
EventLoop();
CloseAllAndExit(0);
- return 0; /
* to keep compilers happy */
+ return 0; /
/ to keep compilers happy
}
}