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

Always give the mouse game master privileges, less confusing for players

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5555 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-06-24 18:56:27 +00:00
parent 9bfbcc40c1
commit bef7ae34a8
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/guiengine/event_handler.cpp
View File

@ -482,11 +482,15 @@ EventPropagation EventHandler::onGUIEvent(const SEvent& event)
if (w->m_deactivated) return EVENT_BLOCK; if (w->m_deactivated) return EVENT_BLOCK;
// These events are only triggered by mouse (or so I hope)
// The player that owns the mouser receives "game master" priviledges
return onWidgetActivated(w, PLAYER_ID_GAME_MASTER);
// These events are only triggered by keyboard/mouse (or so I hope...) // These events are only triggered by keyboard/mouse (or so I hope...)
const int playerID = input_manager->getPlayerKeyboardID(); //const int playerID = input_manager->getPlayerKeyboardID();
if (input_manager->masterPlayerOnly() && playerID != PLAYER_ID_GAME_MASTER) break; //if (input_manager->masterPlayerOnly() && playerID != PLAYER_ID_GAME_MASTER) break;
else if (playerID != -1) return onWidgetActivated(w, playerID); //else if (playerID != -1) return onWidgetActivated(w, playerID);
else break; //else break;
} }
case EGET_ELEMENT_HOVERED: case EGET_ELEMENT_HOVERED:
{ {
@ -510,9 +514,12 @@ EventPropagation EventHandler::onGUIEvent(const SEvent& event)
{ {
RibbonWidget* ribbon = (RibbonWidget*)(w->m_event_handler); RibbonWidget* ribbon = (RibbonWidget*)(w->m_event_handler);
if (ribbon == NULL) break; if (ribbon == NULL) break;
const int playerID = input_manager->getPlayerKeyboardID();
// give the mouse "game master" priviledges
const int playerID = PLAYER_ID_GAME_MASTER; //input_manager->getPlayerKeyboardID();
if (playerID == -1) break; if (playerID == -1) break;
if (input_manager->masterPlayerOnly() && playerID != 0) break; if (input_manager->masterPlayerOnly() && playerID != PLAYER_ID_GAME_MASTER) break;
if (ribbon->mouseHovered(w, playerID) == EVENT_LET) sendEventToUser(ribbon, ribbon->m_properties[PROP_ID], playerID); if (ribbon->mouseHovered(w, playerID) == EVENT_LET) sendEventToUser(ribbon, ribbon->m_properties[PROP_ID], 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);
@ -521,8 +528,9 @@ EventPropagation EventHandler::onGUIEvent(const SEvent& event)
else else
{ {
// focus on hover for other widgets // focus on hover for other widgets
const int playerID = input_manager->getPlayerKeyboardID(); // give the mouse "game master" priviledges
if (input_manager->masterPlayerOnly() && playerID != 0) break; const int playerID = PLAYER_ID_GAME_MASTER; //input_manager->getPlayerKeyboardID();
if (input_manager->masterPlayerOnly() && playerID != PLAYER_ID_GAME_MASTER) break;
if (playerID != -1) if (playerID != -1)
{ {
// lists don't like that combined with scrollbars // lists don't like that combined with scrollbars