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

Cosmetic changes.

Browse Source
This commit is contained in:
hiker 2015-12-01 08:28:53 +11:00
parent c9a23bcbb7
commit 14390c2c5b
2 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/states_screens/network_kart_selection.cpp
View File

@ -38,15 +38,18 @@ using namespace GUIEngine;
DEFINE_SCREEN_SINGLETON( NetworkKartSelectionScreen ); DEFINE_SCREEN_SINGLETON( NetworkKartSelectionScreen );
NetworkKartSelectionScreen::NetworkKartSelectionScreen() : KartSelectionScreen("karts_online.stkgui") NetworkKartSelectionScreen::NetworkKartSelectionScreen()
: KartSelectionScreen("karts_online.stkgui")
{ {
KartSelectionScreen::m_instance_ptr = this; KartSelectionScreen::m_instance_ptr = this;
} } // NetworkKartSelectionScreen
// ----------------------------------------------------------------------------
NetworkKartSelectionScreen::~NetworkKartSelectionScreen() NetworkKartSelectionScreen::~NetworkKartSelectionScreen()
{ {
} } // ~NetworkKartSelectionScreen
// ----------------------------------------------------------------------------
void NetworkKartSelectionScreen::init() void NetworkKartSelectionScreen::init()
{ {
m_multiplayer = false; m_multiplayer = false;
@ -54,7 +57,8 @@ void NetworkKartSelectionScreen::init()
RibbonWidget* tabs = getWidget<RibbonWidget>("kartgroups"); RibbonWidget* tabs = getWidget<RibbonWidget>("kartgroups");
assert( tabs != NULL ); assert( tabs != NULL );
tabs->select( "standard", PLAYER_ID_GAME_MASTER); // select standard kart group // Select standard kart group
tabs->select( "standard", PLAYER_ID_GAME_MASTER);
tabs->setActive(false); tabs->setActive(false);
tabs->setVisible(false); tabs->setVisible(false);
@ -68,7 +72,8 @@ void NetworkKartSelectionScreen::init()
GameSetup* setup = STKHost::get()->getGameSetup(); GameSetup* setup = STKHost::get()->getGameSetup();
if (!setup) if (!setup)
{ {
Log::error("NetworkKartSelectionScreen", "No network game setup registered."); Log::error("NetworkKartSelectionScreen",
"No network game setup registered.");
return; return;
} }
std::vector<NetworkPlayerProfile*> players = setup->getPlayers(); std::vector<NetworkPlayerProfile*> players = setup->getPlayers();
@ -88,7 +93,8 @@ void NetworkKartSelectionScreen::init()
{ {
if(game_setup->isLocalMaster(players[i]->getPlayerID())) if(game_setup->isLocalMaster(players[i]->getPlayerID()))
{ {
m_id_mapping.insert(m_id_mapping.begin(),players[i]->getPlayerID()); //!< first kart widget always me // First kart widget always me
m_id_mapping.insert(m_id_mapping.begin(),players[i]->getPlayerID());
Log::info("NKSS", "Insert %d at pos 0", players[i]->getPlayerID()); Log::info("NKSS", "Insert %d at pos 0", players[i]->getPlayerID());
continue; // it is me, don't add again continue; // it is me, don't add again
} }
@ -122,8 +128,9 @@ void NetworkKartSelectionScreen::init()
fullarea->m_y, splitWidth, fullarea->m_h); fullarea->m_y, splitWidth, fullarea->m_h);
} }
} } // init
// ----------------------------------------------------------------------------
void NetworkKartSelectionScreen::playerConfirm(const int playerID) void NetworkKartSelectionScreen::playerConfirm(const int playerID)
{ {
DynamicRibbonWidget* w = getWidget<DynamicRibbonWidget>("karts"); DynamicRibbonWidget* w = getWidget<DynamicRibbonWidget>("karts");
@ -151,32 +158,37 @@ void NetworkKartSelectionScreen::playerConfirm(const int playerID)
ProtocolManager::getInstance()->getProtocol(PROTOCOL_LOBBY_ROOM)); ProtocolManager::getInstance()->getProtocol(PROTOCOL_LOBBY_ROOM));
protocol->requestKartSelection(selection); protocol->requestKartSelection(selection);
} }
} } // playerConfirm
void NetworkKartSelectionScreen::playerSelected(uint8_t race_id, std::string kart_name) // ----------------------------------------------------------------------------
void NetworkKartSelectionScreen::playerSelected(uint8_t race_id,
const std::string &kart_name)
{ {
uint8_t widget_id = -1; uint8_t widget_id = -1;
for (unsigned int i = 0; i < m_id_mapping.size(); i++) for (unsigned int i = 0; i < m_id_mapping.size(); i++)
{ {
Log::info("NKSS", "Checking race id %d : mapped of %d is %d", race_id, i, m_id_mapping[i]); Log::info("NKSS", "Checking race id %d : mapped of %d is %d",
race_id, i, m_id_mapping[i]);
if (m_id_mapping[i] == race_id) if (m_id_mapping[i] == race_id)
widget_id = i; widget_id = i;
} }
assert(widget_id>=0 && widget_id < m_kart_widgets.size()); assert(widget_id>=0 && widget_id < m_kart_widgets.size());
KartSelectionScreen::updateKartWidgetModel(widget_id, kart_name, irr::core::stringw(kart_name.c_str())); KartSelectionScreen::updateKartWidgetModel(widget_id, kart_name,
irr::core::stringw(kart_name.c_str()));
KartSelectionScreen::updateKartStats(widget_id, kart_name); KartSelectionScreen::updateKartStats(widget_id, kart_name);
m_kart_widgets[widget_id].setKartInternalName(kart_name); m_kart_widgets[widget_id].setKartInternalName(kart_name);
m_kart_widgets[widget_id].markAsReady(); // mark player ready m_kart_widgets[widget_id].markAsReady(); // mark player ready
} } // playerSelected
// ----------------------------------------------------------------------------
/** /**
* Callback handling events from the kart selection menu * Callback handling events from the kart selection menu
*/ */
void NetworkKartSelectionScreen::eventCallback(GUIEngine::Widget* widget, const std::string& name, void NetworkKartSelectionScreen::eventCallback(GUIEngine::Widget* widget,
const int playerID) const std::string& name,
const int playerID)
{ {
if (name == "karts") if (name == "karts")
{ {
@ -192,7 +204,7 @@ void NetworkKartSelectionScreen::eventCallback(GUIEngine::Widget* widget, const
} }
} // eventCallback } // eventCallback
// ----------------------------------------------------------------------------
bool NetworkKartSelectionScreen::onEscapePressed() bool NetworkKartSelectionScreen::onEscapePressed()
{ {
// then remove the lobby screen (you left the server) // then remove the lobby screen (you left the server)
@ -203,4 +215,4 @@ bool NetworkKartSelectionScreen::onEscapePressed()
if (protocol) if (protocol)
protocol->leave(); protocol->leave();
return true; // remove the screen return true; // remove the screen
} } // onEscapePressed

8
src/states_screens/network_kart_selection.hpp
View File

@ -21,7 +21,8 @@
#include "states_screens/kart_selection.hpp" #include "states_screens/kart_selection.hpp"
#include "guiengine/screen.hpp" #include "guiengine/screen.hpp"
class NetworkKartSelectionScreen : public KartSelectionScreen, public GUIEngine::ScreenSingleton<NetworkKartSelectionScreen> class NetworkKartSelectionScreen : public KartSelectionScreen,
public GUIEngine::ScreenSingleton<NetworkKartSelectionScreen>
{ {
friend class GUIEngine::ScreenSingleton<NetworkKartSelectionScreen>; friend class GUIEngine::ScreenSingleton<NetworkKartSelectionScreen>;
protected: protected:
@ -35,12 +36,13 @@ protected:
void considerKartHovered(uint8_t widget_id, std::string selection); void considerKartHovered(uint8_t widget_id, std::string selection);
public: public:
virtual void init() OVERRIDE; virtual void init() OVERRIDE;
virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name, virtual void eventCallback(GUIEngine::Widget* widget,
const std::string& name,
const int playerID) OVERRIDE; const int playerID) OVERRIDE;
virtual bool onEscapePressed() OVERRIDE; virtual bool onEscapePressed() OVERRIDE;
virtual void playerSelected(uint8_t race_id, std::string kart_name); virtual void playerSelected(uint8_t race_id, const std::string &kart_name);
}; };
#endif // NETWORK_KART_SELECTION_HPP #endif // NETWORK_KART_SELECTION_HPP