marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Space now also closes menus

rope
Bernhard Bonigl 2012-04-14 22:53:36 +02:00
parent c4e782e713
commit 9da6d67c80
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
View File

@ -663,8 +663,12 @@ public func ObjectControl(int plr, int ctrl, int x, int y, int strength, bool re
// check if we can handle it by simply accessing the first actionbar item (for consistency)
else
{
if(GetMenu())
if(!GetMenu()->~Uncloseable())
return CancelMenu();
if(this->~ControlHotkey(0))
return true;
return true;
}
}
@ -678,8 +682,7 @@ public func ObjectControl(int plr, int ctrl, int x, int y, int strength, bool re
if (GetMenu()->~Uncloseable()) return true;
var is_content = GetMenu()->~IsContentMenu();
GetMenu()->RemoveObject();
SetMenu(nil);
CancelMenu();
// If contents menu, don't open new one and return.
if (is_content)
return true;
@ -1714,7 +1717,14 @@ func GetMenu()
func CancelMenu()
{
if (menu) menu->Close();
if (menu)
{
menu->Close();
SetMenu(nil);
return true;
}
return false;
}
func ReinitializeControls()