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

Resolved #515: Q now closes other menu and opens backpack menu 

Before, Q closed any menu if it was open or else opened the backpack menu.
Tobias Zwick 2010-12-08 01:56:48 +01:00
parent 250bd8aa23
commit 8834f9ea54
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
planet/Objects.c4d/Libraries.c4d/ClonkControl.c4d/Script.c
View File

@ -174,6 +174,8 @@ protected func Construction()
using = nil;
using_type = nil;
backpack_open = false;
return _inherited(...);
}
@ -376,6 +378,7 @@ local alt;
local mlastx, mlasty;
local virtual_cursor;
local noholdingcallbacks;
local backpack_open;
/* Main control function */
public func ObjectControl(int plr, int ctrl, int x, int y, int strength, bool repeat, bool release)
@ -387,11 +390,16 @@ public func ObjectControl(int plr, int ctrl, int x, int y, int strength, bool re
// open / close backpack
if (ctrl == CON_Backpack)
{
if (GetMenu())
var closed = false;
var backpack_was_open = backpack_open;
// close if menu was open
if(GetMenu())
{
GetMenu()->Close();
closed = true;
}
else if(MaxContentsCount() > 2)
// open if no menu was open or it was not the backpack menu which was open
if(MaxContentsCount() > 2 && (!closed || !backpack_was_open))
{
// Cancel usage
CancelUse();
@ -407,6 +415,7 @@ public func ObjectControl(int plr, int ctrl, int x, int y, int strength, bool re
GetMenu()->AddItem(item,nil,i);
}
// finally, show the menu.
backpack_open = true;
GetMenu()->Show();
}
return true;
@ -1278,6 +1287,7 @@ func SetMenu(object m)
func MenuClosed()
{
backpack_open = false;
SetMenu(nil);
}