Merge lp:~damn-monkey-devs/damn-monkey/barrels into lp:damn-monkey

[Vincent PEYROUSE (GodezInc)]

=== modified file 'levels/level_01.map'
--- levels/level_01.map	2011-05-12 20:20:45 +0000
+++ levels/level_01.map	2011-06-05 20:31:10 +0000
@@ -1,25 +1,17 @@
-#Jumpman start point     ;   x ;   y ;   - ;   - ;
-jumpman-start-left       ; 762 ; 557 ;   0 ;   0 ;
-
-#Finish rectangle        ;  x1 ;  y1 ;  x2 ;  y2 ;
-finish-collide           ; 462 ;  88 ; 491 ;  91 ;
-
-#Platforms collide lines ;  x1 ;  y1 ;  x2 ;  y2 ;
-platform-collide         ; 799 ; 558 ; 661 ; 558 ;
-platform-collide         ; 661 ; 558 ;  13 ; 542 ;
-platform-collide         ; 135 ; 467 ; 787 ; 451 ;
-platform-collide         ; 665 ; 382 ;  13 ; 366 ;
-platform-collide         ; 135 ; 291 ; 787 ; 275 ;
-platform-collide         ; 667 ; 206 ; 297 ; 175 ;
-platform-collide         ; 297 ; 175 ;   8 ; 175 ;
-
-#Platforms collide rect  ;  x1 ;  y1 ;  x2 ;  y2 ;
-ladder-collide           ; 156 ; 465 ; 185 ; 547 ;
-ladder-collide           ; 394 ; 374 ; 423 ; 462 ;
-ladder-collide           ; 600 ; 379 ; 629 ; 457 ;
-ladder-collide           ; 275 ; 286 ; 304 ; 374 ;
-ladder-collide           ; 149 ; 289 ; 178 ; 371 ;
-ladder-collide           ; 604 ; 200 ; 633 ; 280 ;
-ladder-collide           ; 462 ;  90 ; 491 ; 192 ;
-
-
+jumpman-start-left ; 762 ; 557 ;   0 ;   0 ;
+finish-collide     ; 462 ;  88 ; 491 ;  91 ;
+platform-collide   ; 799 ; 558 ; 661 ; 558 ;
+platform-collide   ; 661 ; 558 ;  13 ; 542 ;
+platform-collide   ; 135 ; 467 ; 787 ; 451 ;
+platform-collide   ; 665 ; 382 ;  13 ; 366 ;
+platform-collide   ; 135 ; 291 ; 787 ; 275 ;
+platform-collide   ; 667 ; 206 ; 297 ; 175 ;
+platform-collide   ; 297 ; 175 ;   8 ; 175 ;
+platform-collide   ; 297 ; 175 ; 297 ; 117 ;
+ladder-collide     ; 156 ; 465 ; 185 ; 547 ;
+ladder-collide     ; 394 ; 374 ; 423 ; 462 ;
+ladder-collide     ; 600 ; 379 ; 629 ; 457 ;
+ladder-collide     ; 275 ; 286 ; 304 ; 374 ;
+ladder-collide     ; 149 ; 289 ; 178 ; 371 ;
+ladder-collide     ; 604 ; 200 ; 633 ; 280 ;
+ladder-collide     ; 462 ;  90 ; 491 ; 192 ;

=== added file 'pixmaps/barrel.png'
Binary files pixmaps/barrel.png	1970-01-01 00:00:00 +0000 and pixmaps/barrel.png	2011-06-05 20:31:10 +0000 differ
=== added file 'pixmaps/barrel.sprite'
--- pixmaps/barrel.sprite	1970-01-01 00:00:00 +0000
+++ pixmaps/barrel.sprite	2011-06-05 20:31:10 +0000
@@ -0,0 +1,6 @@
+#Movement   ; x ;  y ;  w ;  h ; numb. img ; delay ms ;
+walk-right  ; 0 ;  0 ; 24 ; 20 ;         4 ;      100 ;
+walk-left   ; 0 ; 20 ; 24 ; 20 ;         4 ;      100 ;
+walk-ladder ; 0 ; 41 ; 34 ; 20 ;         2 ;      100 ;
+
+

=== modified file 'pixmaps/damnmonkey.png' (properties changed: +x to -x)
Binary files pixmaps/damnmonkey.png	2011-06-04 14:03:47 +0000 and pixmaps/damnmonkey.png	2011-06-05 20:31:10 +0000 differ
=== modified file 'pixmaps/damnmonkey.sprite' (properties changed: +x to -x)
--- pixmaps/damnmonkey.sprite	2011-06-04 14:03:47 +0000
+++ pixmaps/damnmonkey.sprite	2011-06-05 20:31:10 +0000
@@ -1,4 +1,6 @@
-#Movement ; x ; y ; w ; h ; numb. items ; delay ms ;
-ladder-walk ; 0 ; 163 ; 84 ; 95 ; 2 ; 160 ;
-throw-barrel; 0 ; 81 ; 109 ; 82 ; 3 ; 100 ;
-custom ; 0 ; 0 ; 87 ; 81 ; 1 ; 100 ;
\ No newline at end of file
+#Movement    ;  x ;   y ;   w ;   h ; numb. img ; delay ms ;
+ladder-walk  ;  0 ; 163 ;  84 ;  95 ;         2 ;      160 ;
+throw-barrel ;  0 ;  81 ; 110 ;  82 ;         3 ;      220 ;
+custom       ;  0 ;   0 ;  87 ;  81 ;         1 ;      100 ;
+
+

=== added file 'pixmaps/help.png'
Binary files pixmaps/help.png	1970-01-01 00:00:00 +0000 and pixmaps/help.png	2011-06-05 20:31:10 +0000 differ
=== added file 'pixmaps/help.sprite'
--- pixmaps/help.sprite	1970-01-01 00:00:00 +0000
+++ pixmaps/help.sprite	2011-06-05 20:31:10 +0000
@@ -0,0 +1,4 @@
+#Movement ; x ; y ;  w ;  h ; numb. img ; delay ms ;
+custom    ; 0 ; 0 ; 54 ; 36 ;         2 ;     1500 ;
+
+

=== modified file 'pixmaps/jumpman.png' (properties changed: +x to -x)
=== modified file 'pixmaps/lady.png' (properties changed: +x to -x)
Binary files pixmaps/lady.png	2011-06-01 15:27:06 +0000 and pixmaps/lady.png	2011-06-05 20:31:10 +0000 differ
=== modified file 'pixmaps/lady.sprite' (properties changed: +x to -x)
--- pixmaps/lady.sprite	2011-06-01 15:27:06 +0000
+++ pixmaps/lady.sprite	2011-06-05 20:31:10 +0000
@@ -1,4 +1,4 @@
-#Movement ; x ; y ; w ; h ; numb. items ; delay ms ;
-ask-help ; 0 ; 42 ; 54 ; 36 ; 1 ; 100 ;
-custom ; 0 ; 0 ; 40 ; 42 ; 2 ; 1000 ;
-
+#Movement   ;  x ;  y ;  w ;  h ; numb. img ; delay ms ;
+ask-help    ;  0 ;  0 ; 40 ; 42 ;         2 ;     1000 ;
+
+

=== modified file 'pixmaps/life.png' (properties changed: +x to -x)
=== modified file 'pixmaps/pause_menu.png' (properties changed: +x to -x)
=== modified file 'src/game.c'
--- src/game.c	2011-06-03 11:20:13 +0000
+++ src/game.c	2011-06-05 20:31:10 +0000
@@ -60,7 +60,7 @@
 	int current_level = 1;
 	int levels_count = 1; //Number of levels
 	JUMPMAN_LIVES = 3;
-	GAME_SPEED = 1;
+	GAME_SPEED = 0;
 	GAME_STATE = GAME_STATE_PLAYING;
 
 	while (GAME_STATE != GAME_STATE_NONE && GAME_STATE != GAME_STATE_OVER)
@@ -85,11 +85,15 @@
 				}
 				break;
 			case GAME_STATE_LEVEL_COMPLETED:
-				current_level += 1;
+				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++;
+					current_level = 1; //Restart with the first level;					
 				}
 				break;
 			case GAME_STATE_NONE:
@@ -120,7 +124,7 @@
 		free_dm_surface(text);
 	}
 	//End of the game
-	GAME_STATE == GAME_STATE_NONE;
+	GAME_STATE = GAME_STATE_NONE;
 }
 
 
@@ -509,7 +513,7 @@
 				JUMPMAN.platform_collide.x1--;
 				if (!check_platform_collides(&JUMPMAN.platform_collide, map))
 				{
-					JUMPMAN.pos_x -= 1;
+					JUMPMAN.pos_x -= 2;
 				}
 				else
 				{
@@ -531,7 +535,7 @@
 				JUMPMAN.platform_collide.x1++;
 				if (!check_platform_collides(&JUMPMAN.platform_collide, map))
 				{
-					JUMPMAN.pos_x += 1;
+					JUMPMAN.pos_x += 2;
 				}
 				else
 				{

=== modified file 'src/levels/level_01.c'
--- src/levels/level_01.c	2011-06-03 11:20:13 +0000
+++ src/levels/level_01.c	2011-06-05 20:31:10 +0000
@@ -44,6 +44,283 @@
 
 
 /**
+ * \fn void barrel_init(SDL_Surface *screen)
+ * \brief Initialize the barrel refresh
+ *
+ * \param screen The main SDL_Surface.
+ */
+void barrel_init(SDL_Surface *screen)
+{
+	barrel_timer = SDL_AddTimer(20, _barrel_cb, NULL);
+}
+
+
+/**
+ * \fn void barrel_destroy()
+ * \brief Stop the refresh
+ */
+void barrel_destroy()
+{
+	SDL_RemoveTimer(barrel_timer);
+}
+
+
+/**
+ * \fn int ref_barrel(void *object, void (*callback)())
+ * \brief Add a barrel to the refresh list.
+ *
+ * \param object A pointer on the object
+ * \param callback The callback function that will be called for blitting the
+ *                 object. This function must have a prototype that looks
+ *                 like that:
+ * \code
+ * void function_name(void *object, SDL_Surface *screen);
+ * \endcode
+ * 
+ * \return The id of the refresh item.
+ */
+int ref_barrel(void *object, void (*callback)())
+{
+	int barrel_id = ref_object(&LAYER_ACTIVE, object, callback);
+	return barrel_id;
+}
+
+
+/**
+ * \fn void deref_barrel(int id)
+ * \brief Dereference a barrel.
+ *
+ * \param id The identifier of the object.
+ */
+void deref_barrel(int id)
+{
+	deref_object(&LAYER_ACTIVE, id);
+}
+
+
+/** \cond */ //Hide the "privates" functions to Doxygen
+
+//Callback function for the barrel_timer
+Uint32 _barrel_cb(Uint32 interval, void *arg)
+{
+	if (GAME_STATE != GAME_STATE_PAUSED)
+	{
+		int i;
+		//Every 'turn' we check every barrel
+		for (i=0 ; i<BARRELS->numb_items ; i++)
+		{
+			if (BARRELS->barrels[i].sprite->screen_pos.x > 780 \
+					|| BARRELS->barrels[i].sprite->screen_pos.y > 550)
+			{
+				//The barrel is at the level end, we dereference it and replace
+				//at the level beginning
+				deref_barrel(BARRELS->barrels[i].refresh_id);
+				BARRELS->barrels[i].refresh_id = -1;
+				SDL_Delay(20);
+				BARRELS->barrels[i].sprite->screen_pos.x = 0;
+				BARRELS->barrels[i].sprite->screen_pos.y = 150;
+			}
+			else if (BARRELS->barrels[i].sprite->screen_pos.x == 150 \
+					&& BARRELS->barrels[i].sprite->screen_pos.y == 150)
+			{
+				//The barrel is after Donkey Kong, we reference it and show it
+				BARRELS->barrels[i].refresh_id = ref_barrel(
+						&BARRELS->barrels[i],
+						barrel_cb
+						);
+			}
+			else if (BARRELS->barrels[i].sprite->screen_pos.x < 150 \
+					&& BARRELS->barrels[i].sprite->screen_pos.y == 150)
+			{
+				//The barrel is waiting to being launched
+				if (BARRELS->barrels[BARRELS->last_sent].sprite->screen_pos.y \
+						>= 180 - 8 * GAME_SPEED - 5)
+				{
+					BARRELS->damnmonkey->current_mov = SPRITE_THROW_BARREL;
+				}
+				if (BARRELS->barrels[BARRELS->last_sent].sprite->screen_pos.y \
+						>= 180 - 8 * GAME_SPEED)
+				{
+					//The last barrel is already sent with an enough offset,
+					//we can launch the next one.
+					BARRELS->damnmonkey->current_mov = SPRITE_CUSTOM;
+					BARRELS->last_sent = i;
+					BARRELS->barrels[i].sprite->screen_pos.x = 150;
+				}
+			}
+		}
+		return refresh_cb(interval, &LAYER_ACTIVE);
+	}
+	return interval;
+}
+
+/** \endcond */
+
+
+/**
+ * \fn void barrel_cb(void *object, SDL_Surface *screen)
+ * \brief Callback function for blitting DM_Barrel
+ *
+ * \param object The DM_Barrel to blit.
+ * \param screen The main surface.
+ */
+void barrel_cb(void *object, SDL_Surface *screen)
+{
+	if (GAME_STATE != GAME_STATE_PAUSED)
+	{
+		DM_Barrel *barrel = object;
+		
+		//Damn Monkey collide initialisation
+		DM_Collide damnmonkey_collide;
+		damnmonkey_collide.shape = COLLIDE_RECT;
+		damnmonkey_collide.x1 = BARRELS->damnmonkey->screen_pos.x;
+		damnmonkey_collide.y1 = BARRELS->damnmonkey->screen_pos.y;
+		damnmonkey_collide.x2 = BARRELS->damnmonkey->screen_pos.x + \
+								BARRELS->damnmonkey->screen_pos.w;
+		damnmonkey_collide.y2 = BARRELS->damnmonkey->screen_pos.y + \
+								BARRELS->damnmonkey->screen_pos.h;
+		
+		if (!collide(barrel->jumpman_collide, &JUMPMAN.enemy_collide) \
+				&& !collide(&JUMPMAN.enemy_collide, &damnmonkey_collide))
+		{
+			//There's no collision between Jumpman and a barrel
+			if (check_ladder_top_collides(barrel->platform_collide, barrel->map) \
+					&& barrel->platform_collide->x1 == get_collide_ladder_center(
+						barrel->platform_collide, barrel->map
+						)
+					)
+			{
+				//The barrel is on a ladder, random fall on the ladder
+				if (rand()%2)
+				{
+					barrel->sprite->current_mov = SPRITE_WALK_LADDER;
+					barrel->sprite->screen_pos.y = barrel->sprite->screen_pos.y \
+												   + 4;
+				}
+				else
+				{
+					//Movement continuation
+					if (barrel->sprite->current_mov != SPRITE_WALK_LEFT)
+					{
+						barrel->sprite->screen_pos.x++;
+					}
+					else
+					{
+						barrel->sprite->screen_pos.x--;
+					}
+				}
+			}
+			else
+			{
+				//The barrel isn't on a ladder so we check if it is in
+				//collision with a platform
+				if (check_platform_collides(barrel->platform_collide, barrel->map))
+				{
+					//We generate the good movement according to the gravity
+					barrel->sprite->current_mov = check_platform_orientation(
+							barrel->platform_collide,
+							barrel->map
+							);
+					if (barrel->sprite->current_mov != SPRITE_WALK_LEFT)
+					{
+						barrel->sprite->screen_pos.x++;
+					}
+					else
+					{
+						barrel->sprite->screen_pos.x--;
+					}
+				}
+				else
+				{
+					//No collision : the barrel is falling/descending
+					barrel->sprite->screen_pos.y++;
+				}
+			}
+			
+			//Collision rect and point update
+			barrel->jumpman_collide->x1 = barrel->sprite->screen_pos.x + 2;
+			barrel->jumpman_collide->y1 = barrel->sprite->screen_pos.y + 2;
+			barrel->jumpman_collide->x2 = barrel->jumpman_collide->x1 + barrel->sprite->items[barrel->sprite->current_mov].w - 4;
+			barrel->jumpman_collide->y2 = barrel->jumpman_collide->y1 + barrel->sprite->items[barrel->sprite->current_mov].w - 4;
+			barrel->platform_collide->x1 = barrel->jumpman_collide->x1 + (barrel->sprite->items[barrel->sprite->current_mov].w / 2);
+			barrel->platform_collide->y1 = barrel->jumpman_collide->y1 + barrel->sprite->items[barrel->sprite->current_mov].h;
+			barrel->platform_collide->x2 = 0;
+			barrel->platform_collide->y2 = 0;
+		}
+		else
+		{
+			//There's a collision between Jumpman and a barrel => A life lost
+			GAME_STATE = GAME_STATE_LIFE_LOST;
+		}
+		//Call of sprite_cb in order to update the screen
+		sprite_cb(barrel->sprite, screen);
+	}
+}
+
+
+/**
+ * \fn int check_platform_orientation(DM_Collide *collide_point, DM_Map *map)
+ * \brief Function for checking platform orientation
+ *
+ * \param collide_point The barrel collide point to check.
+ * \param map The pointer to the DM_Map structure.
+ *
+ * \return int The barrel movement corresponding to the platform orientation.
+ */
+int check_platform_orientation(DM_Collide *collide_point, DM_Map *map)
+{
+	int i;
+	for (i=0 ; i<map->platform_count ; i++)
+	{
+		//The collide function allow us to find the barrel which is considered
+		if (collide(collide_point, &map->platforms[i]))
+		{
+			if (map->platforms[i].x1 < map->platforms[i].x2 \
+					&& map->platforms[i].y1 > map->platforms[i].y2)
+			{
+				return SPRITE_WALK_LEFT;
+			}
+			else if (map->platforms[i].x1 < map->platforms[i].x2 \
+					&& map->platforms[i].y1 < map->platforms[i].y2)
+			{
+				return SPRITE_WALK_RIGHT;
+			}
+			else if (map->platforms[i].x1 > map->platforms[i].x2 \
+					&& map->platforms[i].y1 > map->platforms[i].y2)
+			{
+				return SPRITE_WALK_RIGHT;
+			}
+			else if (map->platforms[i].x1 > map->platforms[i].x2 \
+					&& map->platforms[i].y1 < map->platforms[i].y2)
+			{
+				return SPRITE_WALK_LEFT;
+			}
+			else if (map->platforms[i].y1 == map->platforms[i].y2)
+			{
+				return SPRITE_WALK_RIGHT;
+			}
+		}
+	}
+	return 42;
+}
+
+
+/**
+ * \fn void free_dm_barrel(DM_Barrel *barrels)
+ * \brief Releases the memory of a DM_Barrel pointer.
+ *
+ * \param splited The DM_Barrel pointer to free.
+ */
+void free_dm_barrel(DM_Barrel *barrel)
+{
+	//We don't deallocate the map pointer because it'll be freed later
+	free_sprite(barrel->sprite);
+	free(barrel->jumpman_collide);
+	free(barrel->platform_collide);
+}
+
+
+/**
  * \fn void level_01(SDL_Surface *screen)
  * \brief Play to the first level.
  *
@@ -53,17 +330,100 @@
 {
 	//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);
-	
+	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");
-		
+	
+	//Load and play level music
+	Mix_Music *level_music = load_music_resource("game.ogg");
+	Mix_PlayMusic(level_music, -1);
+
+	//Load barrels and launch the barrel timer
+	int i;
+	int barrels_nb = 20;
+	BARRELS = malloc(sizeof(DM_Barrel_Array));
+	BARRELS->numb_items = barrels_nb;
+	BARRELS->last_sent = 0;
+	BARRELS->barrels = malloc(BARRELS->numb_items * sizeof(DM_Barrel));
+	for (i=0 ; i<BARRELS->numb_items ; i++)
+	{
+		BARRELS->barrels[i].map = map;
+		BARRELS->barrels[i].sprite = new_sprite("barrel");
+		BARRELS->barrels[i].sprite->current_mov = SPRITE_WALK_RIGHT;
+		BARRELS->barrels[i].sprite->screen_pos.x = 0;
+		BARRELS->barrels[i].sprite->screen_pos.y = 150;
+		BARRELS->barrels[i].jumpman_collide = malloc(sizeof(DM_Collide));
+		BARRELS->barrels[i].jumpman_collide->shape = COLLIDE_RECT;
+		BARRELS->barrels[i].jumpman_collide->x1 = BARRELS->barrels[i].sprite->screen_pos.x + 2;
+		BARRELS->barrels[i].jumpman_collide->y1 = BARRELS->barrels[i].sprite->screen_pos.y + 2;
+		BARRELS->barrels[i].jumpman_collide->x2 = BARRELS->barrels[i].jumpman_collide->x1 + \
+												  BARRELS->barrels[i].sprite->items[BARRELS->barrels[i].sprite->current_mov].w - 4;
+		BARRELS->barrels[i].jumpman_collide->y2 = BARRELS->barrels[i].jumpman_collide->x1 + \
+												  BARRELS->barrels[i].sprite->items[BARRELS->barrels[i].sprite->current_mov].h - 4;
+		BARRELS->barrels[i].platform_collide = malloc(sizeof(DM_Collide));
+		BARRELS->barrels[i].platform_collide->shape = COLLIDE_POINT;
+		BARRELS->barrels[i].platform_collide->x1 = BARRELS->barrels[i].jumpman_collide->x1 \
+												   + (BARRELS->barrels[i].sprite->screen_pos.w / 2);
+		BARRELS->barrels[i].platform_collide->y1 = BARRELS->barrels[i].jumpman_collide->y1 \
+												   + (BARRELS->barrels[i].sprite->screen_pos.h);
+		BARRELS->barrels[i].platform_collide->x2 = 0;
+		BARRELS->barrels[i].platform_collide->y2 = 0;
+		BARRELS->barrels[i].refresh_id = -1;
+	}
+	BARRELS->barrels[0].sprite->screen_pos.x = 150;
+
+	//Load Damn Monkey
+	BARRELS->damnmonkey = new_sprite("damnmonkey");
+	BARRELS->damnmonkey->screen_pos.x = 55;
+	BARRELS->damnmonkey->screen_pos.y = 94;
+	BARRELS->damnmonkey->current_mov = SPRITE_CUSTOM;
+	int damnmonkey_refresh = ref_object(
+			&LAYER_ACTIVE,
+			BARRELS->damnmonkey,
+			sprite_cb
+			);
+
+	//GAME_STATE gestion
+	barrel_init(screen);
 	lets_play_yeah(screen, map);
-	
 	//Dereference objects and free the memory
+	barrel_destroy();
+	for(i=0 ; i<BARRELS->numb_items ; i++)
+	{
+		deref_barrel(BARRELS->barrels[i].refresh_id);
+	}
+	deref_object(&LAYER_ACTIVE, damnmonkey_refresh);
+	deref_object(&LAYER_ACTIVE, help_refresh);
+	deref_object(&LAYER_ACTIVE, lady_refresh);
 	deref_object(&LAYER_BG, level_surface_refresh);
 	SDL_Delay(50);
-	free_dm_surface(level_surface);
+	Mix_FreeMusic(level_music);
+	for(i=0 ; i<BARRELS->numb_items ; i++)
+	{
+		free_dm_barrel(&BARRELS->barrels[i]);
+	}
+	free_sprite(BARRELS->damnmonkey);
+	free(BARRELS);
+	free_sprite(help);
+	free_sprite(lady);
+	free_dm_surface(level_surface);	
 	free_dm_map(map);
 }
 

=== modified file 'src/levels/level_01.h'
--- src/levels/level_01.h	2011-05-13 14:54:31 +0000
+++ src/levels/level_01.h	2011-06-05 20:31:10 +0000
@@ -43,12 +43,75 @@
 #ifndef LEVEL_01_H_INCLUDED
 #define LEVEL_01_H_INCLUDED
 
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "../conf.h"
+
+#ifdef LINUX
+#include "SDL.h"
+#endif
+
+#ifdef MAC_OS
+#include <SDL/SDL.h>
+#endif
+
+#ifdef WINDOWS
+#include <SDL.h>
+#endif
 
 #include "../main_functions.h"
 #include "../refresh.h"
 #include "../game.h"
-
-
+#include "../sprite.h"
+
+
+/**
+ * \struct DM_Barrel
+ * \brief Contain informations about one barrel.
+ */
+typedef struct DM_Barrel DM_Barrel;
+struct DM_Barrel
+{
+	DM_Map *map;                  /*!< Pointer to the DM_Map considered*/
+	DM_Collide *platform_collide; /*!< Collision point with platforms. */
+	DM_Collide *jumpman_collide;  /*!< Collision rect with jumpman. */
+	DM_Sprite *sprite;            /*!< The sprite of barrel. */
+	int refresh_id;               /*!< The refresh id*/
+};
+
+
+/**
+ * \struct DM_Barrel_Array
+ * \brief Contain informations about barrels.
+ */
+typedef struct DM_Barrel_Array DM_Barrel_Array;
+struct DM_Barrel_Array
+{
+	DM_Barrel *barrels;          /*!< Barrels array*/
+	DM_Sprite *damnmonkey;       /*!< Damn Monkey sprite */
+	int numb_items;              /*!< The number of barrels in the array*/
+	int last_sent;               /*!< The last sent barrel index in the array*/
+};
+
+
+/** \cond */ //Hide this to doxygen
+SDL_TimerID barrel_timer;
+/** \endcond */
+
+DM_Barrel_Array *BARRELS;
+
+
+void barrel_init(SDL_Surface *screen);
+void barrel_destroy();
+int ref_barrel(void *object, void (*callback)());
+void deref_barrel(int id);
+void barrel_cb(void *object, SDL_Surface *screen);
+/** \cond */ //Hide this to doxygen
+Uint32 _barrel_cb(Uint32 interval, void *arg);
+/** \endcond */
+int check_platform_orientation(DM_Collide *collide_point, DM_Map *map);
+void free_dm_barrel(DM_Barrel *barrels);
 void level_01(SDL_Surface *screen);