project_files/HedgewarsMobile/Classes/OverlayViewController.m
author koda
Tue, 20 Jul 2010 23:30:54 +0200
changeset 3661 2378ada8a6ee
parent 3660 bc125bea5849
child 3662 a44406f4369b
permissions -rw-r--r--
i can haz panning
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
     1
//
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
     2
//  overlayViewController.m
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
     3
//  HedgewarsMobile
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
     4
//
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
     5
//  Created by Vittorio on 16/03/10.
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
     6
//  Copyright 2010 __MyCompanyName__. All rights reserved.
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
     7
//
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
     8
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
     9
#import "OverlayViewController.h"
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    10
#import "SDL_uikitappdelegate.h"
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    11
#import "PascalImports.h"
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    12
#import "CGPointUtils.h"
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    13
#import "SDL_mouse.h"
3647
0d0df215fb52 making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents: 3646
diff changeset
    14
#import "InGameMenuViewController.h"
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    15
#import "CommodityFunctions.h"
3648
2477029463ed some further chat polishing
koda
parents: 3647
diff changeset
    16
#import "SDL_config_iphoneos.h"
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    17
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    18
#define HIDING_TIME_DEFAULT [NSDate dateWithTimeIntervalSinceNow:2.7]
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    19
#define HIDING_TIME_NEVER   [NSDate dateWithTimeIntervalSinceNow:10000]
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
    20
#define doDim()             [dimTimer setFireDate:HIDING_TIME_DEFAULT]
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
    21
#define doNotDim()          [dimTimer setFireDate:HIDING_TIME_NEVER]
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    22
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
    23
#define CONFIRMATION_TAG 5959
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
    24
#define GRENADE_TAG 9595
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
    25
#define ANIMATION_DURATION 0.25
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
    26
#define removeConfirmationInput()   [[self.view viewWithTag:CONFIRMATION_TAG] removeFromSuperview]; 
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    27
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    28
@implementation OverlayViewController
3629
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
    29
@synthesize popoverController, popupMenu;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    30
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    31
-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    32
    return rotationManager(interfaceOrientation);
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    33
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    34
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    35
-(void) didRotate:(NSNotification *)notification {  
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    36
    UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    37
    CGRect rect = [[UIScreen mainScreen] bounds];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    38
    CGRect usefulRect = CGRectMake(0, 0, rect.size.width, rect.size.height);
3648
2477029463ed some further chat polishing
koda
parents: 3647
diff changeset
    39
    UIView *sdlView = [[[UIApplication sharedApplication] keyWindow] viewWithTag:SDL_VIEW_TAG];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    40
    
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    41
    [UIView beginAnimations:@"rotation" context:NULL];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    42
    [UIView setAnimationDuration:0.8f];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    43
    [UIView setAnimationCurve:UIViewAnimationCurveEaseInOut];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    44
    switch (orientation) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    45
        case UIDeviceOrientationLandscapeLeft:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    46
            sdlView.transform = CGAffineTransformMakeRotation(degreesToRadian(0));
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    47
            self.view.transform = CGAffineTransformMakeRotation(degreesToRadian(90));
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    48
            HW_setLandscape(YES);
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    49
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    50
        case UIDeviceOrientationLandscapeRight:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    51
            sdlView.transform = CGAffineTransformMakeRotation(degreesToRadian(180));
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    52
            self.view.transform = CGAffineTransformMakeRotation(degreesToRadian(-90));
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    53
            HW_setLandscape(YES);
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    54
            break;
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
    55
        /*
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    56
        case UIDeviceOrientationPortrait:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    57
            if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    58
                sdlView.transform = CGAffineTransformMakeRotation(degreesToRadian(270));
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    59
                self.view.transform = CGAffineTransformMakeRotation(degreesToRadian(0));
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    60
                [self chatAppear];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    61
                HW_setLandscape(NO);
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    62
            }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    63
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    64
        case UIDeviceOrientationPortraitUpsideDown:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    65
            if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    66
                sdlView.transform = CGAffineTransformMakeRotation(degreesToRadian(90));
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    67
                self.view.transform = CGAffineTransformMakeRotation(degreesToRadian(180));
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    68
                [self chatAppear];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    69
                HW_setLandscape(NO);
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    70
            }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    71
            break;
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
    72
        */
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    73
        default:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    74
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    75
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    76
    self.view.frame = usefulRect;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    77
    //sdlView.frame = usefulRect;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    78
    [UIView commitAnimations];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    79
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    80
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    81
#pragma mark -
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    82
#pragma mark View Management
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    83
-(void) viewDidLoad {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    84
    isPopoverVisible = NO;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    85
    self.view.alpha = 0;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    86
    self.view.center = CGPointMake(self.view.frame.size.height/2.0, self.view.frame.size.width/2.0);
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
    87
    
3627
f1da1d8fb56c the game now respects the orientation of the frontend
koda
parents: 3626
diff changeset
    88
    // set initial orientation
f1da1d8fb56c the game now respects the orientation of the frontend
koda
parents: 3626
diff changeset
    89
    UIDeviceOrientation orientation = [[UIDevice currentDevice] orientation];
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
    90
    UIView *sdlView = [[[UIApplication sharedApplication] keyWindow] viewWithTag:SDL_VIEW_TAG];
3627
f1da1d8fb56c the game now respects the orientation of the frontend
koda
parents: 3626
diff changeset
    91
    switch (orientation) {
f1da1d8fb56c the game now respects the orientation of the frontend
koda
parents: 3626
diff changeset
    92
        case UIDeviceOrientationLandscapeLeft:
f1da1d8fb56c the game now respects the orientation of the frontend
koda
parents: 3626
diff changeset
    93
            sdlView.transform = CGAffineTransformMakeRotation(degreesToRadian(0));
f1da1d8fb56c the game now respects the orientation of the frontend
koda
parents: 3626
diff changeset
    94
            self.view.transform = CGAffineTransformMakeRotation(degreesToRadian(90));
f1da1d8fb56c the game now respects the orientation of the frontend
koda
parents: 3626
diff changeset
    95
            break;
f1da1d8fb56c the game now respects the orientation of the frontend
koda
parents: 3626
diff changeset
    96
        case UIDeviceOrientationLandscapeRight:
f1da1d8fb56c the game now respects the orientation of the frontend
koda
parents: 3626
diff changeset
    97
            sdlView.transform = CGAffineTransformMakeRotation(degreesToRadian(180));
f1da1d8fb56c the game now respects the orientation of the frontend
koda
parents: 3626
diff changeset
    98
            self.view.transform = CGAffineTransformMakeRotation(degreesToRadian(-90));
f1da1d8fb56c the game now respects the orientation of the frontend
koda
parents: 3626
diff changeset
    99
            break;
f1da1d8fb56c the game now respects the orientation of the frontend
koda
parents: 3626
diff changeset
   100
    }
f1da1d8fb56c the game now respects the orientation of the frontend
koda
parents: 3626
diff changeset
   101
    CGRect rect = [[UIScreen mainScreen] bounds];
f1da1d8fb56c the game now respects the orientation of the frontend
koda
parents: 3626
diff changeset
   102
    self.view.frame = CGRectMake(0, 0, rect.size.width, rect.size.height);
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   103
    
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   104
    dimTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:6]
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   105
                                        interval:1000
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   106
                                          target:self
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   107
                                        selector:@selector(dimOverlay)
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   108
                                        userInfo:nil
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   109
                                         repeats:YES];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   110
    
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   111
    // add timer too runloop, otherwise it doesn't work
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   112
    [[NSRunLoop currentRunLoop] addTimer:dimTimer forMode:NSDefaultRunLoopMode];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   113
    
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   114
    [[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];   
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   115
    [[NSNotificationCenter defaultCenter] addObserver:self
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   116
                                             selector:@selector(didRotate:)
3598
a8aa06bae895 tiy new overlay graphics
koda
parents: 3551
diff changeset
   117
                                                 name:UIDeviceOrientationDidChangeNotification
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   118
                                               object:nil];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   119
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   120
    [UIView beginAnimations:@"showing overlay" context:NULL];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   121
    [UIView setAnimationDuration:1];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   122
    self.view.alpha = 1;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   123
    [UIView commitAnimations];
3647
0d0df215fb52 making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents: 3646
diff changeset
   124
    
0d0df215fb52 making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents: 3646
diff changeset
   125
    // find the sdl window we're on
0d0df215fb52 making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents: 3646
diff changeset
   126
    SDL_VideoDevice *_this = SDL_GetVideoDevice();
0d0df215fb52 making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents: 3646
diff changeset
   127
    SDL_VideoDisplay *display = &_this->displays[0];
0d0df215fb52 making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents: 3646
diff changeset
   128
    sdlwindow = display->windows;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   129
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   130
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   131
/* these are causing problems at reloading so let's remove 'em
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   132
-(void) viewDidUnload {
3617
1df21e06b8ba a couple of fixes i missed previously
koda
parents: 3599
diff changeset
   133
    [dimTimer invalidate];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   134
    self.popoverController = nil;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   135
    self.popupMenu = nil;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   136
    [super viewDidUnload];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   137
    MSG_DIDUNLOAD();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   138
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   139
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   140
-(void) didReceiveMemoryWarning {
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   141
    // Releases the view if it doesn't have a superview.
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   142
    [super didReceiveMemoryWarning];
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   143
    // Release any cached data, images, etc that aren't in use.
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   144
    if (popupMenu.view.superview == nil) 
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   145
        popupMenu = nil;
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   146
    MSG_MEMCLEAN();
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   147
}
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   148
*/
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   149
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   150
-(void) dealloc {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   151
    [popupMenu release];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   152
    [popoverController release];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   153
    // dimTimer is autoreleased
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   154
    [super dealloc];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   155
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   156
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   157
#pragma mark -
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   158
#pragma mark Overlay actions and members
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   159
// nice transition for dimming, should be called only by the timer himself
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   160
-(void) dimOverlay {
3629
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   161
    if (isGameRunning) {
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   162
        [UIView beginAnimations:@"overlay dim" context:NULL];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   163
        [UIView setAnimationDuration:0.6];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   164
        self.view.alpha = 0.2;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   165
        [UIView commitAnimations];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   166
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   167
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   168
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   169
// set the overlay visible and put off the timer for enough time
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   170
-(void) activateOverlay {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   171
    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
   172
    doNotDim();
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   173
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   174
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   175
// 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
   176
-(IBAction) buttonReleased:(id) sender {
3629
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   177
    if (!isGameRunning)
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   178
        return;
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   179
    
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   180
    UIButton *theButton = (UIButton *)sender;
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   181
    
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   182
    switch (theButton.tag) {
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   183
        case 0:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   184
        case 1:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   185
        case 2:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   186
        case 3:
3649
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   187
            [NSObject cancelPreviousPerformRequestsWithTarget:self
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   188
                                                     selector:@selector(unsetPreciseStatus)
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   189
                                                       object:nil];
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   190
            HW_walkingKeysUp();
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   191
            break;
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   192
        case 4:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   193
        case 5:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   194
        case 6:
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   195
            HW_otherKeysUp();
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   196
            break;
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   197
        default:
3660
bc125bea5849 complete settings page rework
koda
parents: 3651
diff changeset
   198
            DLog(@"Nope");
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   199
            break;
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   200
    }
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   201
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   202
    doDim();
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   203
}
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   204
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   205
// issue certain action based on the tag of the button 
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   206
-(IBAction) buttonPressed:(id) sender {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   207
    [self activateOverlay];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   208
    if (isPopoverVisible) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   209
        [self dismissPopover];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   210
    }
3629
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   211
    
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   212
    if (!isGameRunning)
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   213
        return;
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   214
    
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   215
    UIButton *theButton = (UIButton *)sender;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   216
    
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   217
    switch (theButton.tag) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   218
        case 0:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   219
            HW_walkLeft();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   220
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   221
        case 1:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   222
            HW_walkRight();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   223
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   224
        case 2:
3649
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   225
            [self performSelector:@selector(unsetPreciseStatus) withObject:nil afterDelay:0.8];
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   226
            HW_preciseSet(YES);
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   227
            HW_aimUp();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   228
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   229
        case 3:
3649
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   230
            [self performSelector:@selector(unsetPreciseStatus) withObject:nil afterDelay:0.8];
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   231
            HW_preciseSet(YES);
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   232
            HW_aimDown();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   233
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   234
        case 4:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   235
            HW_shoot();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   236
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   237
        case 5:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   238
            HW_jump();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   239
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   240
        case 6:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   241
            HW_backjump();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   242
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   243
        case 7:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   244
            HW_tab();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   245
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   246
        case 10:
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   247
            removeConfirmationInput();
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   248
            [self showPopover];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   249
            break;
3624
304c6d32383a button to open ammomenu
koda
parents: 3617
diff changeset
   250
        case 11:
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   251
            removeConfirmationInput();
3624
304c6d32383a button to open ammomenu
koda
parents: 3617
diff changeset
   252
            HW_ammoMenu();
304c6d32383a button to open ammomenu
koda
parents: 3617
diff changeset
   253
            break;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   254
        default:
3626
19f78afa0188 fix the multitouch shooting and moving
koda
parents: 3625
diff changeset
   255
            DLog(@"Nope");
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   256
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   257
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   258
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   259
3649
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   260
-(void) unsetPreciseStatus {
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   261
    HW_preciseSet(NO);
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   262
}
bc35f8fee587 aim now starts slow and then moves faster
koda
parents: 3648
diff changeset
   263
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   264
// present a further check before closing game
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   265
-(void) actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger) buttonIndex {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   266
    if ([actionSheet cancelButtonIndex] != buttonIndex)
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   267
        HW_terminate(NO);
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   268
    else
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   269
        HW_pause();     
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   270
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   271
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   272
// show up a popover containing a popupMenuViewController; we hook it with setPopoverContentSize
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   273
// on iphone instead just use the tableViewController directly (and implement manually all animations)
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   274
-(IBAction) showPopover{
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   275
    isPopoverVisible = YES;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   276
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   277
    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   278
        if (popupMenu == nil) 
3647
0d0df215fb52 making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents: 3646
diff changeset
   279
            popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStylePlain];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   280
        if (popoverController == nil) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   281
            popoverController = [[UIPopoverController alloc] initWithContentViewController:popupMenu];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   282
            [popoverController setPopoverContentSize:CGSizeMake(220, 170) animated:YES];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   283
            [popoverController setPassthroughViews:[NSArray arrayWithObject:self.view]];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   284
        }
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
   285
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
   286
        [popoverController presentPopoverFromRect:CGRectMake(1000, 0, 220, 32)
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   287
                                           inView:self.view
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   288
                         permittedArrowDirections:UIPopoverArrowDirectionUp
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   289
                                         animated:YES];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   290
    } else {
3648
2477029463ed some further chat polishing
koda
parents: 3647
diff changeset
   291
        if (popupMenu == nil)
3647
0d0df215fb52 making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents: 3646
diff changeset
   292
            popupMenu = [[InGameMenuViewController alloc] initWithStyle:UITableViewStyleGrouped];
3648
2477029463ed some further chat polishing
koda
parents: 3647
diff changeset
   293
        
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   294
        [self.view addSubview:popupMenu.view];
3648
2477029463ed some further chat polishing
koda
parents: 3647
diff changeset
   295
        [popupMenu present];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   296
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   297
    popupMenu.tableView.scrollEnabled = NO;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   298
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   299
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   300
// on ipad just dismiss it, on iphone transtion to the right
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   301
-(void) dismissPopover {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   302
    if (YES == isPopoverVisible) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   303
        isPopoverVisible = NO;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   304
        
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   305
        if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
3648
2477029463ed some further chat polishing
koda
parents: 3647
diff changeset
   306
            [(InGameMenuViewController *)popoverController.contentViewController removeChat];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   307
            [popoverController dismissPopoverAnimated:YES];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   308
        } else {
3648
2477029463ed some further chat polishing
koda
parents: 3647
diff changeset
   309
            [popupMenu dismiss];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   310
        }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   311
        [self buttonReleased:nil];
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   312
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   313
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   314
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   315
#pragma mark -
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   316
#pragma mark Custom touch event handling
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   317
-(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   318
    NSSet *allTouches = [event allTouches];
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   319
    UITouch *first, *second;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   320
    
3647
0d0df215fb52 making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents: 3646
diff changeset
   321
    // hide in-game menu
0d0df215fb52 making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents: 3646
diff changeset
   322
    if (isPopoverVisible)
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   323
        [self dismissPopover];
3647
0d0df215fb52 making chat work... (keyboard support is heavily broken in sdl upstream)
koda
parents: 3646
diff changeset
   324
    
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   325
    // reset default dimming
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   326
    doDim();
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   327
    
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   328
    switch ([allTouches count]) {
3651
7058ca178f3b switching hogs now works
koda
parents: 3650
diff changeset
   329
        case 1:       
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   330
            removeConfirmationInput();
3651
7058ca178f3b switching hogs now works
koda
parents: 3650
diff changeset
   331
            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
   332
            if (2 == [[[allTouches allObjects] objectAtIndex:0] tapCount])
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   333
                HW_zoomReset();
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   334
            break;
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   335
        case 2:                
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   336
            // pinching
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   337
            first = [[allTouches allObjects] objectAtIndex:0];
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   338
            second = [[allTouches allObjects] objectAtIndex:1];
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   339
            initialDistanceForPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]);
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   340
            break;
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   341
        default:
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   342
            break;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   343
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   344
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   345
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   346
    //if (currentPosition.y < screen.size.width - 130 || (currentPosition.x > 130 && currentPosition.x < screen.size.height - 130)) {
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   347
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   348
-(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
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
   349
    CGRect screen = [[UIScreen mainScreen] bounds];
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   350
    NSSet *allTouches = [event allTouches];
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   351
    CGPoint currentPosition = [[[allTouches allObjects] objectAtIndex:0] locationInView:self.view];
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   352
    
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   353
    switch ([allTouches count]) {
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   354
        case 1:
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   355
            // if we're in the menu we just click in the point
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   356
            if (HW_isAmmoOpen()) {
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   357
                HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y));
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   358
                // 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
   359
                HW_click();
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   360
            } else 
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   361
                // 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
   362
                if (HW_isWeaponRequiringClick()) {
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   363
                    // 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
   364
                    HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y));
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   365
                    
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   366
                    // draw the button at the last touched point (which is the current position)
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   367
                    UIButton *tapAgain = [UIButton buttonWithType:UIButtonTypeRoundedRect];
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   368
                    tapAgain.frame = CGRectMake(currentPosition.x - 90, currentPosition.y + 15, 180, 30);
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   369
                    tapAgain.tag = CONFIRMATION_TAG;
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   370
                    tapAgain.alpha = 0;
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   371
                    [tapAgain addTarget:self action:@selector(sendHWClick) forControlEvents:UIControlEventTouchUpInside];
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   372
                    [tapAgain setTitle:NSLocalizedString(@"Tap again to confirm",@"from the overlay") forState:UIControlStateNormal];
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   373
                    [self.view addSubview:tapAgain];
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   374
                    
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   375
                    // animation ftw!
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   376
                    [UIView beginAnimations:@"inserting button" context:NULL]; 
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   377
                    [UIView setAnimationDuration:ANIMATION_DURATION];
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   378
                    [self.view viewWithTag:CONFIRMATION_TAG].alpha = 1;
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   379
                    [UIView commitAnimations];
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   380
                    
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   381
                    // keep the overlay active, or the button will fade
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   382
                    [self activateOverlay];
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   383
                    doNotDim();
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   384
                } else
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   385
                    if (HW_isWeaponTimerable()) {
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   386
                        if (isSegmentVisible) {
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   387
                            UISegmentedControl *grenadeTime = (UISegmentedControl *)[self.view viewWithTag:GRENADE_TAG];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   388
                            
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   389
                            [UIView beginAnimations:@"removing segmented control" context:NULL];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   390
                            [UIView setAnimationDuration:ANIMATION_DURATION];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   391
                            [UIView setAnimationCurve:UIViewAnimationCurveEaseIn];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   392
                            grenadeTime.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width, 250, 50);
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   393
                            [UIView commitAnimations];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   394
                            
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   395
                            [grenadeTime performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:ANIMATION_DURATION];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   396
                        } else {
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   397
                            NSArray *items = [[NSArray alloc] initWithObjects:@"1",@"2",@"3",@"4",@"5",nil];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   398
                            UISegmentedControl *grenadeTime = [[UISegmentedControl alloc] initWithItems:items];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   399
                            [items release];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   400
                            
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   401
                            [grenadeTime addTarget:self action:@selector(setGrenadeTime:) forControlEvents:UIControlEventValueChanged];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   402
                            grenadeTime.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width, 250, 50);
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   403
                            grenadeTime.selectedSegmentIndex = 2;
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   404
                            grenadeTime.tag = GRENADE_TAG;
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   405
                            [self.view addSubview:grenadeTime];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   406
                            [grenadeTime release];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   407
                            
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   408
                            [UIView beginAnimations:@"inserting segmented control" context:NULL];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   409
                            [UIView setAnimationDuration:ANIMATION_DURATION];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   410
                            [UIView setAnimationCurve:UIViewAnimationCurveEaseIn];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   411
                            grenadeTime.frame = CGRectMake(screen.size.height / 2 - 125, screen.size.width - 100, 250, 50);
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   412
                            [UIView commitAnimations];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   413
                            
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   414
                            [self activateOverlay];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   415
                            doNotDim();
3661
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   416
                        } 
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   417
                        isSegmentVisible = !isSegmentVisible;
3661
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   418
                    } else
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   419
                        if (HW_isWeaponSwitch())
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   420
                            HW_tab();
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   421
            break;
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   422
        case 2:
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   423
            HW_allKeysUp();
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   424
            break;
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   425
        default:
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   426
            DLog(@"too many touches");
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   427
            break;
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   428
    }
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   429
    
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
   430
    initialDistanceForPinching = 0;
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   431
}
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   432
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   433
-(void) sendHWClick {
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   434
    HW_click();
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   435
    removeConfirmationInput();
3646
a3271158d93b don't make the confirmation button disappear, present an alert if game doesn't start
koda
parents: 3639
diff changeset
   436
    doDim();
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   437
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   438
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   439
-(void) setGrenadeTime:(id) sender {
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   440
    UISegmentedControl *theSegment = (UISegmentedControl *)sender;
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   441
    HW_setGrenadeTime(theSegment.selectedSegmentIndex + 1);
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   442
}
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   443
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   444
-(void) touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   445
    [self touchesEnded:touches withEvent:event];
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
-(void) touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
   449
    CGRect screen = [[UIScreen mainScreen] bounds];
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   450
    NSSet *allTouches = [event allTouches];
3661
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   451
    int x, y;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   452
    
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   453
    UITouch *touch, *first, *second;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   454
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   455
    switch ([allTouches count]) {
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
   456
        case 1:
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   457
            touch = [[allTouches allObjects] objectAtIndex:0];
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   458
            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
   459
3661
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   460
            if (HW_isAmmoOpen() || HW_isWeaponRequiringClick()) {
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   461
                // moves the cursor around
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
   462
                HW_setCursor(HWX(currentPosition.x), HWY(currentPosition.y));
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
   463
            } else {
3661
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   464
                // panning \o/
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   465
                HW_getCursor(&x, &y);
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   466
                x = x + currentPosition.x - startingPoint.x;
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   467
                y = y + currentPosition.y - startingPoint.y;
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   468
                HW_setCursor(x, y);
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   469
                
2378ada8a6ee i can haz panning
koda
parents: 3660
diff changeset
   470
                startingPoint = currentPosition;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   471
            }
3551
d4de36b3801a moar zoom, fixed fort mode, other glitches
koda
parents: 3547
diff changeset
   472
            break;
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   473
        case 2:
3638
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   474
            first = [[allTouches allObjects] objectAtIndex:0];
33ee433749ba touch overlay reworked, improvements to zoom and confirmation
koda
parents: 3637
diff changeset
   475
            second = [[allTouches allObjects] objectAtIndex:1];
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   476
            CGFloat currentDistanceOfPinching = distanceBetweenPoints([first locationInView:self.view], [second locationInView:self.view]);
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   477
            const int pinchDelta = 40;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   478
            
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   479
            if (0 != initialDistanceForPinching) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   480
                if (currentDistanceOfPinching - initialDistanceForPinching > pinchDelta) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   481
                    HW_zoomIn();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   482
                    initialDistanceForPinching = currentDistanceOfPinching;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   483
                }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   484
                else if (initialDistanceForPinching - currentDistanceOfPinching > pinchDelta) {
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   485
                    HW_zoomOut();
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   486
                    initialDistanceForPinching = currentDistanceOfPinching;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   487
                }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   488
            } else 
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   489
                initialDistanceForPinching = currentDistanceOfPinching;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   490
            
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   491
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   492
        default:
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   493
            break;
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   494
    }
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   495
}
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   496
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   497
#pragma mark -
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   498
#pragma mark Functions called by pascal
3629
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   499
// called from AddProgress and FinishProgress (respectively)
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   500
void startSpinning() {
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   501
    isGameRunning = NO;
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   502
    CGRect screen = [[UIScreen mainScreen] bounds];
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   503
    UIActivityIndicatorView *indicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhiteLarge];
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   504
    indicator.tag = 987654;
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   505
    indicator.center = CGPointMake(screen.size.width/2 - 118, screen.size.height/2);
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   506
    indicator.hidesWhenStopped = YES;
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   507
    [indicator startAnimating];
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   508
    [[[[UIApplication sharedApplication] keyWindow] viewWithTag:SDL_VIEW_TAG] addSubview:indicator];
3629
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   509
    [indicator release];
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   510
}
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   511
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   512
void stopSpinning() {
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   513
    UIActivityIndicatorView *indicator = (UIActivityIndicatorView *)[[[[UIApplication sharedApplication] keyWindow] viewWithTag:SDL_VIEW_TAG] viewWithTag:987654];
3629
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   514
    [indicator stopAnimating];
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   515
    isGameRunning = YES;
86212d2b116a redo spinning wheel, redo fix for detail selection, redo ammo quantity and name in ammomenu
koda
parents: 3628
diff changeset
   516
}
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   517
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   518
void clearView() {
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   519
    UIWindow *theWindow = [[UIApplication sharedApplication] keyWindow];
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   520
    UIButton *theButton = (UIButton *)[theWindow viewWithTag:CONFIRMATION_TAG];
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   521
    UISegmentedControl *theSegment = (UISegmentedControl *)[theWindow viewWithTag:GRENADE_TAG];
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   522
    
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   523
    [UIView beginAnimations:@"remove button" context:NULL];
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   524
    [UIView setAnimationDuration:ANIMATION_DURATION];
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   525
    theButton.alpha = 0;
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   526
    theSegment.alpha = 0;
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   527
    [UIView commitAnimations];
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   528
    
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   529
    [theWindow performSelector:@selector(removeFromSuperview) withObject:theButton afterDelay:0.3];
3650
ec90e573f47a add a timer selection for grenades
koda
parents: 3649
diff changeset
   530
    [theWindow performSelector:@selector(removeFromSuperview) withObject:theSegment afterDelay:0.3];    
3639
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   531
}
b5cdbcc89b61 use a button instead of label and simplify a lot touch interaction
koda
parents: 3638
diff changeset
   532
3547
02875b1145b7 i <3 mercurial
koda
parents: 3546
diff changeset
   533
@end