Merge lp:~godezinc/damn-monkey/introduction into lp:damn-monkey

[Vincent PEYROUSE (GodezInc)]

[lp:~godezinc/damn-monkey/introduction]

32. By Vincent PEYROUSE (GodezInc) on 2011-06-11

* Introduction screen improved

33. By Vincent PEYROUSE (GodezInc) on 2011-06-13

* Introduction screen fixed (no more level screen shown before intro)

=== modified file 'pixmaps/barrel.sprite'
--- pixmaps/barrel.sprite	2011-06-09 15:19:59 +0000
+++ pixmaps/barrel.sprite	2011-06-13 13:08:40 +0000
@@ -2,4 +2,4 @@
 walk-right  ; 0 ;  0 ; 24 ; 20 ;         4 ;      100 ;
 walk-left   ; 0 ; 20 ; 24 ; 20 ;         4 ;      100 ;
 walk-ladder ; 0 ; 41 ; 34 ; 20 ;         2 ;      100 ;
-custom  	; 0 ; 59 ; 38 ; 67 ;		 1 ;	  100 ;
+custom  	; 0 ; 59 ; 38 ; 67 ;		 1 ;	  100 ;
\ No newline at end of file

=== modified file 'pixmaps/damnmonkey.sprite'
--- pixmaps/damnmonkey.sprite	2011-06-09 15:19:59 +0000
+++ pixmaps/damnmonkey.sprite	2011-06-13 13:08:40 +0000
@@ -1,4 +1,4 @@
-#Movement ; x ; y ; w ; h ; numb. img ; delay ms ;
-walk-ladder ; 0 ; 163 ; 95 ; 90 ; 2 ; 200 ;
-throw-barrel ; 0 ; 81 ; 110 ; 82 ; 3 ; 220 ;
-custom ; 0 ; 0 ; 87 ; 81 ; 1 ; 100 ;
+#Movement    ; x ;   y ;   w ;  h ; numb. img ; delay ms ;
+walk-ladder  ; 0 ; 163 ;  95 ; 90 ;         2 ;      200 ;
+throw-barrel ; 0 ;  81 ; 110 ; 82 ;         3 ;      220 ;
+custom       ; 0 ;   0 ;  87 ; 81 ;         1 ;      100 ;
\ No newline at end of file

=== modified file 'pixmaps/help.sprite'
--- pixmaps/help.sprite	2011-06-09 15:19:59 +0000
+++ pixmaps/help.sprite	2011-06-13 13:08:40 +0000
@@ -1,2 +1,2 @@
 #Movement ; x ; y ;  w ;  h ; numb. img ; delay ms ;
-custom    ; 0 ; 0 ; 54 ; 36 ;         2 ;     1500 ;
+custom    ; 0 ; 0 ; 54 ; 36 ;         2 ;     1500 ;
\ No newline at end of file

=== modified file 'pixmaps/jumpman.sprite'
--- pixmaps/jumpman.sprite	2011-06-09 15:19:59 +0000
+++ pixmaps/jumpman.sprite	2011-06-13 13:08:40 +0000
@@ -7,4 +7,4 @@
 jump-left   ; 54 ; 32 ; 29 ; 31 ;         1 ;        0 ;
 ladder      ; 24 ; 64 ; 23 ; 31 ;         1 ;        0 ;
 walk-ladder ;  0 ; 64 ; 23 ; 31 ;         2 ;      120 ;
-dead        ;  0 ; 96 ; 34 ; 34 ;         4 ;      100 ;
+dead        ;  0 ; 96 ; 34 ; 34 ;         4 ;      100 ;
\ No newline at end of file

=== modified file 'pixmaps/lady.sprite'
--- pixmaps/lady.sprite	2011-06-09 15:19:59 +0000
+++ pixmaps/lady.sprite	2011-06-13 13:08:40 +0000
@@ -1,2 +1,2 @@
 #Movement   ;  x ;  y ;  w ;  h ; numb. img ; delay ms ;
-ask-help    ;  0 ;  0 ; 40 ; 42 ;         2 ;     1000 ;
+ask-help    ;  0 ;  0 ; 40 ; 42 ;         2 ;     1000 ;
\ No newline at end of file

=== added file 'pixmaps/level_01_begin.png'
Binary files pixmaps/level_01_begin.png	1970-01-01 00:00:00 +0000 and pixmaps/level_01_begin.png	2011-06-13 13:08:40 +0000 differ
=== modified file 'src/game.c'
--- src/game.c	2011-06-09 15:19:59 +0000
+++ src/game.c	2011-06-13 13:08:40 +0000
@@ -63,7 +63,7 @@
 	GAME_SPEED = 0;
 	GAME_STATE = GAME_STATE_PLAYING;
 
-	while (GAME_STATE != GAME_STATE_NONE && GAME_STATE != GAME_STATE_OVER)
+	while (GAME_STATE != GAME_STATE_NONE && GAME_STATE != GAME_STATE_OVER && GAME_SPEED < 4)
 	{
 		//Launch the level
 		switch (current_level)
@@ -85,16 +85,11 @@
 				}
 				break;
 			case GAME_STATE_LEVEL_COMPLETED:
-				GAME_SPEED += 1;
-				if (GAME_SPEED >= 4)
-				{
-					current_level +=1;
-					GAME_SPEED = 0;
-				}
 				if (current_level > levels_count)
 				{
 					current_level = 1; //Restart with the first level;					
 				}
+				GAME_SPEED += 1;
 				break;
 			case GAME_STATE_NONE:
 				break;
@@ -112,7 +107,10 @@
 		deref_object(&LAYER_MENU, bg_refresh);
 		SDL_Delay(20);
 		free_dm_surface(bg);
-
+	}
+	else
+	{
+		//TODO : Make a success screen
 	}
 	//End of the game
 	GAME_STATE = GAME_STATE_NONE;

=== modified file 'src/levels/level_01.c'
--- src/levels/level_01.c	2011-06-09 15:19:59 +0000
+++ src/levels/level_01.c	2011-06-13 13:08:40 +0000
@@ -327,26 +327,6 @@
  */
 void level_01(SDL_Surface *screen)
 {
-	//Load the background
-	DM_Surface *level_surface = load_resource_as_dm_surface("level_01.png");
-	int level_surface_refresh = ref_object(
-			&LAYER_BG,
-			level_surface,
-			surface_refresh_cb
-			);
-
-	//Load Lady and help sprites
-	DM_Sprite *lady = new_sprite("lady");
-	lady->current_mov = SPRITE_ASK_HELP;
-	lady->screen_pos.x = 300;
-	lady->screen_pos.y = 48;
-	int lady_refresh = ref_object(&LAYER_ACTIVE, lady, sprite_cb);
-	DM_Sprite *help = new_sprite("help");
-	help->current_mov = SPRITE_CUSTOM;
-	help->screen_pos.x = 340;
-	help->screen_pos.y = 10;
-	int help_refresh = ref_object(&LAYER_ACTIVE, help, sprite_cb);
-
 	//Load the level infos (collides,...)
 	DM_Map *map = load_map_infos("level_01");
 	
@@ -393,14 +373,36 @@
 	BARRELS->damnmonkey->screen_pos.x = 55;
 	BARRELS->damnmonkey->screen_pos.y = 94;
 	BARRELS->damnmonkey->current_mov = SPRITE_CUSTOM;
+
+	//Level launch
+	barrel_init(screen);
+	introduction(screen);
+	
+	//Load the background
+	DM_Surface *level_surface = load_resource_as_dm_surface("level_01.png");
+	int level_surface_refresh = ref_object(
+										   &LAYER_BG,
+										   level_surface,
+										   surface_refresh_cb
+										   );
+	
+	//Load Lady and help sprites and show Damn Monkey
+	DM_Sprite *lady = new_sprite("lady");
+	lady->current_mov = SPRITE_ASK_HELP;
+	lady->screen_pos.x = 300;
+	lady->screen_pos.y = 48;
+	int lady_refresh = ref_object(&LAYER_ACTIVE, lady, sprite_cb);
+	DM_Sprite *help = new_sprite("help");
+	help->current_mov = SPRITE_CUSTOM;
+	help->screen_pos.x = 340;
+	help->screen_pos.y = 10;
+	int help_refresh = ref_object(&LAYER_ACTIVE, help, sprite_cb);
 	int damnmonkey_refresh = ref_object(
-			&LAYER_ACTIVE,
-			BARRELS->damnmonkey,
-			sprite_cb
-			);
-
-	//GAME_STATE gestion
-	barrel_init(screen);
+										&LAYER_ACTIVE,
+										BARRELS->damnmonkey,
+										sprite_cb
+										);
+	
 	lets_play_yeah(screen, map);
 	//Dereference objects and free the memory
 	barrel_destroy();
@@ -427,3 +429,78 @@
 }
 
 
+/**
+ * \fn void introduction(SDL_Screen *surface)
+ * \brief Show the level intro.
+ *
+ * Show a introduction screen before the level beginning
+ *
+ * \param screen The main surface (called screen in the main() function). 
+ */
+void introduction(SDL_Surface *screen)
+{
+	DM_Surface *bg = load_resource_as_dm_surface("level_01_begin.png");
+	int bg_refresh = ref_object(&LAYER_FG, bg, surface_refresh_cb);
+	
+	DM_Surface *title = malloc(sizeof(DM_Surface));
+	title->surface = str_to_surface("font_main.png", "LEVEL 01");
+	title->rect.w = title->surface->w;
+	title->rect.h = title->surface->h;
+	title->rect.x = 75;
+	title->rect.y = 450;
+	int title_refresh = ref_object(&LAYER_FG, title, surface_refresh_cb);
+	
+	DM_Surface *level = malloc(sizeof(DM_Surface));
+	char buffer[5];
+	sprintf(buffer, "%i m", 25 * (GAME_SPEED + 1));
+	level->surface = str_to_surface("font_main.png", buffer);
+	level->rect.w = level->surface->w;
+	level->rect.h = level->surface->h;
+	level->rect.x = 100;
+	level->rect.y = 500;
+	int level_refresh = ref_object(&LAYER_FG, level, surface_refresh_cb);
+	
+	DM_Sprite *damnmonkey = new_sprite("damnmonkey");
+	damnmonkey->current_mov = SPRITE_WALK_LADDER;
+	damnmonkey->screen_pos.x = 400;
+	damnmonkey->screen_pos.y = 601;
+	int damnmonkey_refresh = ref_object(&LAYER_FG, damnmonkey, sprite_cb);
+	SDL_Delay(1000);
+	while (damnmonkey->screen_pos.y >= 53)
+	{
+		damnmonkey->screen_pos.y -= 2;
+		SDL_Delay(20);
+	}
+	damnmonkey->current_mov = SPRITE_CUSTOM;
+	damnmonkey->screen_pos.x = 470;
+	
+	DM_Sprite *lady = new_sprite("lady");
+	lady->current_mov = SPRITE_ASK_HELP;
+	lady->screen_pos.x = 570;
+	lady->screen_pos.y = 90;
+	int lady_refresh = ref_object(&LAYER_FG, lady, sprite_cb);
+	
+	DM_Sprite *help = new_sprite("help");
+	help->current_mov = SPRITE_CUSTOM;
+	help->screen_pos.x = 610;
+	help->screen_pos.y = 45;
+	int help_refresh = ref_object(&LAYER_FG, help, sprite_cb);
+    
+	SDL_Delay(2000);
+	//Derefence objects and free the memory
+	deref_object(&LAYER_FG, help_refresh);
+	deref_object(&LAYER_FG, lady_refresh);
+	deref_object(&LAYER_FG, damnmonkey_refresh);
+	deref_object(&LAYER_FG, level_refresh);
+	deref_object(&LAYER_FG, title_refresh);
+	deref_object(&LAYER_FG, bg_refresh);
+	SDL_Delay(20);
+	free_sprite(help);
+	free_sprite(lady);
+	free_sprite(damnmonkey);
+	free_dm_surface(level);
+	free_dm_surface(title);
+	free_dm_surface(bg);
+}
+
+

=== modified file 'src/levels/level_01.h'
--- src/levels/level_01.h	2011-06-05 20:18:38 +0000
+++ src/levels/level_01.h	2011-06-13 13:08:40 +0000
@@ -113,6 +113,7 @@
 int check_platform_orientation(DM_Collide *collide_point, DM_Map *map);
 void free_dm_barrel(DM_Barrel *barrels);
 void level_01(SDL_Surface *screen);
+void introduction(SDL_Surface *screen);
 
 
 #endif //LEVEL_01_H_INCLUDED