X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Finit.h;h=849f7a1ad24af204d530d422bd1611a0c5fa8480;hp=ca22ef6e1662a2c7acd76fb2accae3b710fd36b2;hb=115ce6f2da1914d68b0fe0e5f9082973190dacdd;hpb=5216f629803d5255919cadc2419fb1e798812ae2

diff --git a/src/init.h b/src/init.h
index ca22ef6e..849f7a1a 100644
--- a/src/init.h
+++ b/src/init.h
@@ -1,50 +1,52 @@
-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
-*----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* init.h                                                   *
-***********************************************************/
+// ============================================================================
+// Rocks'n'Diamonds - McDuffin Strikes Back!
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//     		    Holger Schemel
+//		    info@artsoft.org
+//		    http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// init.h
+// ============================================================================
 
 #ifndef INIT_H
 #define INIT_H
 
 #include "main.h"
 
-#if 1
-#define setMoveIntoAcidProperty(l, e, v)	\
+#define setMoveIntoAcidProperty(l, e, v)			\
 	(setBitfieldProperty(&(l)->can_move_into_acid_bits,	\
 			     EP_CAN_MOVE_INTO_ACID, e, v))
-#define getMoveIntoAcidProperty(l, e)		\
+#define getMoveIntoAcidProperty(l, e)				\
 	(getBitfieldProperty(&(l)->can_move_into_acid_bits,	\
 			     EP_CAN_MOVE_INTO_ACID, e))
-#define setDontCollideWithProperty(l, e, v)	\
-	(setBitfieldProperty(&(l)->can_move_into_acid_bits,	\
+#define setDontCollideWithProperty(l, e, v)			\
+	(setBitfieldProperty(&(l)->dont_collide_with_bits,	\
 			     EP_DONT_COLLIDE_WITH, e, v))
-#define getDontCollideWithProperty(l, e)	\
-	(getBitfieldProperty(&(l)->can_move_into_acid_bits,	\
+#define getDontCollideWithProperty(l, e)			\
+	(getBitfieldProperty(&(l)->dont_collide_with_bits,	\
 			     EP_DONT_COLLIDE_WITH, e))
 
 void setBitfieldProperty(int *, int, int, boolean);
 boolean getBitfieldProperty(int *, int, int);
 
-#else
-
-void setMoveIntoAcidProperty(struct LevelInfo *, int, boolean);
-boolean getMoveIntoAcidProperty(struct LevelInfo *, int);
-#endif
-
+void ResolveGroupElement(int);
 void InitElementPropertiesStatic(void);
 void InitElementPropertiesEngine(int);
+void InitElementPropertiesGfxElement(void);
 
 void ReloadCustomArtwork(int);
+void RedrawGlobalBorder(void);
+
+void KeyboardAutoRepeatOffUnlessAutoplay(void);
+
+void InitGfxBuffers(void);
+void InitGadgets(void);
+void InitImageTextures(void);
+
+void InitNetworkServer(void);
 
-void KeyboardAutoRepeatOffUnlessAutoplay();
+void DisplayExitMessage(char *, va_list);
 
 void OpenAll(void);
 void CloseAllAndExit(int);