diamonds fall through magic wall

sebseb7 · Sep 23, 2015 · 3e13398 · 3e13398
1 parent 0ebee92
commit 3e13398
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/bd_game.c b/bd_game.c
@@ -408,15 +408,15 @@ void bd_game_process(struct bd_game_struct_t* bd_game, int direction)
 						}
 						else if(
 								(new_cavemap[x][y+1] == BD_MAGICWALL)&&
-								((new_cavemap[x][y] == BD_BOULDERfall)||
-								(new_cavemap[x][y] == BD_BOULDER))
+								(new_cavemap[x][y] == BD_BOULDERfall)
 						)
 						{
 							bd_game->MagicWallActive=1;
 						}
 						else if(
 								(new_cavemap[x][y+1] == BD_MAGICWALLactive)&&
-								(new_cavemap[x][y] == BD_BOULDERfall)&&
+								((new_cavemap[x][y] == BD_DIAMONDfall)||
+								(new_cavemap[x][y] == BD_BOULDERfall))&&
 								(new_cavemap[x][y+2] == BD_SPACE)
 						)
 						{

diff --git a/bd_lib.c b/bd_lib.c
@@ -203,6 +203,10 @@ void get_colors(int type,int tick,int* colors)
 			colors[2]=36;
 			break;
 		case BD_BOULDER:
+			colors[0]=07;
+			colors[1]=99;
+			colors[2]=90;
+			break;
 		case BD_BOULDERfall:
 			colors[0]=107;
 			colors[1]=99;
@@ -235,6 +239,10 @@ void get_colors(int type,int tick,int* colors)
 			colors[2]=100+(13*sinlut[(tick>>2)%10]);
 			break;
 		case BD_DIAMOND:
+			colors[0]=86+(4*sinlut[(tick>>2)%10]);
+			colors[1]=6;
+			colors[2]=86+(4*sinlut[((tick+5)>>2)%10]);
+			break;
 		case BD_DIAMONDfall:
 			colors[0]=86+(4*sinlut[(tick>>2)%10]);
 			colors[1]=76;