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

Remove some useless code

Browse Source
This commit is contained in:
Alayan 2019-05-02 23:53:52 +02:00
parent 0d72de7094
commit d6c0847b66
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/guiengine/engine.hpp
View File

@ -54,21 +54,21 @@ namespace GUIEngine
/** \brief Returns the widget currently focused by given player, or NULL if none. /** \brief Returns the widget currently focused by given player, or NULL if none.
* \note Do NOT use irrLicht's GUI focus facilities; it's too limited for our * \note Do NOT use irrLicht's GUI focus facilities; it's too limited for our
* needs, so we use ours. (i.e. always call these functions are never those * needs, so we use ours. (i.e. always call these functions, never those
* in IGUIEnvironment) * in IGUIEnvironment)
*/ */
Widget* getFocusForPlayer(const unsigned int playerID); Widget* getFocusForPlayer(const unsigned int playerID);
/** \brief Focuses nothing for given player (removes any selection for this player). /** \brief Focuses nothing for given player (removes any selection for this player).
* \note Do NOT use irrLicht's GUI focus facilities; it's too limited for our * \note Do NOT use irrLicht's GUI focus facilities; it's too limited for our
* needs, so we use ours. (i.e. always call these functions are never those * needs, so we use ours. (i.e. always call these functions, never those
* in IGUIEnvironment) * in IGUIEnvironment)
*/ */
void focusNothingForPlayer(const unsigned int playerID); void focusNothingForPlayer(const unsigned int playerID);
/** \brief Returns whether given the widget is currently focused by given player. /** \brief Returns whether given the widget is currently focused by given player.
* \note Do NOT use irrLicht's GUI focus facilities; it's too limited for our * \note Do NOT use irrLicht's GUI focus facilities; it's too limited for our
* needs, so we use ours. (i.e. always call these functions are never those * needs, so we use ours. (i.e. always call these functions, never those
* in IGUIEnvironment) * in IGUIEnvironment)
*/ */
bool isFocusedForPlayer(const Widget*w, const unsigned int playerID); bool isFocusedForPlayer(const Widget*w, const unsigned int playerID);

9
src/guiengine/event_handler.cpp
View File

@ -914,10 +914,7 @@ EventPropagation EventHandler::onGUIEvent(const SEvent& event)
if (ribbon == NULL) break; if (ribbon == NULL) break;
// give the mouse "game master" priviledges // give the mouse "game master" priviledges
const int playerID = PLAYER_ID_GAME_MASTER; //input_manager->getPlayerKeyboardID(); const int playerID = PLAYER_ID_GAME_MASTER;
if (playerID == -1) break;
if (input_manager->masterPlayerOnly() && playerID != PLAYER_ID_GAME_MASTER) break;
ribbon->mouseHovered(w, playerID); ribbon->mouseHovered(w, playerID);
if (ribbon->m_event_handler != NULL) ribbon->m_event_handler->mouseHovered(w, playerID); if (ribbon->m_event_handler != NULL) ribbon->m_event_handler->mouseHovered(w, playerID);
@ -927,9 +924,7 @@ EventPropagation EventHandler::onGUIEvent(const SEvent& event)
{ {
// focus on hover for other widgets // focus on hover for other widgets
// give the mouse "game master" priviledges // give the mouse "game master" priviledges
const int playerID = PLAYER_ID_GAME_MASTER; //input_manager->getPlayerKeyboardID(); const int playerID = PLAYER_ID_GAME_MASTER;
if (input_manager->masterPlayerOnly() && playerID != PLAYER_ID_GAME_MASTER) break;
if (playerID != -1)
{ {
// lists don't like that combined with scrollbars // lists don't like that combined with scrollbars
// (FIXME: find why instead of working around) // (FIXME: find why instead of working around)