Diff: gameCharacters.h

Revision:

1:14e5288790f4

Parent:

0:fa4a8b6195c8

Child:

2:d9440b3314bb

--- a/gameCharacters.h	Tue Apr 26 18:43:44 2016 +0000
+++ b/gameCharacters.h	Fri Apr 29 10:44:46 2016 +0000
@@ -19,19 +19,6 @@
     {0,0,0,0,1,0,0,0,0,0}
 };
 
-int g_get_recks_still_gun[10][11] = {
-    {0,0,0,0,0,0,1,0,0,0,0},
-    {0,0,0,0,0,0,1,0,0,0,0},
-    {0,0,0,0,0,0,1,0,0,0,0},
-    {0,0,0,0,0,0,0,0,1,g_g1,g_g2},
-    {0,0,0,0,0,0,0,1,0,0,0},
-    {0,0,0,0,0,1,0,0,0,0,0},
-    {0,0,0,0,0,1,0,0,0,0,0},
-    {0,0,0,0,0,1,0,0,0,0,0},
-    {0,0,0,0,0,1,0,0,0,0,0},
-    {0,0,0,0,0,1,0,0,0,0,0}
-};
-
 int g_recks_moving_gun[10][10]= {      //global array for the main charachter (recks) when he is moving
     {0,0,0,1,1,1,0,0,0,0},
     {0,0,0,1,1,1,0,0,0,0},
@@ -108,36 +95,49 @@
     {0,1,0,0,0,1,0}
 };
 
-int g_mod_rat_p1[3][8]= {           //global array for a rat
+int g_mob_rat_p1[3][8]= {           //global array for a rat
     {0,0,0,0,0,0,0,1},
     {0,1,1,1,0,0,1,0},
     {1,1,1,1,1,1,0,0}
 };
 
-int g_mod_rat_p2[3][8]= {           //second global array for a rat
+int g_mob_rat_p2[3][8]= {           //second global array for a rat
     {0,0,0,0,0,0,1,0},
     {0,1,1,1,0,0,1,0},
     {1,1,1,1,1,1,0,0}
 };
 
-int g_mob_hound_p1[7][13]= {        //global array for a hound
+int g_mob_hound_p1[8][13]= {        //global array for a hound
     {0,0,0,1,0,0,0,0,0,0,0,0,0},
     {0,1,1,1,0,0,0,0,0,0,0,1,0},
     {1,1,1,1,0,0,0,0,0,0,0,1,0},
     {1,1,1,1,1,1,1,1,1,1,1,0,0},
     {0,0,0,1,1,1,1,1,1,1,1,0,0},
     {0,0,0,1,0,0,0,0,0,0,1,0,0},
+    {0,0,0,1,0,0,0,0,0,0,1,0,0},
     {0,0,0,1,0,0,0,0,0,0,1,0,0}
 };
 
-int g_mob_hound_p2[7][13]= {        //global array for a moving hound
+int g_mob_hound_p2[8][13]= {        //global array for a moving hound
     {0,0,0,1,0,0,0,0,0,0,0,0,0},
     {0,1,1,1,0,0,0,0,0,0,0,0,1},
     {1,1,1,1,0,0,0,0,0,0,0,1,0},
     {1,1,1,1,1,1,1,1,1,1,1,0,0},
     {0,0,0,1,1,1,1,1,1,1,1,0,0},
-    {0,0,0,1,0,0,0,0,0,0,1,0,0},
-    {0,0,0,1,0,0,0,0,0,0,1,0,0}
+    {0,0,1,0,0,0,0,0,0,0,0,1,0},
+    {0,1,0,0,0,0,0,0,0,0,0,0,1},
+    {1,0,0,0,0,0,0,0,0,0,0,0,1}
+};
+
+int g_mob_hound_dead[8][13]= {        //global array for a moving hound
+    {0,0,0,0,0,0,0,0,0,0,1,0,1},
+    {0,0,1,0,0,1,0,1,0,1,0,0,1},
+    {0,1,0,1,0,0,0,0,0,0,0,1,0},
+    {0,0,0,0,1,1,0,1,0,1,0,0,0},
+    {0,0,0,0,1,0,1,0,0,1,0,0,0},
+    {0,0,0,0,0,1,0,0,0,0,0,0,0},
+    {0,1,0,0,0,0,1,0,0,0,0,0,0},
+    {0,0,0,0,1,0,0,0,0,0,0,0,0}
 };
 
 int g_mob_bear_p1[10][19]= {        //global array for a still bear
@@ -234,7 +234,7 @@
     {0,0,1,0,0}
 };
 
-int g_t_rex[26][25]= {
+int g_t_rex[28][25]= {
     {0,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {1,1,1,1,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {1,1,1,1,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
@@ -260,9 +260,11 @@
     {0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0},
+    {0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0},
+    {0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,1,1,1,0,0,1,1,1,0,0,0,0,0,0,0,0}
 };
-int g_t_rex_moving[26][25]= {
+int g_t_rex_moving[28][25]= {
     {0,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {1,1,1,1,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {1,1,1,1,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
@@ -288,10 +290,12 @@
     {0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0},
-    {0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0}
+    {0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0},
+    {0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0},
+    {0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0}
 };
 
-int g_t_rex_attack[26][25]= {
+int g_t_rex_attack[28][25]= {
     {0,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {1,1,1,1,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {1,1,1,1,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
@@ -317,6 +321,8 @@
     {0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0},
+    {0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0},
+    {0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,1,1,1,0,0,1,1,1,0,0,0,0,0,0,0,0}
 };
 
@@ -330,8 +336,8 @@
     {0,1,0,0,1,0,0,1,0},
     {0,0,0,0,0,0,0,0,0},
     {0,0,0,1,0,1,0,0,0}
-    };
-    
+};
+
 int g_fire_ball_p2[9][9]= {
     {0,0,0,0,1,0,0,0,0},
     {0,0,1,0,0,0,1,0,0},
@@ -342,7 +348,7 @@
     {0,0,0,0,1,0,0,0,0},
     {0,0,1,0,0,0,1,0,0},
     {0,0,0,0,1,0,0,0,0}
-    };
+};
 
 int g_clouds[3][342]= {
     {0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,1,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,1,0,1,1,1,1,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
@@ -381,9 +387,26 @@
     {1,0,1,1,1,0,1},
     {1,0,1,0,1,0,1},
     {1,0,0,0,0,0,1},
-    {1,1,1,1,1,1,1},
+    {1,1,1,1,1,1,1}
 };
 
+int g_padlock_p1[6][4]= {
+    {0,1,1,0},
+    {1,0,0,1},
+    {1,0,0,1},
+    {1,1,1,1},
+    {1,1,1,1},
+    {1,1,1,1}
+};
+
+int g_padlock_p2[6][4]= {
+    {0,1,1,0},
+    {1,0,0,1},
+    {1,0,0,0},
+    {1,1,1,1},
+    {1,1,1,1},
+    {1,1,1,1}
+};
 
 int zero[5][3]= {
     {1,1,1},