phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Order dispatcher ignores if mouse over minimap (minimap handles seperately)

Browse Source 
This was SVN commit r3379.
This commit is contained in:
pyrolink 2006-01-21 11:04:09 +00:00
parent b86ae011c9
commit 3555c4b931
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/ps/Interact.cpp
View File

@ -8,6 +8,8 @@
#include "CConsole.h"
#include "HFTracer.h"
#include "Hotkey.h"
#include "gui/CGUI.h"
#include "gui/MiniMap.h"
#include "timer.h"
#include "Game.h"
#include "ps/Globals.h"
@ -22,6 +24,7 @@
extern CConsole* g_Console;
extern CStr g_CursorName;
extern float g_xres, g_yres;
static const double SELECT_DBLCLICK_RATE = 0.5;
const int ORDER_DELAY = 5;
@ -850,6 +853,10 @@ void CMouseoverEntities::stopBandbox()
void FireWorldClickEvent(uint button, int clicks)
{
//debug_printf("FireWorldClickEvent: button %d, clicks %d\n", button, clicks);
//If we're clicking on the minimap, use its world click handler
if ( g_Selection.m_mouseOverMM )
return;
g_JSGameEvents.FireWorldClick(
button,
@ -939,7 +946,6 @@ InReaction interactInputHandler( const SDL_Event* ev )
lastclicktime[i] = 0.0f;
clicks[i] = 0;
});
// These refer to the left mouse button
static u16 button_down_x, button_down_y;
static double button_down_time;

2
source/ps/Interact.h
View File

@ -35,11 +35,13 @@ struct CSelectedEntities : public Singleton<CSelectedEntities>
m_secondaryCommand = -1;
m_secondaryAction = -1;
m_selectionChanged = true;
m_mouseOverMM = false;
}
std::vector<HEntity> m_selected;
std::vector<HEntity> m_groups[MAX_GROUPS];
i8 m_group, m_group_highlight;
bool m_selectionChanged;
bool m_mouseOverMM;
int m_defaultCommand;
int m_defaultAction;
int m_secondaryCommand;