project_files/HedgewarsMobile/Classes/OverlayViewController.m
author koda
Mon, 31 Oct 2011 03:08:16 +0100
changeset 6247 6dfad55fd71c
parent 6078 8c0cc07731e5
child 6259 02765411a912
permissions -rw-r--r--
unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3829
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
     1
/*
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
     2
 * Hedgewars-iOS, a Hedgewars port for iOS devices
4976
088d40d8aba2 Happy 2011 :)
koda
parents: 4935
diff changeset
     3
 * Copyright (c) 2009-2011 Vittorio Giovara <vittorio.giovara@gmail.com>
3829
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
     4
 *
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
     5
 * This program is free software; you can redistribute it and/or modify
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
     6
 * it under the terms of the GNU General Public License as published by
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
     7
 * the Free Software Foundation; version 2 of the License
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
     8
 *
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
     9
 * This program is distributed in the hope that it will be useful,
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    12
 * GNU General Public License for more details.
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    13
 *
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    14
 * You should have received a copy of the GNU General Public License
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    15
 * along with this program; if not, write to the Free Software
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    16
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    17
 *
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    18
 * File created on 16/03/2010.
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    19
 */
81db3c85784b headers ftw, also right project file
koda
parents: 3792
diff changeset
    20
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    21
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    22
#import "OverlayViewController.h"
3791
98072b3871c1 help page for ingame, some other fixes here and there
koda
parents: 3789
diff changeset
    23
#import "InGameMenuViewController.h"
3792
dd9345e74b66 help page for lobby
koda
parents: 3791
diff changeset
    24
#import "HelpPageViewController.h"
3924
2a9ace189288 WIP for an objc ammomenu implementation
koda
parents: 3922
diff changeset
    25
#import "AmmoMenuViewController.h"
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    26
#import "CGPointUtils.h"
4028
eb371ada631d move functions called by pascal code outside controller
koda
parents: 3996
diff changeset
    27
#import "ObjcExports.h"
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    28
6078
8c0cc07731e5 headers cleanup, converted some function-only sources into proper class method files, more use of OOP power, removed some 'respondsToSelector' calls, moved defines into their own header, more use of objc categories
koda
parents: 6018
diff changeset
    29
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    30
#define HIDING_TIME_DEFAULT [NSDate dateWithTimeIntervalSinceNow:2.7]
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    31
#define HIDING_TIME_NEVER   [NSDate dateWithTimeIntervalSinceNow:10000]
3941
017b2b31e1c6 integrate nicely with external display
koda
parents: 3940
diff changeset
    32
#define doDim()             [dimTimer setFireDate: (IS_DUALHEAD()) ? HIDING_TIME_NEVER : HIDING_TIME_DEFAULT]
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
    33
#define doNotDim()          [dimTimer setFireDate:HIDING_TIME_NEVER]
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    34
5174
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
    35
6018
3b86826f6665 add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents: 6000
diff changeset
    36
static OverlayViewController *mainOverlay;
3b86826f6665 add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents: 6000
diff changeset
    37
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    38
@implementation OverlayViewController
6247
6dfad55fd71c unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents: 6078
diff changeset
    39
@synthesize popoverController, popupMenu, helpPage, amvc, initialScreenCount, loadingIndicator,
5662
99083392cd4f FREE AT LAST!!! SDL came around a (mostly) sane way for implementing rotation events, so we can scrap all the workaround code that has been added to workaround it!! Also this allows us to use proper (internal) multitasking handling and can simplify optional settings and other yet unexplored features. Yay!
koda
parents: 5208
diff changeset
    40
            confirmButton, grenadeTimeSegment;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    41
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    42
#pragma mark -
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    43
#pragma mark rotation
5109
6d2e8a24277e strangely enough, the new sdl rotation code is incompatible with our system... this is a workaround that should hold up until their code becomes more stable
koda
parents: 4976
diff changeset
    44
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    45
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
3977
9df7b4812da9 optimizations to new ammomenu and overlay
koda
parents: 3976
diff changeset
    46
    return rotationManager(interfaceOrientation);
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    47
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    48
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    49
#pragma mark -
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    50
#pragma mark View Management
6018
3b86826f6665 add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents: 6000
diff changeset
    51
-(id) initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
3b86826f6665 add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents: 6000
diff changeset
    52
    if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    53
        isAttacking = NO;
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    54
        isPopoverVisible = NO;
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
    55
        initialScreenCount = (IS_DUALHEAD() ? 2 : 1);
6247
6dfad55fd71c unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents: 6078
diff changeset
    56
        loadingIndicator = nil;
6018
3b86826f6665 add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents: 6000
diff changeset
    57
        mainOverlay = self;
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    58
    }
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    59
    return self;
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    60
}
3948
24daa33a3114 some rethinking of initial menu presentation and initial orientation (also merging images should be threadsafe now)
koda
parents: 3941
diff changeset
    61
6018
3b86826f6665 add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents: 6000
diff changeset
    62
+(OverlayViewController *)mainOverlay {
3b86826f6665 add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents: 6000
diff changeset
    63
    return mainOverlay;
3b86826f6665 add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents: 6000
diff changeset
    64
}
3b86826f6665 add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents: 6000
diff changeset
    65
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    66
-(void) viewDidLoad {
5662
99083392cd4f FREE AT LAST!!! SDL came around a (mostly) sane way for implementing rotation events, so we can scrap all the workaround code that has been added to workaround it!! Also this allows us to use proper (internal) multitasking handling and can simplify optional settings and other yet unexplored features. Yay!
koda
parents: 5208
diff changeset
    67
    // fill all the screen available as sdlview disables autoresizing
99083392cd4f FREE AT LAST!!! SDL came around a (mostly) sane way for implementing rotation events, so we can scrap all the workaround code that has been added to workaround it!! Also this allows us to use proper (internal) multitasking handling and can simplify optional settings and other yet unexplored features. Yay!
koda
parents: 5208
diff changeset
    68
    CGRect rect = [[UIScreen mainScreen] bounds];
99083392cd4f FREE AT LAST!!! SDL came around a (mostly) sane way for implementing rotation events, so we can scrap all the workaround code that has been added to workaround it!! Also this allows us to use proper (internal) multitasking handling and can simplify optional settings and other yet unexplored features. Yay!
koda
parents: 5208
diff changeset
    69
    self.view.frame = CGRectMake(0, 0, rect.size.height, rect.size.width);
3977
9df7b4812da9 optimizations to new ammomenu and overlay
koda
parents: 3976
diff changeset
    70
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    71
    // the timer used to dim the overlay
3941
017b2b31e1c6 integrate nicely with external display
koda
parents: 3940
diff changeset
    72
    dimTimer = [[NSTimer alloc] initWithFireDate:(IS_DUALHEAD()) ? HIDING_TIME_NEVER : [NSDate dateWithTimeIntervalSinceNow:6]
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    73
                                        interval:1000
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    74
                                          target:self
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    75
                                        selector:@selector(dimOverlay)
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    76
                                        userInfo:nil
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    77
                                         repeats:YES];
3952
d6412423da45 moved some utilities to a separate column with round buttons
koda
parents: 3948
diff changeset
    78
    // add timer to runloop, otherwise it doesn't work
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    79
    [[NSRunLoop currentRunLoop] addTimer:dimTimer forMode:NSDefaultRunLoopMode];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
    80
4924
616b618814b5 show dual head mode some love
koda
parents: 4920
diff changeset
    81
    // display the help page, required by the popover on ipad
3791
98072b3871c1 help page for ingame, some other fixes here and there
koda
parents: 3789
diff changeset
    82
    [[NSNotificationCenter defaultCenter] addObserver:self
98072b3871c1 help page for ingame, some other fixes here and there
koda
parents: 3789
diff changeset
    83
                                             selector:@selector(showHelp:)
98072b3871c1 help page for ingame, some other fixes here and there
koda
parents: 3789
diff changeset
    84
                                                 name:@"show help ingame"
98072b3871c1 help page for ingame, some other fixes here and there
koda
parents: 3789
diff changeset
    85
                                               object:nil];
98072b3871c1 help page for ingame, some other fixes here and there
koda
parents: 3789
diff changeset
    86
5662
99083392cd4f FREE AT LAST!!! SDL came around a (mostly) sane way for implementing rotation events, so we can scrap all the workaround code that has been added to workaround it!! Also this allows us to use proper (internal) multitasking handling and can simplify optional settings and other yet unexplored features. Yay!
koda
parents: 5208
diff changeset
    87
    if (IS_IPAD()) {
4082
bfe14b38dad1 better support for wimpier i-devices
koda
parents: 4078
diff changeset
    88
        [[NSNotificationCenter defaultCenter] addObserver:self
bfe14b38dad1 better support for wimpier i-devices
koda
parents: 4078
diff changeset
    89
                                                 selector:@selector(numberOfScreensIncreased)
bfe14b38dad1 better support for wimpier i-devices
koda
parents: 4078
diff changeset
    90
                                                     name:UIScreenDidConnectNotification
bfe14b38dad1 better support for wimpier i-devices
koda
parents: 4078
diff changeset
    91
                                                   object:nil];
bfe14b38dad1 better support for wimpier i-devices
koda
parents: 4078
diff changeset
    92
        
bfe14b38dad1 better support for wimpier i-devices
koda
parents: 4078
diff changeset
    93
        [[NSNotificationCenter defaultCenter] addObserver:self
bfe14b38dad1 better support for wimpier i-devices
koda
parents: 4078
diff changeset
    94
                                                 selector:@selector(numberOfScreensDecreased)
bfe14b38dad1 better support for wimpier i-devices
koda
parents: 4078
diff changeset
    95
                                                     name:UIScreenDidDisconnectNotification
bfe14b38dad1 better support for wimpier i-devices
koda
parents: 4078
diff changeset
    96
                                                   object:nil];
bfe14b38dad1 better support for wimpier i-devices
koda
parents: 4078
diff changeset
    97
    }
4454
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
    98
    
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
    99
    // present the overlay
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   100
    self.view.alpha = 0;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   101
    [UIView beginAnimations:@"showing overlay" context:NULL];
4098
40df542b5f62 i give up and disable rotation on the iphone; also fix smaller compilation issues
koda
parents: 4082
diff changeset
   102
    [UIView setAnimationDuration:2];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   103
    self.view.alpha = 1;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   104
    [UIView commitAnimations];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   105
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   106
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   107
-(void) viewDidUnload {
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   108
    [[NSNotificationCenter defaultCenter] removeObserver:self];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   109
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   110
    [NSObject cancelPreviousPerformRequestsWithTarget:self
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   111
                                             selector:@selector(unsetPreciseStatus)
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   112
                                               object:nil];
3941
017b2b31e1c6 integrate nicely with external display
koda
parents: 3940
diff changeset
   113
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   114
    // only objects initialized in viewDidLoad should be here
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   115
    dimTimer = nil;
6018
3b86826f6665 add a class method for getting the overlay (and fix a silly mistake while at it) and use it
koda
parents: 6000
diff changeset
   116
    mainOverlay = nil;
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   117
    self.helpPage = nil;
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   118
    [self dismissPopover];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   119
    self.popoverController = nil;
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   120
    self.amvc = nil;
6247
6dfad55fd71c unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents: 6078
diff changeset
   121
    self.loadingIndicator = nil;
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   122
    MSG_DIDUNLOAD();
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   123
    [super viewDidUnload];
4924
616b618814b5 show dual head mode some love
koda
parents: 4920
diff changeset
   124
}
616b618814b5 show dual head mode some love
koda
parents: 4920
diff changeset
   125
3783
8e9daf967406 X&Y buttons, sounds for some buttons, cleanup
koda
parents: 3779
diff changeset
   126
-(void) didReceiveMemoryWarning {
8e9daf967406 X&Y buttons, sounds for some buttons, cleanup
koda
parents: 3779
diff changeset
   127
    if (self.popupMenu.view.superview == nil)
8e9daf967406 X&Y buttons, sounds for some buttons, cleanup
koda
parents: 3779
diff changeset
   128
        self.popupMenu = nil;
3791
98072b3871c1 help page for ingame, some other fixes here and there
koda
parents: 3789
diff changeset
   129
    if (self.helpPage.view.superview == nil)
98072b3871c1 help page for ingame, some other fixes here and there
koda
parents: 3789
diff changeset
   130
        self.helpPage = nil;
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   131
    if (self.amvc.view.superview == nil)
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   132
        self.amvc = nil;
6247
6dfad55fd71c unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents: 6078
diff changeset
   133
    if (self.loadingIndicator.superview == nil)
6dfad55fd71c unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents: 6078
diff changeset
   134
        self.loadingIndicator = nil;
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   135
    if (self.confirmButton.superview == nil)
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   136
        self.confirmButton = nil;
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   137
    if (self.grenadeTimeSegment.superview == nil)
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   138
        self.grenadeTimeSegment = nil;
3996
eb549fd864a5 the ios port is also iphone compatible
koda
parents: 3978
diff changeset
   139
    if (IS_IPAD())
3971
5c82ee165ed5 minor stuff
koda
parents: 3952
diff changeset
   140
        if (((UIPopoverController *)self.popoverController).contentViewController.view.superview == nil)
5c82ee165ed5 minor stuff
koda
parents: 3952
diff changeset
   141
            self.popoverController = nil;
5156
641abe679bf0 work in progress yet again (can run some games now)
koda
parents: 5155
diff changeset
   142
3783
8e9daf967406 X&Y buttons, sounds for some buttons, cleanup
koda
parents: 3779
diff changeset
   143
    MSG_MEMCLEAN();
3971
5c82ee165ed5 minor stuff
koda
parents: 3952
diff changeset
   144
    [super didReceiveMemoryWarning];
3783
8e9daf967406 X&Y buttons, sounds for some buttons, cleanup
koda
parents: 3779
diff changeset
   145
}
8e9daf967406 X&Y buttons, sounds for some buttons, cleanup
koda
parents: 3779
diff changeset
   146
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   147
-(void) dealloc {
5208
878e551f0b4a all together now! releaseAndNil ftw
koda
parents: 5207
diff changeset
   148
    releaseAndNil(popupMenu);
878e551f0b4a all together now! releaseAndNil ftw
koda
parents: 5207
diff changeset
   149
    releaseAndNil(helpPage);
878e551f0b4a all together now! releaseAndNil ftw
koda
parents: 5207
diff changeset
   150
    releaseAndNil(popoverController);
878e551f0b4a all together now! releaseAndNil ftw
koda
parents: 5207
diff changeset
   151
    releaseAndNil(amvc);
6247
6dfad55fd71c unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents: 6078
diff changeset
   152
    releaseAndNil(loadingIndicator);
5208
878e551f0b4a all together now! releaseAndNil ftw
koda
parents: 5207
diff changeset
   153
    releaseAndNil(confirmButton);
878e551f0b4a all together now! releaseAndNil ftw
koda
parents: 5207
diff changeset
   154
    releaseAndNil(grenadeTimeSegment);
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   155
    // dimTimer is autoreleased
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   156
    [super dealloc];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   157
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   158
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   159
-(void) numberOfScreensIncreased {
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   160
    if (self.initialScreenCount == 1) {
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   161
        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"New display detected"
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   162
                                                        message:NSLocalizedString(@"Hedgewars supports multi-monitor configurations, but the screen has to be connected before launching the game.",@"")
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   163
                                                       delegate:nil
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   164
                                              cancelButtonTitle:@"Ok"
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   165
                                              otherButtonTitles:nil];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   166
        [alert show];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   167
        [alert release];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   168
        HW_pause();
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   169
    }
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   170
}
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   171
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   172
-(void) numberOfScreensDecreased {
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   173
    if (self.initialScreenCount == 2) {
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   174
        UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Oh noes! Display disconnected"
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   175
                                                        message:NSLocalizedString(@"A monitor has been disconnected while playing and this has ended the match! You need to restart the game if you wish to use the second display again.",@"")
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   176
                                                       delegate:nil
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   177
                                              cancelButtonTitle:@"Ok"
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   178
                                              otherButtonTitles:nil];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   179
        [alert show];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   180
        [alert release];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   181
        HW_terminate(NO);
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   182
    }
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   183
}
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   184
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   185
#pragma mark -
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   186
#pragma mark overlay appearance
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   187
// nice transition for dimming, should be called only by the timer himself
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   188
-(void) dimOverlay {
6247
6dfad55fd71c unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents: 6078
diff changeset
   189
    if ([HWUtils isGameRunning]) {
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   190
        [UIView beginAnimations:@"overlay dim" context:NULL];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   191
        [UIView setAnimationDuration:0.6];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   192
        self.view.alpha = 0.2;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   193
        [UIView commitAnimations];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   194
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   195
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   196
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   197
// set the overlay visible and put off the timer for enough time
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   198
-(void) activateOverlay {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   199
    self.view.alpha = 1;
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   200
    doNotDim();
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   201
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   202
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   203
-(void) removeOverlay {
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   204
    [self.popupMenu performSelectorOnMainThread:@selector(dismiss) withObject:nil waitUntilDone:YES];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   205
    [self.popoverController performSelectorOnMainThread:@selector(dismissPopoverAnimated:) withObject:nil waitUntilDone:YES];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   206
    [self.view performSelectorOnMainThread:@selector(removeFromSuperview) withObject:nil waitUntilDone:YES];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   207
}
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   208
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   209
#pragma mark -
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   210
#pragma mark overlay user interaction
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   211
// dim the overlay when there's no more input for a certain amount of time
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   212
-(IBAction) buttonReleased:(id) sender {
6247
6dfad55fd71c unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents: 6078
diff changeset
   213
    if ([HWUtils isGameRunning] == NO)
3629
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   214
        return;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   215
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   216
    UIButton *theButton = (UIButton *)sender;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   217
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   218
    switch (theButton.tag) {
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   219
        case 0:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   220
        case 1:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   221
        case 2:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   222
        case 3:
3649
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   223
            [NSObject cancelPreviousPerformRequestsWithTarget:self
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   224
                                                     selector:@selector(unsetPreciseStatus)
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   225
                                                       object:nil];
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   226
            HW_walkingKeysUp();
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   227
            break;
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   228
        case 4:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   229
        case 5:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   230
        case 6:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   231
            HW_otherKeysUp();
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   232
            break;
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   233
        default:
3660
bc125bea5849 complete settings page rework
koda
parents: 3651
diff changeset
   234
            DLog(@"Nope");
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   235
            break;
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   236
    }
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   237
3737
2ba6ac8a114b reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents: 3701
diff changeset
   238
    isAttacking = NO;
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   239
    doDim();
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   240
}
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   241
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   242
// issue certain action based on the tag of the button
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   243
-(IBAction) buttonPressed:(id) sender {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   244
    [self activateOverlay];
3904
22e4d74240e5 finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents: 3829
diff changeset
   245
    
6247
6dfad55fd71c unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents: 6078
diff changeset
   246
    if ([HWUtils isGameRunning] == NO)
3904
22e4d74240e5 finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents: 3829
diff changeset
   247
        return;
22e4d74240e5 finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents: 3829
diff changeset
   248
    
22e4d74240e5 finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents: 3829
diff changeset
   249
    if (isPopoverVisible)
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   250
        [self dismissPopover];
3779
3351a017d4ad tap to dismiss 'get ready', add a toggle to enable/disable it
koda
parents: 3765
diff changeset
   251
    
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   252
    UIButton *theButton = (UIButton *)sender;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   253
    switch (theButton.tag) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   254
        case 0:
3737
2ba6ac8a114b reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents: 3701
diff changeset
   255
            if (isAttacking == NO)
2ba6ac8a114b reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents: 3701
diff changeset
   256
                HW_walkLeft();
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   257
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   258
        case 1:
3737
2ba6ac8a114b reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents: 3701
diff changeset
   259
            if (isAttacking == NO)
2ba6ac8a114b reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents: 3701
diff changeset
   260
                HW_walkRight();
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   261
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   262
        case 2:
3649
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   263
            [self performSelector:@selector(unsetPreciseStatus) withObject:nil afterDelay:0.8];
3737
2ba6ac8a114b reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents: 3701
diff changeset
   264
            HW_preciseSet(!HW_isWeaponRope());
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   265
            HW_aimUp();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   266
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   267
        case 3:
3649
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   268
            [self performSelector:@selector(unsetPreciseStatus) withObject:nil afterDelay:0.8];
3737
2ba6ac8a114b reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents: 3701
diff changeset
   269
            HW_preciseSet(!HW_isWeaponRope());
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   270
            HW_aimDown();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   271
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   272
        case 4:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   273
            HW_shoot();
3737
2ba6ac8a114b reworked the initialization functions, now it should be safe to update and no more need of spinning wheel at first launch
koda
parents: 3701
diff changeset
   274
            isAttacking = YES;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   275
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   276
        case 5:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   277
            HW_jump();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   278
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   279
        case 6:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   280
            HW_backjump();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   281
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   282
        case 10:
6000
dbcebcd3d79f ios frontend: sounds and music have their own class now (with caching\!) instead of being spread here and there (exploiting class methods like a true oop pro)
koda
parents: 5662
diff changeset
   283
            [AudioManagerController playClickSound];
4504
8906b2409d97 add the appirater class for getting more positive reviews
koda
parents: 4454
diff changeset
   284
            clearView();
3667
9359a70df013 use external libs more consistently
koda
parents: 3662
diff changeset
   285
            HW_pause();
3941
017b2b31e1c6 integrate nicely with external display
koda
parents: 3940
diff changeset
   286
            if (self.amvc.isVisible && IS_DUALHEAD() == NO) {
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   287
                doDim();
3935
5ca27a0e9a63 made the new menu toggable
koda
parents: 3933
diff changeset
   288
                [self.amvc disappear];
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   289
            }
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   290
            clearView();
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   291
            [self showPopover];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   292
            break;
3624
304c6d32383a button to open ammomenu
koda
parents: 3617
diff changeset
   293
        case 11:
6000
dbcebcd3d79f ios frontend: sounds and music have their own class now (with caching\!) instead of being spread here and there (exploiting class methods like a true oop pro)
koda
parents: 5662
diff changeset
   294
            [AudioManagerController playClickSound];
4504
8906b2409d97 add the appirater class for getting more positive reviews
koda
parents: 4454
diff changeset
   295
            clearView();
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   296
            
5206
db775bddf771 settings.plist is no more, long live nsuserdefaults
koda
parents: 5195
diff changeset
   297
            if (IS_DUALHEAD() || [[[NSUserDefaults standardUserDefaults] objectForKey:@"classic_menu"] boolValue] == NO) {
3935
5ca27a0e9a63 made the new menu toggable
koda
parents: 3933
diff changeset
   298
                if (self.amvc == nil)
5ca27a0e9a63 made the new menu toggable
koda
parents: 3933
diff changeset
   299
                    self.amvc = [[AmmoMenuViewController alloc] init];
5174
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
   300
3935
5ca27a0e9a63 made the new menu toggable
koda
parents: 3933
diff changeset
   301
                if (self.amvc.isVisible) {
5ca27a0e9a63 made the new menu toggable
koda
parents: 3933
diff changeset
   302
                    doDim();
5ca27a0e9a63 made the new menu toggable
koda
parents: 3933
diff changeset
   303
                    [self.amvc disappear];
5ca27a0e9a63 made the new menu toggable
koda
parents: 3933
diff changeset
   304
                } else {
3952
d6412423da45 moved some utilities to a separate column with round buttons
koda
parents: 3948
diff changeset
   305
                    if (HW_isAmmoMenuNotAllowed() == NO) {
d6412423da45 moved some utilities to a separate column with round buttons
koda
parents: 3948
diff changeset
   306
                        doNotDim();
d6412423da45 moved some utilities to a separate column with round buttons
koda
parents: 3948
diff changeset
   307
                        [self.amvc appearInView:self.view];
d6412423da45 moved some utilities to a separate column with round buttons
koda
parents: 3948
diff changeset
   308
                    }
3935
5ca27a0e9a63 made the new menu toggable
koda
parents: 3933
diff changeset
   309
                }
5174
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
   310
            } else
3941
017b2b31e1c6 integrate nicely with external display
koda
parents: 3940
diff changeset
   311
                HW_ammoMenu();
3624
304c6d32383a button to open ammomenu
koda
parents: 3617
diff changeset
   312
            break;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   313
        default:
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   314
            DLog(@"Nope");
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   315
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   316
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   317
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   318
3649
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   319
-(void) unsetPreciseStatus {
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   320
    HW_preciseSet(NO);
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   321
}
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   322
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   323
-(void) sendHWClick {
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   324
    HW_click();
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   325
    clearView();
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   326
    doDim();
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   327
}
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   328
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   329
-(void) setGrenadeTime:(id) sender {
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   330
    UISegmentedControl *theSegment = (UISegmentedControl *)sender;
6247
6dfad55fd71c unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents: 6078
diff changeset
   331
    if ([ObjcExports grenadeTime] != theSegment.selectedSegmentIndex) {
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   332
        HW_setGrenadeTime(theSegment.selectedSegmentIndex + 1);
6247
6dfad55fd71c unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents: 6078
diff changeset
   333
        [ObjcExports setGrenadeTime:theSegment.selectedSegmentIndex];
3976
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   334
    }
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   335
}
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   336
abaf741a4e21 less warning, no rotation glitch, more comments
koda
parents: 3971
diff changeset
   337
#pragma mark -
5166
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   338
#pragma mark in-game menu and help page
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   339
-(void) showHelp:(id) sender {
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   340
    if (self.helpPage == nil) {
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   341
        NSString *xibName = (IS_IPAD() ? @"HelpPageInGameViewController-iPad" : @"HelpPageInGameViewController-iPhone");
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   342
        self.helpPage = [[HelpPageViewController alloc] initWithNibName:xibName bundle:nil];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   343
    }
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   344
    self.helpPage.view.alpha = 0;
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   345
    [self.view addSubview:helpPage.view];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   346
    [UIView beginAnimations:@"helpingame" context:NULL];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   347
    self.helpPage.view.alpha = 1;
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   348
    [UIView commitAnimations];
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   349
    doNotDim();
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   350
}
d1eb1560b4d5 and now for something completely different, overlay refactoring!
koda
parents: 5156
diff changeset
   351
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   352
// show up a popover containing a popupMenuViewController; we hook it with setPopoverContentSize
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   353
// on iphone instead just use the tableViewController directly (and implement manually all animations)
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   354
-(IBAction) showPopover{
3667
9359a70df013 use external libs more consistently
koda
parents: 3662
diff changeset
   355
    CGRect screen = [[UIScreen mainScreen] bounds];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   356
    isPopoverVisible = YES;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   357
3996
eb549fd864a5 the ios port is also iphone compatible
koda
parents: 3978
diff changeset
   358
    if (IS_IPAD()) {
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   359
        if (self.popupMenu == nil)
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   360
            self.popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStylePlain];
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   361
        if (self.popoverController == nil) {
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   362
            self.popoverController = [[UIPopoverController alloc] initWithContentViewController:self.popupMenu];
4935
27fb500dd6b1 screenshots 4 ios
koda
parents: 4924
diff changeset
   363
            [self.popoverController setPopoverContentSize:CGSizeMake(220, 200) animated:YES];
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   364
            [self.popoverController setPassthroughViews:[NSArray arrayWithObject:self.view]];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   365
        }
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
   366
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   367
        [self.popoverController presentPopoverFromRect:CGRectMake(screen.size.height / 2, screen.size.width / 2, 1, 1)
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   368
                                           inView:self.view
3667
9359a70df013 use external libs more consistently
koda
parents: 3662
diff changeset
   369
                         permittedArrowDirections:UIPopoverArrowDirectionAny
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   370
                                         animated:YES];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   371
    } else {
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   372
        if (self.popupMenu == nil)
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   373
            self.popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStyleGrouped];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   374
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   375
        [self.view addSubview:popupMenu.view];
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   376
        [self.popupMenu present];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   377
    }
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   378
    self.popupMenu.tableView.scrollEnabled = NO;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   379
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   380
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   381
// on ipad just dismiss it, on iphone transtion to the right
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   382
-(void) dismissPopover {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   383
    if (YES == isPopoverVisible) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   384
        isPopoverVisible = NO;
3672
f225b94a4411 shrink confirmation button, double tap resets zoom and centers hog
koda
parents: 3668
diff changeset
   385
        if (HW_isPaused())
4454
42bfc1a70968 more retina support and multitasking support
koda
parents: 4362
diff changeset
   386
            HW_pauseToggle();
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   387
4920
bc3c077e15a2 cleaning up how chat is handled on idevices
koda
parents: 4861
diff changeset
   388
        [self.popupMenu dismiss];
bc3c077e15a2 cleaning up how chat is handled on idevices
koda
parents: 4861
diff changeset
   389
        if (IS_IPAD())
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   390
            [self.popoverController dismissPopoverAnimated:YES];
4920
bc3c077e15a2 cleaning up how chat is handled on idevices
koda
parents: 4861
diff changeset
   391
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   392
        [self buttonReleased:nil];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   393
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   394
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   395
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   396
#pragma mark -
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   397
#pragma mark Custom touch event handling
4541
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   398
-(BOOL) shouldIgnoreTouch:(NSSet *)allTouches {
6247
6dfad55fd71c unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents: 6078
diff changeset
   399
    if ([HWUtils isGameRunning] == NO)
4541
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   400
        return YES;
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   401
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   402
    // ignore activity near the dpad and buttons
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   403
    CGPoint touchPoint = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view];
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   404
    CGSize screen = [[UIScreen mainScreen] bounds].size;
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   405
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   406
    if ((touchPoint.x < 160 && touchPoint.y > screen.width - 155 ) || 
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   407
        (touchPoint.x > screen.height - 135 && touchPoint.y > screen.width - 140))
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   408
        return YES;
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   409
    return NO;
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   410
}
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   411
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   412
-(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   413
    NSSet *allTouches = [event allTouches];
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   414
    UITouch *first, *second;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   415
4541
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   416
    if ([self shouldIgnoreTouch:allTouches] == YES)
3765
ebfe7c9b3085 set flake to non critical, no touches until game is starding, moved some variables to be initialized in the right place
koda
parents: 3739
diff changeset
   417
        return;
ebfe7c9b3085 set flake to non critical, no touches until game is starding, moved some variables to be initialized in the right place
koda
parents: 3739
diff changeset
   418
3647
0d0df215fb52 making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents: 3646
diff changeset
   419
    // hide in-game menu
0d0df215fb52 making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents: 3646
diff changeset
   420
    if (isPopoverVisible)
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   421
        [self dismissPopover];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   422
3941
017b2b31e1c6 integrate nicely with external display
koda
parents: 3940
diff changeset
   423
    if (self.amvc.isVisible && IS_DUALHEAD() == NO) {
3933
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   424
        doDim();
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   425
        [self.amvc disappear];
1a873262f5dd polishing the cocoa ammomenu a little, still requires work
koda
parents: 3926
diff changeset
   426
    }
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   427
    // reset default dimming
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   428
    doDim();
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   429
3668
3f7a95234d8a tap to play piano notes, fix for audio and pause glitch
koda
parents: 3667
diff changeset
   430
    HW_setPianoSound([allTouches count]);
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   431
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   432
    switch ([allTouches count]) {
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   433
        case 1:
3651
7058ca178f3b switching hogs now works
koda
parents: 3650
diff changeset
   434
            startingPoint = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view];
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   435
            if (2 == [[[allTouches allObjects] objectAtIndex:0] tapCount])
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   436
                HW_zoomReset();
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   437
            break;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   438
        case 2:
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   439
            // pinching
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   440
            first = [[allTouches allObjects] objectAtIndex:0];
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   441
            second = [[allTouches allObjects] objectAtIndex:1];
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   442
            initialDistanceForPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]);
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   443
            break;
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   444
        default:
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   445
            break;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   446
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   447
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   448
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   449
-(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   450
    NSSet *allTouches = [event allTouches];
4541
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   451
    if ([self shouldIgnoreTouch:allTouches] == YES)
3904
22e4d74240e5 finishing touches to save games handling (help label, dim on overlay, edit text only when table is editable)
koda
parents: 3829
diff changeset
   452
        return;
4541
c77c4f5d49d3 ignore touches around dpad and buttons (for real)
koda
parents: 4504
diff changeset
   453
5174
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
   454
    CGRect screen = [[UIScreen mainScreen] bounds];
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
   455
    CGPoint currentPosition = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view];
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
   456
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   457
    switch ([allTouches count]) {
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   458
        case 1:
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   459
            // if we're in the menu we just click in the point
3952
d6412423da45 moved some utilities to a separate column with round buttons
koda
parents: 3948
diff changeset
   460
            if (HW_isAmmoMenuOpen()) {
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   461
                HW_setCursor(HWXZ(currentPosition.x), HWYZ(currentPosition.y));
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   462
                // this click doesn't need any wrapping because the ammoMenu already limits the cursor
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   463
                HW_click();
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   464
            } else
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   465
                // if weapon requires a further click, ask for tapping again
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   466
                if (HW_isWeaponRequiringClick()) {
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   467
                    // here don't have to wrap thanks to isCursorVisible magic
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   468
                    HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y));
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   469
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   470
                    // draw the button at the last touched point (which is the current position)
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   471
                    if (self.confirmButton == nil) {
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   472
                        UIButton *tapAgain = [UIButton buttonWithType:UIButtonTypeRoundedRect];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   473
                        [tapAgain addTarget:self action:@selector(sendHWClick) forControlEvents:UIControlEventTouchUpInside];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   474
                        [tapAgain setTitle:NSLocalizedString(@"Set!",@"on the overlay") forState:UIControlStateNormal];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   475
                        self.confirmButton = tapAgain;
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   476
                    }
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   477
                    self.confirmButton.alpha = 0;
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   478
                    self.confirmButton.frame = CGRectMake(currentPosition.x - 75, currentPosition.y + 25, 150, 40);
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   479
                    [self.view addSubview:self.confirmButton];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   480
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   481
                    // animation ftw!
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   482
                    [UIView beginAnimations:@"inserting button" context:NULL];
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   483
                    [UIView setAnimationDuration:ANIMATION_DURATION];
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   484
                    self.confirmButton.alpha = 1;
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   485
                    [UIView commitAnimations];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   486
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   487
                    // keep the overlay active, or the button will fade
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   488
                    [self activateOverlay];
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   489
                    doNotDim();
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   490
                } else
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   491
                    if (HW_isWeaponTimerable()) {
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   492
                        if (self.grenadeTimeSegment.tag != 0) {
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   493
                            [UIView beginAnimations:@"removing segmented control" context:NULL];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   494
                            [UIView setAnimationDuration:ANIMATION_DURATION];
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   495
                            self.grenadeTimeSegment.alpha = 0;
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   496
                            [UIView commitAnimations];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   497
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   498
                            [self.grenadeTimeSegment performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:ANIMATION_DURATION];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   499
                            self.grenadeTimeSegment.tag = 0;
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   500
                        } else {
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   501
                            if (self.grenadeTimeSegment == nil) {
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   502
                                NSArray *items = [[NSArray alloc] initWithObjects:@"1",@"2",@"3",@"4",@"5",nil];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   503
                                UISegmentedControl *grenadeSegment = [[UISegmentedControl alloc] initWithItems:items];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   504
                                [items release];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   505
                                [grenadeSegment addTarget:self action:@selector(setGrenadeTime:) forControlEvents:UIControlEventValueChanged];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   506
                                self.grenadeTimeSegment = grenadeSegment;
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   507
                                [grenadeSegment release];
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   508
                            }
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   509
                            self.grenadeTimeSegment.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width, 250, 50);
6247
6dfad55fd71c unified the objc game state in a single place, which allowed some optimization to ObjcExport class (and more)
koda
parents: 6078
diff changeset
   510
                            self.grenadeTimeSegment.selectedSegmentIndex = [ObjcExports grenadeTime];
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   511
                            self.grenadeTimeSegment.alpha = 1;
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   512
                            [self.view addSubview:self.grenadeTimeSegment];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   513
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   514
                            [UIView beginAnimations:@"inserting segmented control" context:NULL];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   515
                            [UIView setAnimationDuration:ANIMATION_DURATION];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   516
                            [UIView setAnimationCurve:UIViewAnimationCurveEaseIn];
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   517
                            self.grenadeTimeSegment.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width - 100, 250, 50);
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   518
                            [UIView commitAnimations];
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   519
5175
a3da220dbb3f finish overlay refactoring and some leak annihilation
koda
parents: 5174
diff changeset
   520
                            self.grenadeTimeSegment.tag++;
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   521
                            [self activateOverlay];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   522
                            doNotDim();
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   523
                        }
3661
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   524
                    } else
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   525
                        if (HW_isWeaponSwitch())
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   526
                            HW_tab();
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   527
            break;
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   528
        case 2:
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   529
            HW_allKeysUp();
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   530
            break;
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   531
        default:
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   532
            break;
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   533
    }
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   534
3635
38d3e31556d3 improvements to touch interface (tap to select weap, don't move camera for spourious taps, ask for confirmation when using click-weapons)
koda
parents: 3629
diff changeset
   535
    initialDistanceForPinching = 0;
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   536
}
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   537
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   538
-(void) touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   539
    [self touchesEnded:touches withEvent:event];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   540
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   541
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   542
-(void) touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
5174
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
   543
    NSSet *allTouches = [event allTouches];
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
   544
    if ([self shouldIgnoreTouch:allTouches] == YES)
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
   545
        return;
f5294509783e initial refactoring of ObjcExports and OverlayViewController
koda
parents: 5166
diff changeset
   546
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
   547
    CGRect screen = [[UIScreen mainScreen] bounds];
3662
a44406f4369b polish polish polish polish (also: panning horizontal fix, panning momentum, settings page reworked yet again, memory leaks, crashes, segfaults)
koda
parents: 3661
diff changeset
   548
    int x, y, dx, dy;
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   549
    UITouch *touch, *first, *second;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   550
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   551
    switch ([allTouches count]) {
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
   552
        case 1:
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   553
            touch = [[allTouches allObjects] objectAtIndex:0];
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   554
            CGPoint currentPosition = [touch locationInView:self.view];
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   555
3952
d6412423da45 moved some utilities to a separate column with round buttons
koda
parents: 3948
diff changeset
   556
            if (HW_isAmmoMenuOpen()) {
3680
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   557
                // no zoom consideration for this
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   558
                HW_setCursor(HWXZ(currentPosition.x), HWYZ(currentPosition.y));
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   559
            } else
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   560
                if (HW_isWeaponRequiringClick()) {
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   561
                    // moves the cursor around wrt zoom
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   562
                    HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y));
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   563
                } else {
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   564
                    // panning \o/
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   565
                    dx = startingPoint.x - currentPosition.x;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   566
                    dy = currentPosition.y - startingPoint.y;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   567
                    HW_getCursor(&x, &y);
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   568
                    // momentum (or something like that)
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   569
                    /*if (abs(dx) > 40)
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   570
                        dx *= log(abs(dx)/4);
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   571
                    if (abs(dy) > 40)
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   572
                        dy *= log(abs(dy)/4);*/
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   573
                    HW_setCursor(x + dx/HW_zoomFactor(), y + dy/HW_zoomFactor());
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   574
                    startingPoint = currentPosition;
aaf832c6fbd7 fix panning when zoomed (finally)
koda
parents: 3672
diff changeset
   575
                }
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
   576
            break;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   577
        case 2:
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   578
            first = [[allTouches allObjects] objectAtIndex:0];
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   579
            second = [[allTouches allObjects] objectAtIndex:1];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   580
            CGFloat currentDistanceOfPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]);
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   581
            const int pinchDelta = 40;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   582
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   583
            if (0 != initialDistanceForPinching) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   584
                if (currentDistanceOfPinching - initialDistanceForPinching > pinchDelta) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   585
                    HW_zoomIn();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   586
                    initialDistanceForPinching = currentDistanceOfPinching;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   587
                }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   588
                else if (initialDistanceForPinching - currentDistanceOfPinching > pinchDelta) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   589
                    HW_zoomOut();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   590
                    initialDistanceForPinching = currentDistanceOfPinching;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   591
                }
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3680
diff changeset
   592
            } else
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   593
                initialDistanceForPinching = currentDistanceOfPinching;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   594
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   595
        default:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   596
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   597
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   598
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   599
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   600
@end