mirror of
https://git.code.sf.net/p/quake/game-source
synced 2024-11-21 19:41:25 +00:00
fix getState and toggleState as suggested by Deek
This commit is contained in:
parent
9f859a53e4
commit
a8aed356d0
3 changed files with 16 additions and 16 deletions
|
@ -62,12 +62,12 @@
|
|||
@end
|
||||
|
||||
@implementation NoclipFlag
|
||||
-(integer) getState
|
||||
-(integer) state
|
||||
{
|
||||
return @self.movetype == MOVETYPE_NOCLIP;
|
||||
}
|
||||
|
||||
-(void) toggleState
|
||||
-(void) toggle
|
||||
{
|
||||
if (@self.movetype == MOVETYPE_NOCLIP)
|
||||
@self.movetype = MOVETYPE_WALK;
|
||||
|
@ -77,36 +77,36 @@
|
|||
@end
|
||||
|
||||
@implementation GodmodeFlag
|
||||
-(integer) getState
|
||||
-(integer) state
|
||||
{
|
||||
return !!(@self.flags & FL_GODMODE);
|
||||
}
|
||||
|
||||
-(void) toggleState
|
||||
-(void) toggle
|
||||
{
|
||||
@self.flags ^= FL_GODMODE;
|
||||
}
|
||||
@end
|
||||
|
||||
@implementation HoldSelectFlag
|
||||
-(integer) getState
|
||||
-(integer) state
|
||||
{
|
||||
return [EditorState getHoldSelectState];
|
||||
}
|
||||
|
||||
-(void) toggleState
|
||||
-(void) toggle
|
||||
{
|
||||
[EditorState toggleHoldSelectState];
|
||||
}
|
||||
@end
|
||||
|
||||
@implementation DynamicFlag
|
||||
-(integer) getState
|
||||
-(integer) state
|
||||
{
|
||||
return waypoint_mode == WM_EDITOR_DYNAMIC;
|
||||
}
|
||||
|
||||
-(void) toggleState
|
||||
-(void) toggle
|
||||
{
|
||||
if (waypoint_mode == WM_EDITOR_DYNAMIC)
|
||||
waypoint_mode = WM_EDITOR;
|
||||
|
@ -116,13 +116,13 @@
|
|||
@end
|
||||
|
||||
@implementation DynamicLinkFlag
|
||||
-(integer) getState
|
||||
-(integer) state
|
||||
{
|
||||
local integer mode = waypoint_mode;
|
||||
return mode == WM_EDITOR_DYNAMIC || mode == WM_EDITOR_DYNLINK;
|
||||
}
|
||||
|
||||
-(void) toggleState
|
||||
-(void) toggle
|
||||
{
|
||||
if (waypoint_mode == WM_EDITOR_DYNLINK)
|
||||
waypoint_mode = WM_EDITOR;
|
||||
|
@ -139,7 +139,7 @@
|
|||
return self;
|
||||
}
|
||||
|
||||
-(integer) getState
|
||||
-(integer) state
|
||||
{
|
||||
local Waypoint way = [EditorState current_way];
|
||||
if (!way)
|
||||
|
@ -147,7 +147,7 @@
|
|||
return !!(way.flags & mask);
|
||||
}
|
||||
|
||||
-(void) toggleState
|
||||
-(void) toggle
|
||||
{
|
||||
local Waypoint way = [EditorState current_way];
|
||||
if (way)
|
||||
|
|
|
@ -13,8 +13,8 @@
|
|||
@end
|
||||
|
||||
@protocol FlagMenuItem
|
||||
-(integer) getState;
|
||||
-(void) toggleState;
|
||||
-(integer) state;
|
||||
-(void) toggle;
|
||||
@end
|
||||
|
||||
@interface FlagMenuItem: MenuItem
|
||||
|
|
|
@ -29,13 +29,13 @@
|
|||
|
||||
- (string) text
|
||||
{
|
||||
local integer state = (integer)[flag getState];
|
||||
local integer state = (integer)[flag state];
|
||||
return sprintf ("[%c] %s", state ? '#' : ' ', [super text]);
|
||||
}
|
||||
|
||||
- (void) select
|
||||
{
|
||||
[flag toggleState];
|
||||
[flag toggle];
|
||||
}
|
||||
@end
|
||||
|
||||
|
|
Loading…
Reference in a new issue