X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.h;h=acd25c1b80c1265137addb5999141f9eaf6b1c00;hb=066b410c0573fe64a1783116daf9d64883e9f03e;hp=9db0ef6b316edfaa0c58aec551287a9b956e0a03;hpb=1146572677fd6858df5fc1fabfd7f7294bdefed7;p=rocksndiamonds.git

diff --git a/src/game.h b/src/game.h
index 9db0ef6b..acd25c1b 100644
--- a/src/game.h
+++ b/src/game.h
@@ -1,14 +1,14 @@
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-*  (c) 1995-98 Artsoft Entertainment                       *
-*              Holger Schemel                              *
-*              Oststrasse 11a                              *
-*              33604 Bielefeld                             *
-*              phone: ++49 +521 290471                     *
-*              email: aeglos@valinor.owl.de                *
+* (c) 1995-2001 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  game.h                                                  *
+* game.h                                                   *
 ***********************************************************/
 
 #ifndef GAME_H
@@ -16,33 +16,25 @@
 
 #include "main.h"
 
-#define DF_NO_PUSH		0
-#define DF_DIG			1
-#define DF_SNAP			2
-
-#define MF_NO_ACTION		0
-#define MF_MOVING		1
-#define MF_ACTION		2
-
-#define SCROLL_INIT		0
-#define SCROLL_GO_ON		1
-
-/* explosion position marks */
-#define EX_NORMAL		0
-#define EX_CENTER		1
-#define EX_BORDER		2
-
-/* fundamental game speed */
-#define GAME_FRAME_DELAY	20	/* frame delay in milliseconds */
-#define FFWD_FRAME_DELAY	10	/* 200% speed for fast forward */
-#define FRAMES_PER_SECOND	(1000 / GAME_FRAME_DELAY)
+/* score for elements (also used by editor.c) */
+#define SC_EDELSTEIN		0
+#define SC_DIAMANT		1
+#define SC_KAEFER		2
+#define SC_FLIEGER		3
+#define SC_MAMPFER		4
+#define SC_ROBOT		5
+#define SC_PACMAN		6
+#define SC_KOKOSNUSS		7
+#define SC_DYNAMIT		8
+#define SC_SCHLUESSEL		9
+#define SC_ZEITBONUS		10
 
 void GetPlayerConfig(void);
 void InitGame(void);
 void InitMovDir(int, int);
 void InitAmoebaNr(int, int);
 void GameWon(void);
-boolean NewHiScore(void);
+int NewHiScore(void);
 void InitMovingField(int, int, int);
 void Moving2Blocked(int, int, int *, int *);
 void Blocked2Moving(int, int, int *, int *);
@@ -60,7 +52,7 @@ void StartMoving(int, int);
 void ContinueMoving(int, int);
 int AmoebeNachbarNr(int, int);
 void AmoebeUmwandeln(int, int);
-void AmoebeUmwandeln2(int, int, int);
+void AmoebeUmwandelnBD(int, int, int);
 void AmoebeWaechst(int, int);
 void AmoebeAbleger(int, int);
 void Life(int, int);
@@ -82,13 +74,15 @@ boolean MoveFigure(struct PlayerInfo *, int, int);
 void ScrollFigure(struct PlayerInfo *, int);
 void ScrollScreen(struct PlayerInfo *, int);
 
-void TestIfGoodThingHitsBadThing(int, int);
-void TestIfBadThingHitsGoodThing(int, int);
-void TestIfHeroHitsBadThing(int, int);
-void TestIfBadThingHitsHero(int, int);
-void TestIfFriendHitsBadThing(int, int);
-void TestIfBadThingHitsFriend(int, int);
-void TestIfBadThingHitsOtherBadThing(int, int);
+void TestIfGoodThingHitsBadThing(int, int, int);
+void TestIfBadThingHitsGoodThing(int, int, int);
+void TestIfHeroTouchesBadThing(int, int);
+void TestIfHeroRunsIntoBadThing(int, int, int);
+void TestIfBadThingTouchesHero(int, int);
+void TestIfBadThingRunsIntoHero(int, int, int);
+void TestIfFriendTouchesBadThing(int, int);
+void TestIfBadThingTouchesFriend(int, int);
+void TestIfBadThingTouchesOtherBadThing(int, int);
 void KillHero(struct PlayerInfo *);
 void BuryHero(struct PlayerInfo *);
 void RemoveHero(struct PlayerInfo *);
@@ -98,5 +92,9 @@ boolean PlaceBomb(struct PlayerInfo *);
 void PlaySoundLevel(int, int, int);
 void RaiseScore(int);
 void RaiseScoreElement(int);
+void RequestQuitGame(boolean);
+
+void CreateGameButtons();
+void UnmapGameButtons();
 
 #endif