projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19990124-1
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 0711f651170956669b6ec66898603f96299899fc..b92780b6e32130eee8eb92defdc08e2b35c9b0ff 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-18,6
+18,8
@@
#include "sound.h"
#include "screens.h"
#include "editor.h"
#include "sound.h"
#include "screens.h"
#include "editor.h"
+#include "game.h"
+#include "tape.h"
#include "tools.h"
#include "files.h"
#include "joystick.h"
#include "tools.h"
#include "files.h"
#include "joystick.h"
@@
-48,6
+50,7
@@
static void InitSoundServer(void);
static void InitWindow(int, char **);
static void InitGfx(void);
static void LoadGfx(int, struct PictureFileInfo *);
static void InitWindow(int, char **);
static void InitGfx(void);
static void LoadGfx(int, struct PictureFileInfo *);
+static void InitGadgets(void);
static void InitElementProperties(void);
void OpenAll(int argc, char *argv[])
static void InitElementProperties(void);
void OpenAll(int argc, char *argv[])
@@
-67,7
+70,6
@@
void OpenAll(int argc, char *argv[])
InitSoundServer();
InitJoysticks();
InitRND(NEW_RANDOMIZE);
InitSoundServer();
InitJoysticks();
InitRND(NEW_RANDOMIZE);
- InitLevelEditorGadgets();
signal(SIGINT, CloseAllAndExit);
signal(SIGTERM, CloseAllAndExit);
signal(SIGINT, CloseAllAndExit);
signal(SIGTERM, CloseAllAndExit);
@@
-79,6
+81,7
@@
void OpenAll(int argc, char *argv[])
XFlush(display);
InitGfx();
XFlush(display);
InitGfx();
+ InitGadgets();
InitElementProperties();
DrawMainMenu();
InitElementProperties();
DrawMainMenu();
@@
-348,8
+351,8
@@
void InitWindow(int argc, char *argv[])
XSizeHints size_hints;
XWMHints wm_hints;
XClassHint class_hints;
XSizeHints size_hints;
XWMHints wm_hints;
XClassHint class_hints;
- char *window_name = WINDOWTITLE_STRING;
- char *icon_name = WINDOWTITLE_STRING;
+ char *window_name = WINDOW
_
TITLE_STRING;
+ char *icon_name = WINDOW
_
TITLE_STRING;
long window_event_mask;
Atom proto_atom = None, delete_atom = None;
#endif
long window_event_mask;
Atom proto_atom = None, delete_atom = None;
#endif
@@
-436,9
+439,11
@@
void InitWindow(int argc, char *argv[])
XFree(iconName.value);
/* Select event types wanted */
XFree(iconName.value);
/* Select event types wanted */
- window_event_mask = ExposureMask | StructureNotifyMask | FocusChangeMask |
- ButtonPressMask | ButtonReleaseMask | ButtonMotionMask |
- KeyPressMask | KeyReleaseMask;
+ window_event_mask =
+ ExposureMask | StructureNotifyMask | FocusChangeMask |
+ ButtonPressMask | ButtonReleaseMask | PointerMotionMask |
+ PointerMotionHintMask | KeyPressMask | KeyReleaseMask;
+
XSelectInput(display, window, window_event_mask);
#endif
XSelectInput(display, window, window_event_mask);
#endif
@@
-538,7
+543,7
@@
void InitGfx()
#endif
LoadGfx(PIX_SMALLFONT,&pic[PIX_SMALLFONT]);
#endif
LoadGfx(PIX_SMALLFONT,&pic[PIX_SMALLFONT]);
- DrawInitText(WINDOWTITLE_STRING,20,FC_YELLOW);
+ DrawInitText(WINDOW
_
TITLE_STRING,20,FC_YELLOW);
DrawInitText(COPYRIGHT_STRING,50,FC_RED);
#ifdef MSDOS
DrawInitText("MSDOS version done by Guido Schulz",210,FC_BLUE);
DrawInitText(COPYRIGHT_STRING,50,FC_RED);
#ifdef MSDOS
DrawInitText("MSDOS version done by Guido Schulz",210,FC_BLUE);
@@
-789,6
+794,13
@@
void LoadGfx(int pos, struct PictureFileInfo *pic)
}
}
}
}
+void InitGadgets()
+{
+ CreateLevelEditorGadgets();
+ CreateGameButtons();
+ CreateTapeButtons();
+}
+
void InitElementProperties()
{
int i,j;
void InitElementProperties()
{
int i,j;
@@
-885,7
+897,8
@@
void InitElementProperties()
EL_SP_HARD_BASE5,
EL_SP_HARD_BASE6,
EL_SP_TERMINAL,
EL_SP_HARD_BASE5,
EL_SP_HARD_BASE6,
EL_SP_TERMINAL,
- EL_SP_EXIT
+ EL_SP_EXIT,
+ EL_INVISIBLE_STEEL
};
static int ep_solid_num = sizeof(ep_solid)/sizeof(int);
};
static int ep_solid_num = sizeof(ep_solid)/sizeof(int);
@@
-917,6
+930,7
@@
void InitElementProperties()
EL_SP_HARD_BASE4,
EL_SP_HARD_BASE5,
EL_SP_HARD_BASE6,
EL_SP_HARD_BASE4,
EL_SP_HARD_BASE5,
EL_SP_HARD_BASE6,
+ EL_INVISIBLE_STEEL
};
static int ep_massive_num = sizeof(ep_massive)/sizeof(int);
};
static int ep_massive_num = sizeof(ep_massive)/sizeof(int);
@@
-1005,7
+1019,8
@@
void InitElementProperties()
EL_SP_HARD_BASE5,
EL_SP_HARD_BASE6,
EL_SP_TERMINAL,
EL_SP_HARD_BASE5,
EL_SP_HARD_BASE6,
EL_SP_TERMINAL,
- EL_SP_EXIT
+ EL_SP_EXIT,
+ EL_INVISIBLE_STEEL
};
static int ep_mauer_num = sizeof(ep_mauer)/sizeof(int);
};
static int ep_mauer_num = sizeof(ep_mauer)/sizeof(int);
@@
-1199,7
+1214,8
@@
void InitElementProperties()
EL_SOKOBAN_OBJEKT,
EL_SOKOBAN_FELD_LEER,
EL_SOKOBAN_FELD_VOLL,
EL_SOKOBAN_OBJEKT,
EL_SOKOBAN_FELD_LEER,
EL_SOKOBAN_FELD_VOLL,
- EL_SPIELFIGUR
+ EL_SPIELFIGUR,
+ EL_INVISIBLE_STEEL
};
static int ep_sb_element_num = sizeof(ep_sb_element)/sizeof(int);
};
static int ep_sb_element_num = sizeof(ep_sb_element)/sizeof(int);
@@
-1297,7
+1313,8
@@
void InitElementProperties()
EL_SP_HARD_BASE4,
EL_SP_HARD_BASE5,
EL_SP_HARD_BASE6,
EL_SP_HARD_BASE4,
EL_SP_HARD_BASE5,
EL_SP_HARD_BASE6,
- EL_SP_EXIT
+ EL_SP_EXIT,
+ EL_INVISIBLE_STEEL
};
static int ep_inactive_num = sizeof(ep_inactive)/sizeof(int);
};
static int ep_inactive_num = sizeof(ep_inactive)/sizeof(int);