Merge lp:~damn-monkey-devs/damn-monkey/game-and-lives-management into lp:damn-monkey

[Vincent PEYROUSE (GodezInc)]

[Fabien LOISON (flozz)]

I think that the code that display the remaining lives should be in the lets_play_yeah() function instead of the level_01() function. And the lives must be on the LAYER_FG layer instead of the LAYER_MENU layer.

review: Needs Fixing

[lp:~damn-monkey-devs/damn-monkey/game-and-lives-management]

30. By Vincent PEYROUSE (GodezInc) on 2011-06-03

* Some code refactoring

[Fabien LOISON (flozz)]

All right :)

review: Approve

=== added file 'pixmaps/life.png'
 Binary files pixmaps/life.png	1970-01-01 00:00:00 +0000 and pixmaps/life.png	2011-06-03 11:21:31 +0000 differ
=== modified file 'src/game.c'
--- src/game.c	2011-05-19 17:22:16 +0000
+++ src/game.c	2011-06-03 11:21:31 +0000
@@ -44,6 +44,84 @@
 
 
 #include "game.h"
+#include "levels/level_01.h"
+
+
+/**
+ * \fn void game(SDL_Surface *screen)
+ * \brief Play to the game.
+ *
+ * This function manage the levels and the lives.
+ *
+ * \param screen The main surface (called screen in the main() function).
+ */
+void game(SDL_Surface *screen)
+{
+	int current_level = 1;
+	int levels_count = 1; //Number of levels
+	JUMPMAN_LIVES = 3;
+	GAME_SPEED = 1;
+	GAME_STATE = GAME_STATE_PLAYING;
+
+	while (GAME_STATE != GAME_STATE_NONE && GAME_STATE != GAME_STATE_OVER)
+	{
+		//Launch the level
+		switch (current_level)
+		{
+			case 1:
+				level_01(screen);
+				break;
+			default:
+				break;
+		}
+		//Check the status
+		switch (GAME_STATE)
+		{
+			case GAME_STATE_LIFE_LOST:
+				JUMPMAN_LIVES -= 1;
+				if (JUMPMAN_LIVES <= 0)
+				{
+					GAME_STATE = GAME_STATE_OVER;
+				}
+				break;
+			case GAME_STATE_LEVEL_COMPLETED:
+				current_level += 1;
+				if (current_level > levels_count)
+				{
+					current_level = 1; //Restart with the first level;
+					GAME_SPEED++;
+				}
+				break;
+			case GAME_STATE_NONE:
+				break;
+			default:
+				printf("W: Abnormal game status: %i", GAME_STATE);
+				GAME_STATE = GAME_STATE_NONE;
+				break;
+		}
+	}
+	if (GAME_STATE == GAME_STATE_OVER)
+	{
+		DM_Surface *bg = load_resource_as_dm_surface("menu_bg.png");
+		int bg_refresh = ref_object(&LAYER_MENU, bg, surface_refresh_cb);
+		DM_Surface *text = malloc(sizeof(DM_Surface));
+		text->surface = str_to_surface("font_menu.png", "GAME OVER");
+		text->rect.w = text->surface->w;
+		text->rect.h = text->surface->h;
+		text->rect.x = (screen->w - text->rect.w) / 2;
+		text->rect.y = (screen->h / 3);
+		int text_refresh = ref_object(&LAYER_MENU, text, surface_refresh_cb);
+		//TODO : Make it became sexier with a picture and sad song
+		SDL_Delay(2000);
+		deref_object(&LAYER_MENU, bg_refresh);
+		deref_object(&LAYER_MENU, text_refresh);
+		SDL_Delay(20);
+		free_dm_surface(bg);
+		free_dm_surface(text);
+	}
+	//End of the game
+	GAME_STATE == GAME_STATE_NONE;
+}
 
 
 /**
@@ -155,6 +233,21 @@
 	Mix_Chunk *sound_die = load_sound_resource("die.wav");
 	//Initialize the GAME_STATE variable
 	GAME_STATE = GAME_STATE_PLAYING;
+	//Load and show remaining lifes
+	DM_Surface *life = load_resource_as_dm_surface("life.png");
+	life->rect.x = 730;
+	life->rect.y = 17;
+	int life_refresh = ref_object(&LAYER_FG, life, surface_refresh_cb);
+	DM_Surface *life_text = malloc(sizeof(DM_Surface));
+	//"x <number of remaining lives>" surface creation
+	char life_char[3];
+	sprintf(life_char, "x%d", JUMPMAN_LIVES);
+	life_text->surface = str_to_surface("font_main.png", life_char);
+	life_text->rect.w = life_text->surface->w;
+	life_text->rect.h = life_text->surface->h;
+	life_text->rect.x = life->rect.x + life->rect.w + 5;
+	life_text->rect.y = life->rect.y;
+	int life_text_refresh = ref_object(&LAYER_FG, life_text, surface_refresh_cb);
 	//Set the start position of Jumpman
 	JUMPMAN.movement = map->start_look;
 	JUMPMAN.pos_x = map->start_point_x - JUMPMAN.sprite->items[JUMPMAN.movement].w / 2;
@@ -573,10 +666,15 @@
 
 	//TODO if the player win, play a music,...
 
-	//Dereference Jumpman
+	//Dereference Jumpman and remaining lifes
 	deref_object(&LAYER_ACTIVE, jumpman_refresh);
+	deref_object(&LAYER_FG, life_text_refresh);
+	deref_object(&LAYER_FG, life_refresh);
+	SDL_Delay(50);
 	//Free the memory
 	Mix_FreeChunk(sound_die);
+	free_dm_surface(life_text);
+	free_dm_surface(life);
 	//Return the game state
 	return GAME_STATE;
 }
 
=== modified file 'src/game.h'
--- src/game.h	2011-05-13 18:40:34 +0000
+++ src/game.h	2011-06-03 11:21:31 +0000
@@ -233,11 +233,12 @@
 int GAME_STATE;
 /**
  * \var JUMPMAN_LIVES
- * \brief The remaining lives of Jumpman (FIXME not implemented yet).
+ * \brief The remaining lives of Jumpman
  */
 int JUMPMAN_LIVES;
 
 
+void game(SDL_Surface *screen);
 void init_game();
 void update_jumpman();
 int lets_play_yeah(SDL_Surface *screen, DM_Map *map);
 
=== modified file 'src/levels/level_01.c'
--- src/levels/level_01.c	2011-05-13 18:51:52 +0000
+++ src/levels/level_01.c	2011-06-03 11:21:31 +0000
@@ -57,6 +57,7 @@
 	
 	//Load the level infos (collides,...)
 	DM_Map *map = load_map_infos("level_01");
+		
 	lets_play_yeah(screen, map);
 	
 	//Dereference objects and free the memory
 
=== modified file 'src/main.c'
--- src/main.c	2011-05-13 14:54:31 +0000
+++ src/main.c	2011-06-03 11:21:31 +0000
@@ -147,7 +147,7 @@
 		{
 			case MAIN_MENU_PLAY:
 				Mix_HaltMusic();
-				level_01(screen);
+				game(screen);
 				Mix_PlayMusic(menu_music, -1);
 				break;
 			case MAIN_MENU_CREDITS: