matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only cancel click events clickable signs (not all signs)

Browse Source
This commit is contained in:
Simon Robertshaw 2013-10-26 01:00:41 +01:00
parent aa09c0e753
commit 30d985ba77
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/game/GameController.cpp
View File

@ -568,8 +568,11 @@ bool GameController::MouseDown(int x, int y, unsigned button)
y = point.Y; y = point.Y;
if(ret && y<YRES && x<XRES) if(ret && y<YRES && x<XRES)
if (gameModel->GetActiveTool(0)->GetIdentifier() != "DEFAULT_UI_SIGN" || button != BUTTON_LEFT) //If it's not a sign tool or you are right/middle clicking if (gameModel->GetActiveTool(0)->GetIdentifier() != "DEFAULT_UI_SIGN" || button != BUTTON_LEFT) //If it's not a sign tool or you are right/middle clicking
if(GetSignAt(x, y)) {
sign * foundSign = GetSignAt(x, y);
if(foundSign && splitsign(foundSign->text.c_str()))
return false; return false;
}
return ret; return ret;
} }
@ -585,12 +588,12 @@ bool GameController::MouseUp(int x, int y, unsigned button)
{ {
sign * foundSign = GetSignAt(x, y); sign * foundSign = GetSignAt(x, y);
if(foundSign) { if(foundSign) {
ret = false;
const char* str=foundSign->text.c_str(); const char* str=foundSign->text.c_str();
char type; char type;
int pos=splitsign(str, &type); int pos=splitsign(str, &type);
if (pos) if (pos)
{ {
ret = false;
if(type == 'c' || type == 't') { if(type == 'c' || type == 't') {
char buff[256]; char buff[256];
strcpy(buff, str+3); strcpy(buff, str+3);