projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19990124-2
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 33cec176b737016ff375784fe52dc6add95ae32a..634542b53c5a41063f191a631b713719f432fe56 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);
@@
-80,6
+82,7
@@
void OpenAll(int argc, char *argv[])
InitGfx();
InitElementProperties();
InitGfx();
InitElementProperties();
+ InitGadgets();
DrawMainMenu();
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
@@
-540,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);
@@
-791,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;