Compare commits
2 Commits
466e572841
...
cff1df19c2
| Author | SHA1 | Date | |
|---|---|---|---|
| cff1df19c2 | |||
| b29d9681f8 |
Binary file not shown.
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 5.5 KiB |
BIN
data/gfx/player2_pal1.gif
Normal file
BIN
data/gfx/player2_pal1.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 172 B |
BIN
data/gfx/player2_pal2.gif
Normal file
BIN
data/gfx/player2_pal2.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 172 B |
BIN
data/gfx/player2_pal3.gif
Normal file
BIN
data/gfx/player2_pal3.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 172 B |
@@ -367,10 +367,17 @@ bool Director::setFileList()
|
||||
asset->add(prefix + "/data/gfx/player1_pal1.gif", t_bitmap);
|
||||
asset->add(prefix + "/data/gfx/player1_pal2.gif", t_bitmap);
|
||||
asset->add(prefix + "/data/gfx/player1_pal3.gif", t_bitmap);
|
||||
|
||||
asset->add(prefix + "/data/gfx/player2.gif", t_bitmap);
|
||||
asset->add(prefix + "/data/gfx/player2_pal1.gif", t_bitmap);
|
||||
asset->add(prefix + "/data/gfx/player2_pal2.gif", t_bitmap);
|
||||
asset->add(prefix + "/data/gfx/player2_pal3.gif", t_bitmap);
|
||||
|
||||
asset->add(prefix + "/data/gfx/player.ani", t_data);
|
||||
|
||||
asset->add(prefix + "/data/gfx/player1_power.gif", t_bitmap);
|
||||
asset->add(prefix + "/data/gfx/player2_power.gif", t_bitmap);
|
||||
|
||||
asset->add(prefix + "/data/gfx/player_power.ani", t_data);
|
||||
|
||||
// Fuentes de texto
|
||||
|
||||
@@ -311,12 +311,18 @@ void Game::init(int playerID)
|
||||
players[otherPlayer - 1]->enable(true);
|
||||
}
|
||||
|
||||
// Añade 0, 1 o 2 cafes al jugador
|
||||
// Añade 0, 1 o 2 cafes al jugador 1
|
||||
for (int i = 0; i < rand() % 3; ++i)
|
||||
{
|
||||
players[0]->giveExtraHit();
|
||||
}
|
||||
|
||||
// Añade 0, 1 o 2 cafes al jugador 2
|
||||
for (int i = 0; i < rand() % 3; ++i)
|
||||
{
|
||||
players[1]->giveExtraHit();
|
||||
}
|
||||
|
||||
// Deshabilita los sonidos
|
||||
JA_EnableSound(false);
|
||||
}
|
||||
@@ -466,6 +472,9 @@ void Game::loadMedia()
|
||||
|
||||
// Texturas - Player2
|
||||
Texture *player2 = new Texture(renderer, asset->get("player2.gif"));
|
||||
player2->addPalette(asset->get("player2_pal1.gif"));
|
||||
player2->addPalette(asset->get("player2_pal2.gif"));
|
||||
player2->addPalette(asset->get("player2_pal3.gif"));
|
||||
player2Textures.push_back(player2);
|
||||
|
||||
Texture *player2Power = new Texture(renderer, asset->get("player2_power.gif"));
|
||||
|
||||
@@ -155,7 +155,7 @@ void Player::move()
|
||||
// Pinta el jugador en pantalla
|
||||
void Player::render()
|
||||
{
|
||||
if (powerUp)
|
||||
if (powerUp && alive)
|
||||
{
|
||||
powerSprite->render();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user