From 0ab4ca06e37fddef425b83a28c1180609b80c04a Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Thu, 31 Oct 2024 12:08:10 +0100 Subject: [PATCH] =?UTF-8?q?-=20[FIX]=20[#2]=20Quan=20et=20donen=20una=20ca?= =?UTF-8?q?t's=20life,=20ja=20no=20torna=20la=20m=C3=BAsica=20del=20joc=20?= =?UTF-8?q?-=20[FIX]=20[#3]=20Quan=20entres=20a=20la=20habitaci=C3=B3=20de?= =?UTF-8?q?=20la=20depuradora=20...=20-=20[FIX]=20[#4]=20ficar=20anbernics?= =?UTF-8?q?=20recopilades=20en=20el=20game=20over=20i=20altres=20pantalles?= =?UTF-8?q?=20de=20resum=20-=20[FIX]=20[#5]=20que=20al=20acabar=20el=20joc?= =?UTF-8?q?=20la=20seuquencia=20acabe=20amb=20els=20stats,=20com=20el=20ga?= =?UTF-8?q?me=20over?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/actor.cpp | 15 ++++++++++----- source/jgame.cpp | 2 +- source/m_catslife.cpp | 1 + source/m_end_sequence.cpp | 19 +++++++++++++------ source/m_gameover.cpp | 26 ++++++++++++++++---------- 5 files changed, 41 insertions(+), 22 deletions(-) diff --git a/source/actor.cpp b/source/actor.cpp index 673a990..9e3b74e 100644 --- a/source/actor.cpp +++ b/source/actor.cpp @@ -2072,7 +2072,7 @@ namespace actor if (complete) { stats::reset(); - lives = 8; + lives = 1; skills = SKILL_NONE; if (prologo) skills &= SKILL_SHOES; for (int i=0;i<4;++i) prologo_objects[i] = PROLOGO_OBJECT_INITIAL; @@ -2085,6 +2085,7 @@ namespace actor brilli = draw::getSurface("objectes.gif"); if ((config::getSoundMode() == SOUND_ALL)) { + if (walk_channel != -1) audio::stopChannel(walk_channel); walk_channel = audio::playSound("snd_walk.wav", SOUND_ALL, -1); audio::pauseChannel(walk_channel); } @@ -2230,6 +2231,8 @@ namespace actor const int getSkillFromString(char *skill) { + if ( (strcmp(skill, "ALL")==0) || (strcmp(skill, "SKILLS")==0) ) return SKILL_SHOES | SKILL_GLOVES | SKILL_PANTS | SKILL_BAG; + static const char *skillset_name[4] = {"SHOES", "GLOVES", "PANTS", "BAG"}; for (int i = 0; i < 4; ++i) { @@ -2267,10 +2270,10 @@ namespace actor bool giveSkill(char *skill) { const int skill_number = getSkillFromString(skill); - if (skill_number==SKILL_SHOES) modules::game::setMissatge(" JA TENS LES SABATES!- ARA JA POTS BOTAR!"); - else if (skill_number==SKILL_GLOVES) modules::game::setMissatge(" JA TENS ELS GUANTS!- ARA JA POTS ESPENTAR!"); - else if (skill_number==SKILL_PANTS) modules::game::setMissatge(" JA TENS ELS PANTALONS!- JA POTS AGAFAR COSES!"); - else if (skill_number==SKILL_BAG) modules::game::setMissatge(" JA TENS LA MOTXILLA!- A ARREPLEGAR PECES!"); + if (skill_number | SKILL_SHOES) modules::game::setMissatge(" JA TENS LES SABATES!- ARA JA POTS BOTAR!"); + else if (skill_number | SKILL_GLOVES) modules::game::setMissatge(" JA TENS ELS GUANTS!- ARA JA POTS ESPENTAR!"); + else if (skill_number | SKILL_PANTS) modules::game::setMissatge(" JA TENS ELS PANTALONS!- JA POTS AGAFAR COSES!"); + else if (skill_number | SKILL_BAG) modules::game::setMissatge(" JA TENS LA MOTXILLA!- A ARREPLEGAR PECES!"); return giveSkill(skill_number); } @@ -2297,6 +2300,8 @@ namespace actor const int getPartFromString(char *part) { + if ( (strcmp(part, "ALL")==0) || (strcmp(part, "PARTS")==0) ) return 0x3f; + static const char *partset_name[6] = {"FILTER", "PUMP", "TIMER", "SALT", "PIPE", "ELBOW"}; for (int i = 0; i < 6; ++i) { diff --git a/source/jgame.cpp b/source/jgame.cpp index 1ed0e95..5539f0e 100644 --- a/source/jgame.cpp +++ b/source/jgame.cpp @@ -72,6 +72,7 @@ int main(int argc, char *argv[]) if (SDL_GetTicks()-current_ticks >= game::ticks_per_frame) { + current_ticks = SDL_GetTicks(); if (!game::loop()) game::should_exit = true; input::updateKey(SDL_SCANCODE_UNKNOWN); input::updateKeypressed(SDL_SCANCODE_UNKNOWN); @@ -79,7 +80,6 @@ int main(int argc, char *argv[]) input::updateWheel(0); input::updatePadBtn(SDL_CONTROLLER_BUTTON_INVALID); input::updatePadBtnPressed(SDL_CONTROLLER_BUTTON_INVALID); - current_ticks = SDL_GetTicks(); } } diff --git a/source/m_catslife.cpp b/source/m_catslife.cpp index be6baf0..ce99c48 100644 --- a/source/m_catslife.cpp +++ b/source/m_catslife.cpp @@ -26,6 +26,7 @@ namespace modules { if (gat) actor::remove(gat); gat = nullptr; + audio::playMusic("mus_ingame.ogg"); return false; } diff --git a/source/m_end_sequence.cpp b/source/m_end_sequence.cpp index b03f2d9..92b22d5 100644 --- a/source/m_end_sequence.cpp +++ b/source/m_end_sequence.cpp @@ -21,6 +21,7 @@ namespace modules void init(bool go_direct_to_credits) { + audio::stopAllChannel(); stage = go_direct_to_credits ? 2 : 0; time = SDL_GetTicks(); if (go_direct_to_credits) time += 5000; @@ -55,7 +56,7 @@ namespace modules const bool shouldGoToNext() { if (SDL_GetTicks()-time < 1000) return false; - return (SDL_GetTicks()-time > (stage==15||stage==16?10000:5000)) || + return ( (stage<16) && (SDL_GetTicks()-time > (stage==15?10000:5000)) ) || (controller::pressed(KEY_JUMP)) || (controller::pressed(KEY_PICK)) || (input::keyPressed(SDL_SCANCODE_SPACE)) || (input::keyPressed(SDL_SCANCODE_RETURN)); } @@ -147,13 +148,19 @@ namespace modules draw::print2("GRACIES PER JUGAR!", 11, 9, PURPLE, FONT_ZOOM_VERTICAL); draw::print2(actor::stats::getRoomsVisited(), 2, 8, 14, TEAL, FONT_ZOOM_NONE); - draw::print2("HABITACIONS VISITADES", 11, 14, GREEN, FONT_ZOOM_NONE); + draw::print2("HABITACIONS VISITADES", 13, 14, GREEN, FONT_ZOOM_NONE); - draw::print2(actor::stats::getLivesLost(), 2, 11, 16, TEAL, FONT_ZOOM_NONE); - draw::print2("VIDES PERDUDES", 14, 16, GREEN, FONT_ZOOM_NONE); + draw::print2(actor::stats::getLivesLost(), 2, 8, 16, TEAL, FONT_ZOOM_NONE); + draw::print2("VIDES PERDUDES", 13, 16, GREEN, FONT_ZOOM_NONE); - draw::print2(time_text, 11, 18, TEAL, FONT_ZOOM_NONE); - draw::print2("TEMPS TOTAL", 18, 18, GREEN, FONT_ZOOM_NONE); + draw::print2(time_text, 4, 18, TEAL, FONT_ZOOM_NONE); + draw::print2("TEMPS TOTAL", 13, 18, GREEN, FONT_ZOOM_NONE); + + if (actor::hero::getNumAmbernicsCollected()>0) + { + draw::print2(actor::hero::getNumAmbernicsCollected(), 2, 8, 20, TEAL, FONT_ZOOM_NONE); + draw::print2("ANBERNICS ARREPLEGADES", 13, 20, GREEN, FONT_ZOOM_NONE); + } break; diff --git a/source/m_gameover.cpp b/source/m_gameover.cpp index a7b1907..0424dda 100644 --- a/source/m_gameover.cpp +++ b/source/m_gameover.cpp @@ -53,7 +53,7 @@ namespace modules draw::color(1); draw::swapcol(1, WHITE); actor::update(heroi, false); - actor::drawAt(heroi, 150, 160); + actor::drawAt(heroi, 150, 176); draw::print2("THE POOL", 16, 3, TEAL, FONT_ZOOM_VERTICAL); @@ -63,21 +63,27 @@ namespace modules { int num_objectes = 0; for (int i=0;i<4;++i) if (actor::hero::getPrologoObjectState(i)==PROLOGO_OBJECT_LEFT) num_objectes++; - draw::print2(num_objectes, 2, 11, 12, TEAL, FONT_ZOOM_NONE); - draw::print2("OBJECTES DEJATS", 14, 12, GREEN, FONT_ZOOM_NONE); + draw::print2(num_objectes, 2, 8, 12, TEAL, FONT_ZOOM_NONE); + draw::print2("OBJECTES DEJATS", 13, 12, GREEN, FONT_ZOOM_NONE); } else { - draw::print2(actor::stats::getNumPartsCollected(), 2, 11, 12, TEAL, FONT_ZOOM_NONE); - draw::print2("PARTS TROBADES", 14, 12, GREEN, FONT_ZOOM_NONE); + draw::print2(actor::stats::getNumPartsCollected(), 2, 8, 12, TEAL, FONT_ZOOM_NONE); + draw::print2("PARTS TROBADES", 13, 12, GREEN, FONT_ZOOM_NONE); } draw::print2(actor::stats::getRoomsVisited(), 2, 8, 14, TEAL, FONT_ZOOM_NONE); - draw::print2("HABITACIONS VISITADES", 11, 14, GREEN, FONT_ZOOM_NONE); + draw::print2("HABITACIONS VISITADES", 13, 14, GREEN, FONT_ZOOM_NONE); - draw::print2(actor::stats::getLivesLost(), 2, 11, 16, TEAL, FONT_ZOOM_NONE); - draw::print2("VIDES PERDUDES", 14, 16, GREEN, FONT_ZOOM_NONE); + draw::print2(actor::stats::getLivesLost(), 2, 8, 16, TEAL, FONT_ZOOM_NONE); + draw::print2("VIDES PERDUDES", 13, 16, GREEN, FONT_ZOOM_NONE); - draw::print2(time_text, 11, 18, TEAL, FONT_ZOOM_NONE); - draw::print2("TEMPS TOTAL", 18, 18, GREEN, FONT_ZOOM_NONE); + draw::print2(time_text, 4, 18, TEAL, FONT_ZOOM_NONE); + draw::print2("TEMPS TOTAL", 13, 18, GREEN, FONT_ZOOM_NONE); + + if (actor::hero::getNumAmbernicsCollected()>0) + { + draw::print2(actor::hero::getNumAmbernicsCollected(), 2, 8, 20, TEAL, FONT_ZOOM_NONE); + draw::print2("ANBERNICS ARREPLEGADES", 13, 20, GREEN, FONT_ZOOM_NONE); + } draw::print2("(C) JAILDOCTOR 2024", 11, 28, TEAL, FONT_ZOOM_NONE);