# HG changeset patch # User koda # Date 1283142836 -7200 # Node ID dd9345e74b66831c5d617c84f112011fdd719b92 # Parent 98072b3871c1f3e178cc7412ac876b69847a2bb3 help page for lobby diff -r 98072b3871c1 -r dd9345e74b66 project_files/HedgewarsMobile/Classes/GameConfigViewController.h --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.h Mon Aug 30 05:42:03 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.h Mon Aug 30 06:33:56 2010 +0200 @@ -11,10 +11,12 @@ @class TeamConfigViewController; @class SchemeWeaponConfigViewController; +@class HelpPageViewController; @interface GameConfigViewController : UIViewController { UIImage *hedgehogImage; UIView *imgContainer; + HelpPageViewController *helpPage; UIViewController *activeController; MapConfigViewController *mapConfigViewController; @@ -24,6 +26,7 @@ @property (nonatomic,retain) UIImage *hedgehogImage; @property (nonatomic,retain) UIView *imgContainer; +@property (nonatomic,retain) HelpPageViewController *helpPage; -(IBAction) buttonPressed:(id) sender; -(IBAction) segmentPressed:(id) sender; diff -r 98072b3871c1 -r dd9345e74b66 project_files/HedgewarsMobile/Classes/GameConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Mon Aug 30 05:42:03 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Mon Aug 30 06:33:56 2010 +0200 @@ -8,13 +8,14 @@ #import "GameConfigViewController.h" #import "SDL_uikitappdelegate.h" -#import "CommodityFunctions.h" #import "TeamConfigViewController.h" #import "SchemeWeaponConfigViewController.h" +#import "HelpPageViewController.h" +#import "CommodityFunctions.h" #import "UIImageExtra.h" @implementation GameConfigViewController -@synthesize hedgehogImage, imgContainer; +@synthesize hedgehogImage, imgContainer, helpPage; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { return rotationManager(interfaceOrientation); @@ -41,11 +42,19 @@ playSound(@"clickSound"); theButton.enabled = NO; [self startGame:theButton]; -// [self performSelector:@selector(startGame:) -// withObject:theButton -// afterDelay:0.25]; + break; + case 2: + playSound(@"clickSound"); + if (self.helpPage == nil) + self.helpPage = [[HelpPageViewController alloc] initWithNibName:@"HelpPageLobbyViewController" bundle:nil]; + self.helpPage.view.alpha = 0; + [self.view addSubview:helpPage.view]; + [UIView beginAnimations:@"helplobby" context:NULL]; + self.helpPage.view.alpha = 1; + [UIView commitAnimations]; break; default: + DLog(@"Nope"); break; } } diff -r 98072b3871c1 -r dd9345e74b66 project_files/HedgewarsMobile/Classes/HelpPageInGameViewController.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/HelpPageInGameViewController.xib Mon Aug 30 06:33:56 2010 +0200 @@ -0,0 +1,889 @@ + + + + 1024 + 10F569 + 788 + 1038.29 + 461.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 117 + + + YES + + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + YES + + + YES + + + + YES + + IBFilesOwner + IBIPadFramework + + + IBFirstResponder + IBIPadFramework + + + + 292 + + YES + + + 292 + {{0, -1}, {1024, 768}} + + NO + NO + IBIPadFramework + + NSImage + helpingame.png + + + + + 292 + {{79, 473}, {150, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Direction buttons + + Helvetica-Bold + 18 + 16 + + + 1 + MCAwIDAAA + + + 1 + 10 + + + + 292 + {{79, 491}, {203, 85}} + + NO + YES + 7 + NO + IBIPadFramework + With these buttons you can move your hog, aim and control certain weapons. + + Helvetica + 16 + 16 + + + + 1 + 10 + 0 + + + + 292 + {{53, 97}, {186, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Timer + + + + 1 + 10 + + + + 292 + {{53, 118}, {187, 43}} + + NO + YES + 7 + NO + IBIPadFramework + Don't let your turn time run out! + + + + 1 + 10 + 0 + + + + 292 + {{780, 248}, {240, 128}} + + NO + NO + IBIPadFramework + + NSImage + helpright.png + + + + + 292 + {{790, 256}, {109, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Ammo Menu + + + + 1 + 10 + + + + 292 + {{790, 282}, {214, 84}} + + NO + YES + 7 + NO + IBIPadFramework + This menu contains all the weapons you can use. Drag your finger on a weapon for more details on what it does! + + + + 1 + 10 + 0 + + + + 292 + {{780, 97}, {186, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Pause / Open ammos + + + + 1 + 10 + + + + 292 + {{782, 118}, {187, 43}} + + NO + YES + 7 + NO + IBIPadFramework + Tap to pause or open the ammo menu. + + + + 1 + 10 + 0 + + + + 292 + {{418, 73}, {186, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Wind bar + + + + 1 + 10 + + + + 292 + {{418, 89}, {191, 63}} + + NO + YES + 7 + NO + IBIPadFramework + Some weapons are affected by the wind and their direction may shift. + + + + 1 + 10 + 0 + + + + 292 + {{447, 573}, {203, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Teams flags and health + + + + 1 + 10 + + + + 292 + {{447, 592}, {203, 85}} + + NO + YES + 7 + NO + IBIPadFramework + These bars report the team name, the team flags and the global health status of every hog. + + + + 1 + 10 + 4 + + + + 292 + {{741, 501}, {135, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Joypad buttons + + + + 1 + 10 + + + + 292 + {{741, 520}, {211, 85}} + + NO + YES + 7 + NO + IBIPadFramework + Press X to jump forward, Y to jump backwards (double tap to jump twice) and Missile to attack or use items. + + + + 1 + 10 + 0 + + + + 292 + {{67, 238}, {240, 128}} + + NO + NO + IBIPadFramework + + NSImage + helpplain.png + + + + + 292 + {{72, 246}, {229, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Tap to return to game + + + + 1 + 10 + 1 + + + + 292 + {{72, 268}, {229, 87}} + + NO + YES + 7 + NO + IBIPadFramework + Pan to move camera, pinch to zoom, double tap to center hog, and a single touch to interact with weapons and much more! + + + + 1 + 10 + 0 + + + {1024, 768} + + + 3 + MCAwLjQAA + + NO + NO + + 3 + + IBIPadFramework + + + + + YES + + + view + + + + 3 + + + + dismiss + + + 7 + + 16 + + + + + YES + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 2 + + + YES + + + + + + + + + + + + + + + + + + + + + + + + 5 + + + + + 6 + + + + + 7 + + + + + 8 + + + + + 9 + + + + + 10 + + + + + 11 + + + + + 12 + + + + + 13 + + + + + 14 + + + + + 17 + + + + + 18 + + + + + 21 + + + + + 22 + + + + + 23 + + + + + 24 + + + + + 25 + + + + + 26 + + + + + 27 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 10.IBPluginDependency + 11.IBPluginDependency + 12.IBPluginDependency + 13.IBPluginDependency + 14.IBPluginDependency + 17.IBPluginDependency + 18.IBPluginDependency + 2.CustomClassName + 2.IBEditorWindowLastContentRect + 2.IBPluginDependency + 21.IBPluginDependency + 22.IBPluginDependency + 23.IBPluginDependency + 24.IBPluginDependency + 25.IBPluginDependency + 26.IBPluginDependency + 27.IBPluginDependency + 5.IBPluginDependency + 6.IBPluginDependency + 7.IBPluginDependency + 8.IBPluginDependency + 9.IBPluginDependency + + + YES + HelpPageViewController + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIControl + {{288, 355}, {1024, 768}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + + YES + + + + + YES + + + YES + + + + 27 + + + + YES + + HelpPageViewController + UIViewController + + dismiss + id + + + dismiss + + dismiss + id + + + + IBProjectSource + Classes/HelpPageViewController.h + + + + + YES + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CAAnimation.h + + + + NSObject + + IBFrameworkSource + QuartzCore.framework/Headers/CALayer.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIAccessibility.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UINibLoading.h + + + + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + + + + UIControl + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIControl.h + + + + UIImageView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIImageView.h + + + + UILabel + UIView + + IBFrameworkSource + UIKit.framework/Headers/UILabel.h + + + + UIResponder + NSObject + + + + UISearchBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UISearchBar.h + + + + UISearchDisplayController + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UISearchDisplayController.h + + + + UIView + + IBFrameworkSource + UIKit.framework/Headers/UITextField.h + + + + UIView + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIView.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UINavigationController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UIPopoverController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UISplitViewController.h + + + + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UITabBarController.h + + + + UIViewController + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIViewController.h + + + + + 0 + IBIPadFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + ../Hedgewars.xcodeproj + 3 + + YES + + YES + helpingame.png + helpplain.png + helpright.png + + + YES + {1024, 768} + {296, 138} + {308, 144} + + + 117 + + diff -r 98072b3871c1 -r dd9345e74b66 project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.xib --- a/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.xib Mon Aug 30 05:42:03 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.xib Mon Aug 30 06:33:56 2010 +0200 @@ -42,30 +42,30 @@ 292 YES - + 292 - {{0, -1}, {1024, 768}} + {{742, 362}, {240, 102}} NO NO IBIPadFramework - + NSImage - helpingame.png + helpabove.png - + 292 - {{79, 473}, {150, 22}} + {{753, 381}, {109, 22}} NO YES 7 NO IBIPadFramework - Direction buttons + Map theme Helvetica-Bold 18 @@ -79,17 +79,17 @@ 1 10 - + 292 - {{79, 491}, {203, 85}} + {{753, 398}, {218, 66}} NO YES 7 NO IBIPadFramework - With these buttons you can move your hog, aim and control certain weapons. + Here you can choose how your map will appear in game. Helvetica 16 @@ -101,34 +101,44 @@ 10 0 - + 292 - {{53, 97}, {186, 22}} + {{653, 202}, {240, 109}} + + NO + NO + IBIPadFramework + + + + + 292 + {{664, 218}, {109, 22}} NO YES 7 NO IBIPadFramework - Timer + Map type 1 10 - + 292 - {{53, 118}, {187, 43}} + {{664, 238}, {218, 66}} NO YES 7 NO IBIPadFramework - Don't let your turn time run out! + Choose between a static map or a randomly generated one (might require more time). @@ -139,7 +149,7 @@ 292 - {{780, 248}, {240, 128}} + {{494, 20}, {240, 105}} NO NO @@ -152,14 +162,14 @@ 292 - {{790, 256}, {109, 22}} + {{502, 25}, {109, 22}} NO YES 7 NO IBIPadFramework - Ammo Menu + Map preview @@ -169,14 +179,14 @@ 292 - {{790, 282}, {214, 84}} + {{502, 46}, {218, 65}} NO YES 7 NO IBIPadFramework - This menu contains all the weapons you can use. Drag your finger on a weapon for more details on what it does! + This is a small preview of your next map. Tap to select / generate a new map. @@ -184,34 +194,92 @@ 10 0 - + + + 292 + {{393, 399}, {240, 128}} + + NO + NO + IBIPadFramework + + + 292 - {{780, 97}, {186, 22}} + {{403, 417}, {109, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Teams + + + + 1 + 10 + + + + 292 + {{400, 427}, {232, 100}} NO YES 7 NO IBIPadFramework - Pause / Open ammos + Select which teams are playing! You can set the number of hogs and have multiple teams play together. + + + + 1 + 10 + 0 + + + + 292 + {{142, 125}, {240, 104}} + + NO + NO + IBIPadFramework + + NSImage + helpleft.png + + + + + 292 + {{162, 133}, {204, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Schemes and Weapons 1 10 - + 292 - {{782, 118}, {187, 43}} + {{162, 152}, {210, 71}} NO YES 7 NO IBIPadFramework - Tap to pause or open the ammo menu. + Here you can choose which rules and which weapon set will be applied in game. @@ -219,34 +287,79 @@ 10 0 - + 292 - {{418, 73}, {186, 22}} + {{164, 8}, {278, 50}} + + NO + NO + IBIPadFramework + + + + + 292 + {{186, 6}, {248, 54}} NO YES 7 NO IBIPadFramework - Wind bar + Did you know you can customize almost everything in the settings page? + + Helvetica-Oblique + 14 + 16 + + + + 1 + 10 + 0 + + + + 292 + {{686, 583}, {240, 117}} + + NO + NO + IBIPadFramework + + NSImage + helpbottom.png + + + + + 292 + {{697, 592}, {138, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Max hedgehogs 1 10 - + 292 - {{418, 89}, {191, 63}} + {{697, 609}, {218, 73}} NO YES 7 NO IBIPadFramework - Some weapons are affected by the wind and their direction may shift. + This number is the maximum size for all the hogs playing (in every team). @@ -254,69 +367,44 @@ 10 0 - + 292 - {{447, 573}, {203, 22}} + {{20, 587}, {240, 109}} NO - YES - 7 NO IBIPadFramework - Teams flags and health - - - - 1 - 10 + - + 292 - {{447, 592}, {203, 85}} + {{30, 592}, {138, 22}} NO YES 7 NO IBIPadFramework - These bars report the team name, the team flags and the global health status of every hog. - + Size slider + 1 10 - 4 - + 292 - {{741, 501}, {135, 22}} + {{30, 608}, {218, 73}} NO YES 7 NO IBIPadFramework - Joypad buttons - - - - 1 - 10 - - - - 292 - {{741, 520}, {211, 85}} - - NO - YES - 7 - NO - IBIPadFramework - Press X to jump forward, Y to jump backwards (double tap to jump twice) and Missile to attack or use items. + For Random and Maze maps you can decide to generate only maps of a certain size. @@ -327,7 +415,7 @@ 292 - {{67, 238}, {240, 128}} + {{45, 318}, {240, 128}} NO NO @@ -340,14 +428,14 @@ 292 - {{72, 246}, {229, 22}} + {{50, 326}, {229, 22}} NO YES 7 NO IBIPadFramework - Tap to return to game + Tap anywhere to dismiss @@ -358,14 +446,59 @@ 292 - {{72, 268}, {229, 87}} + {{52, 348}, {224, 87}} NO YES 7 NO IBIPadFramework - Pan to move camera, pinch to zoom, double tap to center hog, and a single touch to interact with weapons and much more! + Still confused? Don't worry, it's really simple! Try a couple of games and everything will become clear to you. + + + + 1 + 10 + 0 + + + + 292 + {{344, 635}, {240, 61}} + + NO + NO + IBIPadFramework + + + + + 292 + {{353, 637}, {138, 22}} + + NO + YES + 7 + NO + IBIPadFramework + Start button + + + + 1 + 10 + + + + 292 + {{354, 650}, {218, 46}} + + NO + YES + 7 + NO + IBIPadFramework + This button starts the game. @@ -434,34 +567,39 @@ YES - - - - - - - - - - - + + + + + + + + + + + + - - - + + + + + + + + + + + + - 5 - - - - 6 @@ -477,66 +615,6 @@ - 9 - - - - - 10 - - - - - 11 - - - - - 12 - - - - - 13 - - - - - 14 - - - - - 17 - - - - - 18 - - - - - 21 - - - - - 22 - - - - - 23 - - - - - 24 - - - - 25 @@ -551,6 +629,121 @@ + + 28 + + + + + 29 + + + + + 30 + + + + + 34 + + + + + 35 + + + + + 36 + + + + + 37 + + + + + 38 + + + + + 39 + + + + + 40 + + + + + 41 + + + + + 42 + + + + + 43 + + + + + 44 + + + + + 45 + + + + + 49 + + + + + 50 + + + + + 51 + + + + + 52 + + + + + 53 + + + + + 54 + + + + + 58 + + + + + 59 + + + @@ -559,33 +752,45 @@ YES -1.CustomClassName -2.CustomClassName - 10.IBPluginDependency - 11.IBPluginDependency - 12.IBPluginDependency - 13.IBPluginDependency - 14.IBPluginDependency - 17.IBPluginDependency - 18.IBPluginDependency 2.CustomClassName 2.IBEditorWindowLastContentRect 2.IBPluginDependency - 21.IBPluginDependency - 22.IBPluginDependency - 23.IBPluginDependency - 24.IBPluginDependency 25.IBPluginDependency 26.IBPluginDependency 27.IBPluginDependency - 5.IBPluginDependency + 28.IBPluginDependency + 29.IBPluginDependency + 30.IBPluginDependency + 34.IBPluginDependency + 35.IBPluginDependency + 36.IBPluginDependency + 37.IBPluginDependency + 38.IBPluginDependency + 39.IBPluginDependency + 40.IBPluginDependency + 41.IBPluginDependency + 42.IBPluginDependency + 43.IBPluginDependency + 44.IBPluginDependency + 45.IBPluginDependency + 49.IBPluginDependency + 50.IBPluginDependency + 51.IBPluginDependency + 52.IBPluginDependency + 53.IBPluginDependency + 54.IBPluginDependency + 58.IBPluginDependency + 59.IBPluginDependency 6.IBPluginDependency 7.IBPluginDependency 8.IBPluginDependency - 9.IBPluginDependency YES - HelpPageLobbyViewController + HelpPageViewController UIResponder + UIControl + {{273, 67}, {1024, 768}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -593,8 +798,16 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIControl - {{288, 156}, {1024, 768}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -626,13 +839,13 @@ - 27 + 59 YES - HelpPageLobbyViewController + HelpPageViewController UIViewController dismiss @@ -647,7 +860,7 @@ IBProjectSource - Classes/HelpPageLobbyViewController.h + Classes/HelpPageViewController.h @@ -873,13 +1086,17 @@ YES YES - helpingame.png + helpabove.png + helpbottom.png + helpleft.png helpplain.png helpright.png YES - {1024, 768} + {295, 156} + {295, 156} + {308, 144} {296, 138} {308, 144} diff -r 98072b3871c1 -r dd9345e74b66 project_files/HedgewarsMobile/Classes/HelpPageViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/HelpPageViewController.h Mon Aug 30 06:33:56 2010 +0200 @@ -0,0 +1,18 @@ +// +// HelpPageLobbyViewController.h +// Hedgewars +// +// Created by Vittorio on 30/08/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import + + +@interface HelpPageViewController : UIViewController { + +} + +-(IBAction) dismiss; + +@end diff -r 98072b3871c1 -r dd9345e74b66 project_files/HedgewarsMobile/Classes/HelpPageViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/HelpPageViewController.m Mon Aug 30 06:33:56 2010 +0200 @@ -0,0 +1,42 @@ + // +// HelpPageLobbyViewController.m +// Hedgewars +// +// Created by Vittorio on 30/08/10. +// Copyright 2010 __MyCompanyName__. All rights reserved. +// + +#import "HelpPageViewController.h" +#import "CommodityFunctions.h" + +@implementation HelpPageViewController + + +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { + return rotationManager(interfaceOrientation); +} + +-(void) didReceiveMemoryWarning { + // Releases the view if it doesn't have a superview. + [super didReceiveMemoryWarning]; + // Release any cached data, images, etc that aren't in use. +} + +-(void) viewDidUnload { + [super viewDidUnload]; + // Release any retained subviews of the main view. + // e.g. self.myOutlet = nil; +} + +-(void) dealloc { + [super dealloc]; +} + +-(IBAction) dismiss { + [UIView beginAnimations:@"helpingame" context:NULL]; + self.view.alpha = 0; + [UIView commitAnimations]; + [self.view performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:1]; +} + +@end diff -r 98072b3871c1 -r dd9345e74b66 project_files/HedgewarsMobile/Classes/MapConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Mon Aug 30 05:42:03 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController.m Mon Aug 30 06:33:56 2010 +0200 @@ -301,9 +301,8 @@ if (cell == nil) cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease]; - if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { + if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) cell.textLabel.textColor = UICOLOR_HW_YELLOW_TEXT; - } if (self.segmentedControl.selectedSegmentIndex != 1) { // the % prevents a strange bug that occurs sporadically @@ -548,7 +547,7 @@ self.mapGenCommand = @"e$mapgen 0"; self.staticMapCommand = @""; - self.lastIndexPath = [NSIndexPath indexPathForRow:0 inSection:0]; + self.lastIndexPath = [NSIndexPath indexPathForRow:-1 inSection:0]; oldValue = 5; oldPage = 0; diff -r 98072b3871c1 -r dd9345e74b66 project_files/HedgewarsMobile/Classes/OverlayViewController.h --- a/project_files/HedgewarsMobile/Classes/OverlayViewController.h Mon Aug 30 05:42:03 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.h Mon Aug 30 06:33:56 2010 +0200 @@ -10,7 +10,7 @@ #import "SDL_sysvideo.h" @class InGameMenuViewController; -@class HelpPageLobbyViewController; +@class HelpPageViewController; @interface OverlayViewController : UIViewController { // the timer that dims the overlay @@ -22,7 +22,7 @@ BOOL isPopoverVisible; // the help menu - HelpPageLobbyViewController *helpPage; + HelpPageViewController *helpPage; // ths touch section CGFloat initialDistanceForPinching; @@ -36,7 +36,7 @@ @property (nonatomic,retain) id popoverController; @property (nonatomic,retain) InGameMenuViewController *popupMenu; -@property (nonatomic,retain) HelpPageLobbyViewController *helpPage; +@property (nonatomic,retain) HelpPageViewController *helpPage; -(void) touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event; -(void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event; diff -r 98072b3871c1 -r dd9345e74b66 project_files/HedgewarsMobile/Classes/OverlayViewController.m --- a/project_files/HedgewarsMobile/Classes/OverlayViewController.m Mon Aug 30 05:42:03 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/OverlayViewController.m Mon Aug 30 06:33:56 2010 +0200 @@ -9,7 +9,7 @@ #import "OverlayViewController.h" #import "SDL_uikitappdelegate.h" #import "InGameMenuViewController.h" -#import "HelpPageLobbyViewController.h" +#import "HelpPageViewController.h" #import "PascalImports.h" #import "CommodityFunctions.h" #import "CGPointUtils.h" @@ -145,7 +145,7 @@ -(void) showHelp:(id) sender { if (self.helpPage == nil) - self.helpPage = [[HelpPageLobbyViewController alloc] initWithNibName:@"HelpPageLobbyViewController" bundle:nil]; + self.helpPage = [[HelpPageViewController alloc] initWithNibName:@"HelpPageInGameViewController" bundle:nil]; self.helpPage.view.alpha = 0; [self.view addSubview:helpPage.view]; [UIView beginAnimations:@"helpingame" context:NULL]; diff -r 98072b3871c1 -r dd9345e74b66 project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Mon Aug 30 05:42:03 2010 +0200 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Mon Aug 30 06:33:56 2010 +0200 @@ -34,7 +34,7 @@ 611EE9D9122AA10A00DF6938 /* backSound.wav in Resources */ = {isa = PBXBuildFile; fileRef = 611EE9D7122AA10A00DF6938 /* backSound.wav */; }; 611EE9DA122AA10A00DF6938 /* selSound.wav in Resources */ = {isa = PBXBuildFile; fileRef = 611EE9D8122AA10A00DF6938 /* selSound.wav */; }; 611EEA7E122B09C200DF6938 /* background_small.png in Resources */ = {isa = PBXBuildFile; fileRef = 611EEA7D122B09C200DF6938 /* background_small.png */; }; - 611EEAEE122B2A4D00DF6938 /* HelpPageLobbyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 611EEAEC122B2A4D00DF6938 /* HelpPageLobbyViewController.m */; }; + 611EEAEE122B2A4D00DF6938 /* HelpPageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 611EEAEC122B2A4D00DF6938 /* HelpPageViewController.m */; }; 611EEAEF122B2A4D00DF6938 /* HelpPageLobbyViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 611EEAED122B2A4D00DF6938 /* HelpPageLobbyViewController.xib */; }; 611EEBC1122B34A800DF6938 /* helpingame.png in Resources */ = {isa = PBXBuildFile; fileRef = 611EEBC0122B34A800DF6938 /* helpingame.png */; }; 611EEBC4122B355700DF6938 /* helpbottom.png in Resources */ = {isa = PBXBuildFile; fileRef = 611EEBC2122B355700DF6938 /* helpbottom.png */; }; @@ -122,6 +122,9 @@ 61799289114AE08700BA94A9 /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 61798A5E114AE08600BA94A9 /* Data */; }; 6183D83E11E2BCE200A88903 /* LI-ipad-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 6183D83C11E2BCE200A88903 /* LI-ipad-Landscape.png */; }; 6183D83F11E2BCE200A88903 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 6183D83D11E2BCE200A88903 /* Default.png */; }; + 61842B24122B619D0096E335 /* HelpPageInGameViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61842B23122B619D0096E335 /* HelpPageInGameViewController.xib */; }; + 61842B3E122B65BD0096E335 /* helpabove.png in Resources */ = {isa = PBXBuildFile; fileRef = 61842B3D122B65BD0096E335 /* helpabove.png */; }; + 61842B40122B66280096E335 /* helpleft.png in Resources */ = {isa = PBXBuildFile; fileRef = 61842B3F122B66280096E335 /* helpleft.png */; }; 6187AEBD120781B900B31A27 /* Settings in Resources */ = {isa = PBXBuildFile; fileRef = 6187AEA5120781B900B31A27 /* Settings */; }; 61A1188511683A8C00359010 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61A117FE1168322700359010 /* CoreGraphics.framework */; settings = {ATTRIBUTES = (Required, ); }; }; 61A118D311683CD100359010 /* HedgewarsTitle.png in Resources */ = {isa = PBXBuildFile; fileRef = 611FD9CB1155A28C00C2203D /* HedgewarsTitle.png */; }; @@ -693,8 +696,8 @@ 611EE9D7122AA10A00DF6938 /* backSound.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = backSound.wav; path = Resources/backSound.wav; sourceTree = ""; }; 611EE9D8122AA10A00DF6938 /* selSound.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = selSound.wav; path = Resources/selSound.wav; sourceTree = ""; }; 611EEA7D122B09C200DF6938 /* background_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = background_small.png; path = Resources/Overlay/background_small.png; sourceTree = ""; }; - 611EEAEB122B2A4D00DF6938 /* HelpPageLobbyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelpPageLobbyViewController.h; sourceTree = ""; }; - 611EEAEC122B2A4D00DF6938 /* HelpPageLobbyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelpPageLobbyViewController.m; sourceTree = ""; }; + 611EEAEB122B2A4D00DF6938 /* HelpPageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelpPageViewController.h; sourceTree = ""; }; + 611EEAEC122B2A4D00DF6938 /* HelpPageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelpPageViewController.m; sourceTree = ""; }; 611EEAED122B2A4D00DF6938 /* HelpPageLobbyViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HelpPageLobbyViewController.xib; sourceTree = ""; }; 611EEBC0122B34A800DF6938 /* helpingame.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpingame.png; path = Resources/Overlay/helpingame.png; sourceTree = ""; }; 611EEBC2122B355700DF6938 /* helpbottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpbottom.png; path = Resources/Overlay/helpbottom.png; sourceTree = ""; }; @@ -821,6 +824,9 @@ 61798A5E114AE08600BA94A9 /* Data */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Data; sourceTree = ""; }; 6183D83C11E2BCE200A88903 /* LI-ipad-Landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "LI-ipad-Landscape.png"; path = "Resources/Icons/LI-ipad-Landscape.png"; sourceTree = ""; }; 6183D83D11E2BCE200A88903 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Resources/Icons/Default.png; sourceTree = ""; }; + 61842B23122B619D0096E335 /* HelpPageInGameViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HelpPageInGameViewController.xib; sourceTree = ""; }; + 61842B3D122B65BD0096E335 /* helpabove.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpabove.png; path = Resources/Overlay/helpabove.png; sourceTree = ""; }; + 61842B3F122B66280096E335 /* helpleft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = helpleft.png; path = Resources/Overlay/helpleft.png; sourceTree = ""; }; 618736B8118CA28600123B23 /* GearDrawing.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = GearDrawing.inc; path = ../../hedgewars/GearDrawing.inc; sourceTree = SOURCE_ROOT; }; 6187AEA5120781B900B31A27 /* Settings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Settings; path = Resources/Settings; sourceTree = ""; }; 619C09E911E8B8D600F1DF16 /* title_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = title_small.png; path = "Resources/Frontend-iPhone/title_small.png"; sourceTree = ""; }; @@ -964,7 +970,9 @@ 611EEBC0122B34A800DF6938 /* helpingame.png */, 611EEC30122B54D700DF6938 /* helpplain.png */, 611EEBC2122B355700DF6938 /* helpbottom.png */, + 61842B3D122B65BD0096E335 /* helpabove.png */, 611EEBC3122B355700DF6938 /* helpright.png */, + 61842B3F122B66280096E335 /* helpleft.png */, 6129B9F611EFB04D0017E305 /* denied.png */, 61F2E7EB12060E31005734F7 /* checkbox.png */, 611EE973122A9C4100DF6938 /* clickSound.wav */, @@ -1186,9 +1194,10 @@ 61F2E7CB1205EDE0005734F7 /* AboutViewController.h */, 61F2E7CC1205EDE0005734F7 /* AboutViewController.m */, 61F2E7CD1205EDE0005734F7 /* AboutViewController.xib */, - 611EEAEB122B2A4D00DF6938 /* HelpPageLobbyViewController.h */, - 611EEAEC122B2A4D00DF6938 /* HelpPageLobbyViewController.m */, + 611EEAEB122B2A4D00DF6938 /* HelpPageViewController.h */, + 611EEAEC122B2A4D00DF6938 /* HelpPageViewController.m */, 611EEAED122B2A4D00DF6938 /* HelpPageLobbyViewController.xib */, + 61842B23122B619D0096E335 /* HelpPageInGameViewController.xib */, ); name = Overlay; sourceTree = ""; @@ -1998,6 +2007,9 @@ 611EEBC4122B355700DF6938 /* helpbottom.png in Resources */, 611EEBC5122B355700DF6938 /* helpright.png in Resources */, 611EEC31122B54D700DF6938 /* helpplain.png in Resources */, + 61842B24122B619D0096E335 /* HelpPageInGameViewController.xib in Resources */, + 61842B3E122B65BD0096E335 /* helpabove.png in Resources */, + 61842B40122B66280096E335 /* helpleft.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2122,7 +2134,7 @@ 61B3D71C11EA6F2700EC7420 /* uKeys.pas in Sources */, 61C079E411F35A300072BF46 /* EditableCellView.m in Sources */, 61F2E7CE1205EDE0005734F7 /* AboutViewController.m in Sources */, - 611EEAEE122B2A4D00DF6938 /* HelpPageLobbyViewController.m in Sources */, + 611EEAEE122B2A4D00DF6938 /* HelpPageViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff -r 98072b3871c1 -r dd9345e74b66 project_files/HedgewarsMobile/Resources/Overlay/helpabove.png Binary file project_files/HedgewarsMobile/Resources/Overlay/helpabove.png has changed diff -r 98072b3871c1 -r dd9345e74b66 project_files/HedgewarsMobile/Resources/Overlay/helpleft.png Binary file project_files/HedgewarsMobile/Resources/Overlay/helpleft.png has changed