ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix overworld trophy points not being displayed in mobile STK

Browse Source
This commit is contained in:
Benau 2021-02-03 09:46:28 +08:00
parent 06500e18ca
commit 01de29670a
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/guiengine/engine.cpp
View File

@ -683,7 +683,7 @@ namespace GUIEngine
#include "modes/demo_world.hpp" #include "modes/demo_world.hpp"
#include "modes/cutscene_world.hpp" #include "modes/cutscene_world.hpp"
#include "modes/world.hpp" #include "modes/world.hpp"
#include "states_screens/race_gui_base.hpp" #include "states_screens/race_gui_overworld.hpp"
#include "tips/tips_manager.hpp" #include "tips/tips_manager.hpp"
#include "utils/debug.hpp" #include "utils/debug.hpp"
#include "utils/string_utils.hpp" #include "utils/string_utils.hpp"
@ -1335,6 +1335,13 @@ namespace GUIEngine
if (rg != NULL) rg->renderGlobal(elapsed_time); if (rg != NULL) rg->renderGlobal(elapsed_time);
} }
if (gamestate == GAME && ModalDialog::isADialogActive() && World::getWorld())
{
// Show trophy points when paused
RaceGUIOverworld* rgo = dynamic_cast<RaceGUIOverworld*>(World::getWorld()->getRaceGUI());
if (rgo && rgo->getMultitouchGUI())
rgo->drawTrophyPoints();
}
if (gamestate != GAME || is_loading) if (gamestate != GAME || is_loading)
{ {
Screen* screen = getCurrentScreen(); Screen* screen = getCurrentScreen();

3
src/states_screens/race_gui_base.cpp
View File

@ -29,6 +29,7 @@
#include "graphics/material.hpp" #include "graphics/material.hpp"
#include "graphics/material_manager.hpp" #include "graphics/material_manager.hpp"
#include "graphics/referee.hpp" #include "graphics/referee.hpp"
#include "guiengine/modaldialog.hpp"
#include "guiengine/scalable_font.hpp" #include "guiengine/scalable_font.hpp"
#include "io/file_manager.hpp" #include "io/file_manager.hpp"
#include "items/attachment_manager.hpp" #include "items/attachment_manager.hpp"
@ -573,7 +574,7 @@ void RaceGUIBase::renderPlayerView(const Camera *camera, float dt)
const AbstractKart* kart = camera->getKart(); const AbstractKart* kart = camera->getKart();
if(!kart) return; if(!kart) return;
if (m_multitouch_gui != NULL) if (m_multitouch_gui != NULL && !GUIEngine::ModalDialog::isADialogActive())
{ {
m_multitouch_gui->draw(kart, viewport, scaling); m_multitouch_gui->draw(kart, viewport, scaling);
} }

1
src/states_screens/race_gui_multitouch.cpp
View File

@ -34,7 +34,6 @@ using namespace irr;
#include "items/powerup.hpp" #include "items/powerup.hpp"
#include "karts/abstract_kart.hpp" #include "karts/abstract_kart.hpp"
#include "karts/controller/kart_control.hpp" #include "karts/controller/kart_control.hpp"
#include "modes/world.hpp"
#include "network/protocols/client_lobby.hpp" #include "network/protocols/client_lobby.hpp"
#include "states_screens/race_gui_base.hpp" #include "states_screens/race_gui_base.hpp"

3
src/states_screens/race_gui_overworld.hpp
View File

@ -105,7 +105,6 @@ private:
/** Display items that are shown once only (for all karts). */ /** Display items that are shown once only (for all karts). */
void drawGlobalMiniMap (); void drawGlobalMiniMap ();
void drawTrophyPoints ();
public: public:
@ -128,7 +127,7 @@ public:
{ return core::dimension2du(m_map_width, m_map_height); } { return core::dimension2du(m_map_width, m_map_height); }
virtual void calculateMinimapSize(); virtual void calculateMinimapSize();
virtual void initSize(); virtual void initSize();
void drawTrophyPoints();
}; // RaceGUI }; // RaceGUI
#endif #endif