From 1fe118708566754a7f8a5380126d6335f697f809 Mon Sep 17 00:00:00 2001
From: Sebastian Krzyszkowiak <dos@dosowisko.net>
Date: Fri, 18 May 2012 23:40:02 +0200
Subject: [PATCH] add muffins :D (for now as obstracles)

---
 src/level.c | 14 ++++++++++----
 src/main.h  |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/level.c b/src/level.c
index 38537a7..2678e06 100644
--- a/src/level.c
+++ b/src/level.c
@@ -191,10 +191,14 @@ bool GenerateObstracles(struct Game *game, struct TM_Action *action, enum TM_Act
 			obst->speed = 0;
 			obst->points = -10;
 			obst->hit = false;
-			obst->bitmap = &(game->level.obst_bmps.pie);
-			obst->callback = NULL;
+			if (rand()%100<=50) {
+				obst->callback=Obst_MoveUpDown;
+				obst->bitmap = &(game->level.obst_bmps.pie);
+			} else {
+				obst->callback = NULL;
+				obst->bitmap = &(game->level.obst_bmps.muffin);
+			}
 			obst->data = (void*)(rand()%2);
-			if (rand()%100<=50) obst->callback=Obst_MoveUpDown;
 			if (game->level.obstracles) {
 				game->level.obstracles->prev = obst;
 				obst->next = game->level.obstracles;
@@ -612,7 +616,7 @@ void Level_UnloadBitmaps(struct Game *game) {
 }
 
 void Level_PreloadBitmaps(struct Game *game, void (*progress)(struct Game*, float)) {
-	PROGRESS_INIT(10);
+	PROGRESS_INIT(11);
 	int x = 0;
 	struct Spritesheet *tmp = game->level.derpy_sheets;
 	while (tmp) {
@@ -648,6 +652,8 @@ void Level_PreloadBitmaps(struct Game *game, void (*progress)(struct Game*, floa
 		PROGRESS;
 		game->level.obst_bmps.pie = LoadScaledBitmap("menu/pie.png", al_get_display_width(game->display)*0.1, al_get_display_height(game->display)*0.1);
 		PROGRESS;
+		game->level.obst_bmps.muffin = LoadScaledBitmap("levels/muffin.png", al_get_display_width(game->display)*0.07, al_get_display_height(game->display)*0.1);
+		PROGRESS;
 		game->level.welcome = al_create_bitmap(al_get_display_width(game->display), al_get_display_height(game->display)/2);
 		PROGRESS;
 		al_set_target_bitmap(game->level.welcome);
diff --git a/src/main.h b/src/main.h
index e4c554b..79518ff 100644
--- a/src/main.h
+++ b/src/main.h
@@ -99,6 +99,7 @@ struct Level {
 	struct Spritesheet* pony_sheets; /*!< List of sprite sheets of character rescued by Derpy. */
 	struct {
 		ALLEGRO_BITMAP *pie;
+		ALLEGRO_BITMAP *muffin;
 	} obst_bmps;
 	struct Obstracle *obstracles;
 	struct Moonwalk moonwalk;