projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030416-2-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index e4f9e1923958d3573d01d802540633bdd5bd0ba7..dcd6301f1ba7c934f82e3d6ed3c51a71287f7573 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-17,6
+17,7
@@
#include "init.h"
#include "game.h"
#include "events.h"
#include "init.h"
#include "game.h"
#include "events.h"
+#include "config.h"
#if 0
GC tile_clip_gc;
#if 0
GC tile_clip_gc;
@@
-54,12
+55,12
@@
short AmoebaCnt2[MAX_NUM_AMOEBA];
short ExplodePhase[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short ExplodePhase[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-unsigned long Properties1[MAX_NUM_ELEMENTS];
-unsigned long Properties2[MAX_NUM_ELEMENTS];
+unsigned long Properties[MAX_NUM_ELEMENTS][NUM_EP_BITFIELDS];
int GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+int GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int lev_fieldx, lev_fieldy;
int scroll_x, scroll_y;
int lev_fieldx, lev_fieldy;
int scroll_x, scroll_y;
@@
-993,64
+994,64
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"letter 'Z'"
},
{
"letter 'Z'"
},
{
- "char_
ae
",
+ "char_
bracketleft
",
"char",
"char",
- "letter '
Ä
'"
+ "letter '
[
'"
},
{
},
{
- "char_
oe
",
+ "char_
backslash
",
"char",
"char",
- "letter '
Ö
'"
+ "letter '
\\
'"
},
{
},
{
- "char_
ue
",
+ "char_
bracketright
",
"char",
"char",
- "letter '
Ü
'"
+ "letter '
]
'"
},
{
},
{
- "char_
copyright
",
+ "char_
asciicircum
",
"char",
"letter '^'"
},
{
"char_underscore",
"char",
"char",
"letter '^'"
},
{
"char_underscore",
"char",
- "letter ''"
+ "letter '
_
'"
},
{
},
{
- "char_
empty
",
+ "char_
copyright
",
"char",
"char",
- "letter ''"
+ "letter '
©
'"
},
{
},
{
- "char_
degree
",
+ "char_
aumlaut
",
"char",
"char",
- "letter ''"
+ "letter '
Ä
'"
},
{
},
{
- "char_
tm
",
+ "char_
oumlaut
",
"char",
"char",
- "letter ''"
+ "letter '
Ö
'"
},
{
},
{
- "char_
cursor
",
+ "char_
uumlaut
",
"char",
"char",
- "letter ''"
+ "letter '
Ü
'"
},
{
},
{
- "char_
unused
",
+ "char_
degree
",
"char",
"char",
- "letter ''"
+ "letter '
°
'"
},
{
},
{
- "char_
unused
",
+ "char_
trademark
",
"char",
"char",
- "letter ''"
+ "letter '
®
'"
},
{
},
{
- "char_
unused
",
+ "char_
cursor
",
"char",
"char",
- "letter ''"
+ "letter '
'"
},
{
"char_unused",
},
{
"char_unused",
@@
-3034,7
+3035,12
@@
struct FontInfo font_info[NUM_FONTS + 1] =
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
- InitCommandName(argv[0]);
+ InitProgramInfo(argv[0], USERDATA_DIRECTORY,
+ PROGRAM_TITLE_STRING, getWindowTitleString(),
+ ICON_TITLE_STRING, X11_ICON_FILENAME, X11_ICONMASK_FILENAME,
+ MSDOS_POINTER_FILENAME,
+ COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
+
InitExitFunction(CloseAllAndExit);
InitPlatformDependantStuff();
InitExitFunction(CloseAllAndExit);
InitPlatformDependantStuff();