From cff1df19c242b87c340d1e94d3d49accc96b70c3 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Thu, 25 Jul 2024 14:13:02 +0200 Subject: [PATCH] afegides paletes per al segon jugador --- data/gfx/player2.gif | Bin 5643 -> 5658 bytes data/gfx/player2_pal1.gif | Bin 0 -> 172 bytes data/gfx/player2_pal2.gif | Bin 0 -> 172 bytes data/gfx/player2_pal3.gif | Bin 0 -> 172 bytes source/director.cpp | 7 +++++++ source/game.cpp | 3 +++ 6 files changed, 10 insertions(+) create mode 100644 data/gfx/player2_pal1.gif create mode 100644 data/gfx/player2_pal2.gif create mode 100644 data/gfx/player2_pal3.gif diff --git a/data/gfx/player2.gif b/data/gfx/player2.gif index 87930bf580aeccdd74cb13ac659e66596df04133..3c0e049c2487e276c7000ad44ff5275ffa8b5106 100644 GIT binary patch delta 5442 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 delta 5427 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 diff --git a/data/gfx/player2_pal1.gif b/data/gfx/player2_pal1.gif new file mode 100644 index 0000000000000000000000000000000000000000..5388d37a160516b016e794f1062447929cc4ee4d GIT binary patch literal 172 zcmZ?wbh9u|6kuRtIKlt|!a_pI%F4%&AHR3+-m6!y?n=rY5fS{HlVE0`?`NVH>tLSi z-2{aizWogD*Qjr0td v8G))4f3k3L0cjnO4v;e#Sj7|sIG6(^*e7XlU$)>E@e~e?bXfOVk--`O&>Sjd literal 0 HcmV?d00001 diff --git a/data/gfx/player2_pal2.gif b/data/gfx/player2_pal2.gif new file mode 100644 index 0000000000000000000000000000000000000000..abd3f888d7e623403a18a54ecdb5324208b8bfbc GIT binary patch literal 172 zcmZ?wbh9u|6kuRtIKlt|!a_pI%F4%&AHR3+-m6!y?n=rY5fS{HlVE0`?`NVH>tLSi z6b_AaSod0y!5RPxjweb*;1}@}4vlnJ_gay`8UP?ON=g6# literal 0 HcmV?d00001 diff --git a/source/director.cpp b/source/director.cpp index f9198f3..5bda9e9 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -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 diff --git a/source/game.cpp b/source/game.cpp index 8d5a5d4..9373531 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -472,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"));