# HG changeset patch
# User koda
# Date 1291931416 -3600
# Node ID e83216eba1dbcc6a1fe748feeb8320234379d787
# Parent 2c8e4d859d379718d56f84fcd4953f19694e6530
forgot to update these files
diff -r 2c8e4d859d37 -r e83216eba1db project_files/HedgewarsMobile/Classes/CreationChamber.m
--- a/project_files/HedgewarsMobile/Classes/CreationChamber.m Wed Dec 08 17:48:33 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/CreationChamber.m Thu Dec 09 22:50:16 2010 +0100
@@ -148,6 +148,7 @@
NSMutableArray *basicArray = [[NSMutableArray alloc] initWithObjects:
[NSNumber numberWithInt:100], //initialhealth
[NSNumber numberWithInt:45], //turntime
+ [NSNumber numberWithInt:3], //minestime
[NSNumber numberWithInt:100], //damagemodifier
[NSNumber numberWithInt:15], //suddendeathtimeout
[NSNumber numberWithInt:47], //waterrise
@@ -156,7 +157,6 @@
[NSNumber numberWithInt:5], //cratedrops
[NSNumber numberWithInt:35], //healthprob
[NSNumber numberWithInt:25], //healthamount
- [NSNumber numberWithInt:3], //minestime
[NSNumber numberWithInt:4], //minesnumber
[NSNumber numberWithInt:0], //dudmines
[NSNumber numberWithInt:2], //explosives
diff -r 2c8e4d859d37 -r e83216eba1db project_files/HedgewarsMobile/Classes/GameSetup.m
--- a/project_files/HedgewarsMobile/Classes/GameSetup.m Wed Dec 08 17:48:33 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/GameSetup.m Thu Dec 09 22:50:16 2010 +0100
@@ -165,7 +165,6 @@
[schemePath release];
NSArray *basicArray = [schemeDictionary objectForKey:@"basic"];
NSArray *gamemodArray = [schemeDictionary objectForKey:@"gamemod"];
- int i = 0;
int result = 0;
int mask = 0x00000004;
@@ -184,22 +183,23 @@
NSArray *mods = [[NSArray alloc] initWithContentsOfFile:path];
[path release];
+ int i = 0;
// initial health
- result = [[basicArray objectAtIndex:0] intValue];
+ result = [[basicArray objectAtIndex:i++] intValue];
// turn time
- NSInteger tentativeTurntime = [[basicArray objectAtIndex:1] intValue];
+ NSInteger tentativeTurntime = [[basicArray objectAtIndex:i++] intValue];
if (tentativeTurntime >= 100)
tentativeTurntime = 9999;
NSString *turnTime = [[NSString alloc] initWithFormat:@"e$turntime %d",tentativeTurntime * 1000];
[self sendToEngine:turnTime];
[turnTime release];
- NSString *minesTime = [[NSString alloc] initWithFormat:@"e$turntime %d",[[basicArray objectAtIndex:2] intValue] * 1000];
+ NSString *minesTime = [[NSString alloc] initWithFormat:@"e$turntime %d",[[basicArray objectAtIndex:i++] intValue] * 1000];
[self sendToEngine:minesTime];
[minesTime release];
- for (i = 2; i < [basicArray count]; i++) {
+ for (; i < [basicArray count]; i++) {
NSDictionary *basicDict = [mods objectAtIndex:i];
NSString *command = [basicDict objectForKey:@"command"];
NSInteger value = [[basicArray objectAtIndex:i] intValue];
diff -r 2c8e4d859d37 -r e83216eba1db project_files/HedgewarsMobile/Classes/ObjcExports.m
--- a/project_files/HedgewarsMobile/Classes/ObjcExports.m Wed Dec 08 17:48:33 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/ObjcExports.m Thu Dec 09 22:50:16 2010 +0100
@@ -171,14 +171,14 @@
Float32 volume;
OSStatus n = AudioSessionGetProperty(kAudioSessionProperty_CurrentHardwareOutputVolume, &propertySize, &volume);
if (n != 0)
- DLog( @"AudioSessionGetProperty: %d", n );
+ DLog( @"AudioSessionGetProperty 'volume': %d", n );
BOOL volumeResult = (volume == 0.0);
// this checks if the device is muted
CFStringRef state;
n = AudioSessionGetProperty(kAudioSessionProperty_AudioRoute, &propertySize, &state);
if (n != 0)
- DLog( @"AudioSessionGetProperty: %d", n );
+ DLog( @"AudioSessionGetProperty 'audioRoute': %d", n );
NSString *result = (NSString *)state;
BOOL muteResult = ([result length] == 0);
releaseAndNil(result);
diff -r 2c8e4d859d37 -r e83216eba1db project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist Wed Dec 08 17:48:33 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist Thu Dec 09 22:50:16 2010 +0100
@@ -6,6 +6,7 @@
100
30
+ 0
100
15
47
@@ -16,7 +17,6 @@
25
0
0
- 0
40
gamemod
diff -r 2c8e4d859d37 -r e83216eba1db project_files/HedgewarsMobile/Resources/Settings/Schemes/Clean Slate.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Clean Slate.plist Wed Dec 08 17:48:33 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Clean Slate.plist Thu Dec 09 22:50:16 2010 +0100
@@ -6,6 +6,7 @@
100
45
+ 3
100
15
47
@@ -14,7 +15,6 @@
5
35
25
- 3
4
0
2
diff -r 2c8e4d859d37 -r e83216eba1db project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist Wed Dec 08 17:48:33 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist Thu Dec 09 22:50:16 2010 +0100
@@ -6,6 +6,7 @@
100
45
+ 3
100
15
47
@@ -14,7 +15,6 @@
5
35
25
- 3
4
0
2
diff -r 2c8e4d859d37 -r e83216eba1db project_files/HedgewarsMobile/Resources/Settings/Schemes/Fort Mode.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Fort Mode.plist Wed Dec 08 17:48:33 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Fort Mode.plist Thu Dec 09 22:50:16 2010 +0100
@@ -6,6 +6,7 @@
100
45
+ 3
100
15
47
@@ -14,7 +15,6 @@
5
35
25
- 3
0
0
0
diff -r 2c8e4d859d37 -r e83216eba1db project_files/HedgewarsMobile/Resources/Settings/Schemes/King Mode.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/King Mode.plist Wed Dec 08 17:48:33 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/King Mode.plist Thu Dec 09 22:50:16 2010 +0100
@@ -6,6 +6,7 @@
100
45
+ 3
100
15
47
@@ -14,7 +15,6 @@
5
35
25
- 3
4
0
2
diff -r 2c8e4d859d37 -r e83216eba1db project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist Wed Dec 08 17:48:33 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist Thu Dec 09 22:50:16 2010 +0100
@@ -6,6 +6,7 @@
50
30
+ 0
150
15
47
@@ -14,7 +15,6 @@
0
35
25
- 0
80
0
0
diff -r 2c8e4d859d37 -r e83216eba1db project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist Wed Dec 08 17:48:33 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist Thu Dec 09 22:50:16 2010 +0100
@@ -6,6 +6,7 @@
100
15
+ 3
100
15
47
@@ -14,7 +15,6 @@
0
35
25
- 3
0
0
2
diff -r 2c8e4d859d37 -r e83216eba1db project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist Wed Dec 08 17:48:33 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist Thu Dec 09 22:50:16 2010 +0100
@@ -6,6 +6,7 @@
100
300
+ 3
100
50
47
@@ -14,7 +15,6 @@
1
0
35
- 3
0
0
0
diff -r 2c8e4d859d37 -r e83216eba1db project_files/HedgewarsMobile/Resources/Settings/Schemes/Thinking with Portals.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Thinking with Portals.plist Wed Dec 08 17:48:33 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Thinking with Portals.plist Thu Dec 09 22:50:16 2010 +0100
@@ -6,6 +6,7 @@
100
45
+ 4
100
15
47
@@ -14,7 +15,6 @@
2
25
25
- 4
5
0
5
diff -r 2c8e4d859d37 -r e83216eba1db project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist Wed Dec 08 17:48:33 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist Thu Dec 09 22:50:16 2010 +0100
@@ -6,6 +6,7 @@
100
100
+ 5
100
100
47
@@ -15,7 +16,6 @@
35
30
3
- 5
10
2
diff -r 2c8e4d859d37 -r e83216eba1db project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist Wed Dec 08 17:48:33 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist Thu Dec 09 22:50:16 2010 +0100
@@ -6,6 +6,7 @@
100
30
+ 3
100
15
47
@@ -14,7 +15,6 @@
5
35
25
- 3
10
10
10
diff -r 2c8e4d859d37 -r e83216eba1db project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist
--- a/project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist Wed Dec 08 17:48:33 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist Thu Dec 09 22:50:16 2010 +0100
@@ -38,6 +38,22 @@
checkOverMax
command
+ e$minestime
+ default
+ 3
+ image
+ Time
+ max
+ 5
+ min
+ -1
+ title
+ Mines Time
+
+
+ checkOverMax
+
+ command
e$damagepct
default
100
@@ -166,22 +182,6 @@
checkOverMax
command
- e$minestime
- default
- 3
- image
- Time
- max
- 5
- min
- -1
- title
- Mines Time
-
-
- checkOverMax
-
- command
e$minesnum
default
4