Actualizado Makefile

.gitignore

@@ -12,3 +12,7 @@ thumbs.db
 *config.bin
 *score.bin
 coffee_crisis*
+SDL2.dll
+libwinpthread-1.dll
+libstdc++-6.dll
+libgcc_s_seh-1.dll

Makefile

@@ -3,6 +3,7 @@ source = source/*.cpp source/common/*.cpp
 appName = Coffee Crisis
 releaseFolder = cc_release
 version = v2.3
+resource_file = release/coffee.res
 
 # Release names
 windowsRelease = $(executable)-$(version)-win32-x64.zip
@@ -12,7 +13,7 @@ linuxRelease = $(executable)-$(version)-linux.tar.gz
 
 windows:
 	@echo off
-	g++ $(source) -std=c++11 -Wall -Os -lmingw32 -lws2_32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o "$(executable).exe"
+	g++ $(source) $(resource_file) -std=c++11 -Wall -Os -lmingw32 -lws2_32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o "$(executable).exe"
 	strip -s -R .comment -R .gnu.version "$(executable).exe" --strip-unneeded
 
 windows_debug:
@@ -36,7 +37,7 @@ windows_release:
 	powershell Copy-Item "release\*.dll" -Destination "$(releaseFolder)"
 
 # Build
-	g++ $(source) -std=c++11 -Wall -Os -lmingw32 -lws2_32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o "$(releaseFolder)/$(executable).exe"
+	g++ $(source) $(resource_file) -std=c++11 -Wall -Os -lmingw32 -lws2_32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o "$(releaseFolder)/$(executable).exe"
 	strip -s -R .comment -R .gnu.version "$(releaseFolder)/$(executable).exe" --strip-unneeded
 
 # Create ZIP

release/coffee.rc

@@ -0,0 +1 @@
+id ICON "icon.ico"

source/game.cpp

@@ -2552,7 +2552,7 @@ Uint8 Game::dropItem()
 // Crea un objeto item
 void Game::createItem(Uint8 kind, float x, float y)
 {
-	Item *item = new Item(kind, x, y, itemTextures[kind], itemAnimations[kind], renderer);
+	Item *item = new Item(kind, x, y, itemTextures[kind - 1], itemAnimations[kind - 1], renderer);
 	items.push_back(item);
 }
 
@@ -3066,7 +3066,7 @@ void Game::checkGameInput()
 			if (players[index]->canFire())
 			{
 				players[index]->setInput(input_fire_left);
-				createBullet(players[index]->getPosX() + (players[index]->getWidth() / 2) - 4, players[index]->getPosY() + (players[index]->getHeight() / 2), BULLET_UP, players[index]->isPowerUp(), index);
+				createBullet(players[index]->getPosX() + (players[index]->getWidth() / 2) - 4, players[index]->getPosY() + (players[index]->getHeight() / 2), BULLET_LEFT, players[index]->isPowerUp(), index);
 				players[index]->setFireCooldown(10);
 			}
 		}
@@ -3076,7 +3076,7 @@ void Game::checkGameInput()
 			if (players[index]->canFire())
 			{
 				players[index]->setInput(input_fire_right);
-				createBullet(players[index]->getPosX() + (players[index]->getWidth() / 2) - 4, players[index]->getPosY() + (players[index]->getHeight() / 2), BULLET_UP, players[index]->isPowerUp(), index);
+				createBullet(players[index]->getPosX() + (players[index]->getWidth() / 2) - 4, players[index]->getPosY() + (players[index]->getHeight() / 2), BULLET_RIGHT, players[index]->isPowerUp(), index);
 				players[index]->setFireCooldown(10);
 			}
 		}

source/item.h

@@ -8,12 +8,12 @@
 #define ITEM_H
 
 // Tipos de objetos
-#define ITEM_POINTS_1_DISK 0
+#define ITEM_POINTS_1_DISK 1
-#define ITEM_POINTS_2_GAVINA 1
+#define ITEM_POINTS_2_GAVINA 2
-#define ITEM_POINTS_3_PACMAR 2
+#define ITEM_POINTS_3_PACMAR 3
-#define ITEM_CLOCK 3
+#define ITEM_CLOCK 4
-#define ITEM_COFFEE 4
+#define ITEM_COFFEE 5
-#define ITEM_COFFEE_MACHINE 5
+#define ITEM_COFFEE_MACHINE 6
 
 // Clase Item
 class Item