X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=6935fc82d99c1a058fefa609ea009469a217618d;hb=72b2940bea34cebf61175bc62a474cb78dcec467;hp=684cdb4d5155beb501d7f40bec251dd051e6418c;hpb=6b83db8bee17d70c4e89dc3e3b703b7032aa5f27;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 684cdb4d..6935fc82 100644
--- a/src/init.c
+++ b/src/init.c
@@ -497,6 +497,21 @@ void InitGfx()
   }; 
 #endif
 
+#ifdef DEBUG
+#if 0
+  static struct PictureFileInfo test_pic1 =
+  {
+    "RocksFont2",
+    FALSE
+  };
+  static struct PictureFileInfo test_pic2 =
+  {
+    "mouse",
+    FALSE
+  };
+#endif
+#endif
+
   static struct
   {
     int start;
@@ -551,6 +566,19 @@ void InitGfx()
   debug_print_timestamp(0, NULL);	/* initialize timestamp function */
 #endif
 
+#ifdef DEBUG
+#if 0
+  printf("Test: Loading RocksFont2.pcx ...\n");
+  LoadGfx(PIX_SMALLFONT,&test_pic1);
+  printf("Test: Done.\n");
+  printf("Test: Loading mouse.pcx ...\n");
+  LoadGfx(PIX_SMALLFONT,&test_pic2);
+  printf("Test: Done.\n");
+#endif
+#endif
+
+
+
   LoadGfx(PIX_SMALLFONT,&pic[PIX_SMALLFONT]);
   DrawInitText(WINDOW_TITLE_STRING,20,FC_YELLOW);
   DrawInitText(COPYRIGHT_STRING,50,FC_RED);
@@ -848,7 +876,11 @@ void InitElementProperties()
     EL_SCHLUESSEL1,
     EL_SCHLUESSEL2,
     EL_SCHLUESSEL3,
-    EL_SCHLUESSEL4
+    EL_SCHLUESSEL4,
+    EL_EM_KEY_1,
+    EL_EM_KEY_2,
+    EL_EM_KEY_3,
+    EL_EM_KEY_4
   };
   static int ep_schluessel_num = sizeof(ep_schluessel)/sizeof(int);
 
@@ -861,7 +893,15 @@ void InitElementProperties()
     EL_PFORTE1X,
     EL_PFORTE2X,
     EL_PFORTE3X,
-    EL_PFORTE4X
+    EL_PFORTE4X,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1X,
+    EL_EM_GATE_2X,
+    EL_EM_GATE_3X,
+    EL_EM_GATE_4X
   };
   static int ep_pforte_num = sizeof(ep_pforte)/sizeof(int);
 
@@ -938,6 +978,14 @@ void InitElementProperties()
     EL_PFORTE2X,
     EL_PFORTE3X,
     EL_PFORTE4X,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1X,
+    EL_EM_GATE_2X,
+    EL_EM_GATE_3X,
+    EL_EM_GATE_4X,
     EL_SP_HARD_GRAY,
     EL_SP_HARD_GREEN,
     EL_SP_HARD_BLUE,
@@ -1011,6 +1059,14 @@ void InitElementProperties()
     EL_PFORTE2X,
     EL_PFORTE3X,
     EL_PFORTE4X,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1X,
+    EL_EM_GATE_2X,
+    EL_EM_GATE_3X,
+    EL_EM_GATE_4X,
     EL_AUSGANG_ZU,
     EL_AUSGANG_ACT,
     EL_AUSGANG_AUF,
@@ -1079,6 +1135,10 @@ void InitElementProperties()
     EL_SCHLUESSEL2,
     EL_SCHLUESSEL3,
     EL_SCHLUESSEL4,
+    EL_EM_KEY_1,
+    EL_EM_KEY_2,
+    EL_EM_KEY_3,
+    EL_EM_KEY_4,
     EL_BOMBE,
     EL_KOKOSNUSS,
     EL_TROPFEN,
@@ -1266,6 +1326,10 @@ void InitElementProperties()
     EL_SCHLUESSEL2,
     EL_SCHLUESSEL3,
     EL_SCHLUESSEL4,
+    EL_EM_KEY_1,
+    EL_EM_KEY_2,
+    EL_EM_KEY_3,
+    EL_EM_KEY_4,
     EL_PFORTE1,
     EL_PFORTE2,
     EL_PFORTE3,
@@ -1274,6 +1338,14 @@ void InitElementProperties()
     EL_PFORTE2X,
     EL_PFORTE3X,
     EL_PFORTE4X,
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1X,
+    EL_EM_GATE_2X,
+    EL_EM_GATE_3X,
+    EL_EM_GATE_4X,
     EL_DYNAMIT_AUS,
     EL_UNSICHTBAR,
     EL_BIRNE_AUS,
@@ -1459,6 +1531,46 @@ void InitElementProperties()
   };
   static int ep_sp_element_num = sizeof(ep_sp_element)/sizeof(int);
 
+  static int ep_quick_gate[] =
+  {
+    EL_EM_GATE_1,
+    EL_EM_GATE_2,
+    EL_EM_GATE_3,
+    EL_EM_GATE_4,
+    EL_EM_GATE_1X,
+    EL_EM_GATE_2X,
+    EL_EM_GATE_3X,
+    EL_EM_GATE_4X,
+    EL_SP_PORT1_LEFT,
+    EL_SP_PORT2_LEFT,
+    EL_SP_PORT1_RIGHT,
+    EL_SP_PORT2_RIGHT,
+    EL_SP_PORT1_UP,
+    EL_SP_PORT2_UP,
+    EL_SP_PORT1_DOWN,
+    EL_SP_PORT2_DOWN,
+    EL_SP_PORT_X,
+    EL_SP_PORT_Y,
+    EL_SP_PORT_XY
+  };
+  static int ep_quick_gate_num = sizeof(ep_quick_gate)/sizeof(int);
+
+  static int ep_over_player[] =
+  {
+    EL_SP_PORT1_LEFT,
+    EL_SP_PORT2_LEFT,
+    EL_SP_PORT1_RIGHT,
+    EL_SP_PORT2_RIGHT,
+    EL_SP_PORT1_UP,
+    EL_SP_PORT2_UP,
+    EL_SP_PORT1_DOWN,
+    EL_SP_PORT2_DOWN,
+    EL_SP_PORT_X,
+    EL_SP_PORT_Y,
+    EL_SP_PORT_XY
+  };
+  static int ep_over_player_num = sizeof(ep_over_player)/sizeof(int);
+
   static long ep_bit[] =
   {
     EP_BIT_AMOEBALIVE,
@@ -1488,7 +1600,9 @@ void InitElementProperties()
     EP_BIT_PLAYER,
     EP_BIT_HAS_CONTENT,
     EP_BIT_EATABLE,
-    EP_BIT_SP_ELEMENT
+    EP_BIT_SP_ELEMENT,
+    EP_BIT_QUICK_GATE,
+    EP_BIT_OVER_PLAYER
   };
   static int *ep_array[] =
   {
@@ -1519,7 +1633,9 @@ void InitElementProperties()
     ep_player,
     ep_has_content,
     ep_eatable,
-    ep_sp_element
+    ep_sp_element,
+    ep_quick_gate,
+    ep_over_player
   };
   static int *ep_num[] =
   {
@@ -1550,7 +1666,9 @@ void InitElementProperties()
     &ep_player_num,
     &ep_has_content_num,
     &ep_eatable_num,
-    &ep_sp_element_num
+    &ep_sp_element_num,
+    &ep_quick_gate_num,
+    &ep_over_player_num
   };
   static int num_properties = sizeof(ep_num)/sizeof(int *);