--- a/hedgewars/PascalExports.pas Wed Dec 22 02:50:17 2010 +0100
+++ b/hedgewars/PascalExports.pas Wed Dec 22 04:09:56 2010 +0100
@@ -25,7 +25,6 @@
uCommands;
{$INCLUDE "config.inc"}
-var dummy: boolean; // avoid compiler hint
implementation
{$IFDEF HWLIBRARY}
@@ -33,7 +32,7 @@
previousGameState: TGameState;
// retrieve protocol information
-procedure HW_versionInfo(netProto: PShortInt; versionStr: PPChar); cdecl; export;
+procedure HW_versionInfo(netProto: PLongInt; versionStr: PPChar); cdecl; export;
begin
netProto^:= cNetProtoVersion;
versionStr^:= cVersionString;
--- a/hedgewars/hwLibrary.pas Wed Dec 22 02:50:17 2010 +0100
+++ b/hedgewars/hwLibrary.pas Wed Dec 22 04:09:56 2010 +0100
@@ -16,6 +16,5 @@
begin
// avoid compiler warnings about units not being used
isTerminated:= isTerminated;
- dummy:= dummy;
end.
--- a/hedgewars/uStore.pas Wed Dec 22 02:50:17 2010 +0100
+++ b/hedgewars/uStore.pas Wed Dec 22 04:09:56 2010 +0100
@@ -391,7 +391,7 @@
var tmpsurf: PSDL_Surface;
s: shortstring;
begin
- WriteToConsole(msgLoading + filename + '.png [flags: ' + inttostr(imageFlags) + ']');
+ WriteToConsole(msgLoading + filename + '.png [flags: ' + inttostr(imageFlags) + '] ');
s:= filename + '.png';
tmpsurf:= IMG_Load(Str2PChar(s));
--- a/project_files/HedgewarsMobile/Classes/AboutViewController.m Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/AboutViewController.m Wed Dec 22 04:09:56 2010 +0100
@@ -98,7 +98,7 @@
-(UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger) section {
NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
char *fullver;
- short int proto = 20;
+ int proto;
HW_versionInfo(&proto, &fullver);
NSString *footerString = [[NSString alloc] initWithFormat:
--- a/project_files/HedgewarsMobile/Classes/CreationChamber.h Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/CreationChamber.h Wed Dec 22 04:09:56 2010 +0100
@@ -23,4 +23,4 @@
void createTeamNamed (NSString *nameWithoutExt);
void createWeaponNamed (NSString *nameWithoutExt, int type);
-void createSchemeNamed (NSString *nameWithoutExt);
\ No newline at end of file
+void createSchemeNamed (NSString *nameWithoutExt);
--- a/project_files/HedgewarsMobile/Classes/CreationChamber.m Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/CreationChamber.m Wed Dec 22 04:09:56 2010 +0100
@@ -74,57 +74,54 @@
NSDictionary *theWeapon = nil;
switch (type) {
- case 0: //default
+ default: //default
theWeapon = [[NSDictionary alloc] initWithObjectsAndKeys:
- @"93919294221991210322351110012010000002111101010111",@"ammostore_initialqt",
- @"04050405416006555465544647765766666661555101011154",@"ammostore_probability",
- @"00000000000002055000000400070040000000002000000006",@"ammostore_delay",
- @"13111103121111111231141111111111111112111111011111",@"ammostore_crate", nil];
+ @"939192942219912103223511100120100000021111010101112",@"ammostore_initialqt",
+ @"040504054160065554655446477657666666615551010111541",@"ammostore_probability",
+ @"000000000000020550000004000700400000000020000000060",@"ammostore_delay",
+ @"131111031211111112311411111111111111121111110111112",@"ammostore_crate", nil];
break;
case 1: //crazy
theWeapon = [[NSDictionary alloc] initWithObjectsAndKeys:
- @"99999999999999999929999999999999992999999999099999",@"ammostore_initialqt",
- @"11111101111111111111111111111111111111111111011111",@"ammostore_probability",
- @"00000000000000000000000000000000000000000000000000",@"ammostore_delay",
- @"13111103121111111231141111111111111112111101011111",@"ammostore_crate", nil];
+ @"999999999999999999299999999999999929999999990999999",@"ammostore_initialqt",
+ @"111111011111111111111111111111111111111111110111111",@"ammostore_probability",
+ @"000000000000000000000000000000000000000000000000000",@"ammostore_delay",
+ @"131111031211111112311411111111111111121111010111111",@"ammostore_crate", nil];
break;
case 2: //pro mode
theWeapon = [[NSDictionary alloc] initWithObjectsAndKeys:
- @"90900090000000000000090000000000000000000000000000",@"ammostore_initialqt",
- @"00000000000000000000000000000000000000000000000000",@"ammostore_probability",
- @"00000000000002055000000400070040000000002000000000",@"ammostore_delay",
- @"11111111111111111111111111111111111111111001011111",@"ammostore_crate", nil];
+ @"909000900000000000000900000000000000000000000000000",@"ammostore_initialqt",
+ @"000000000000000000000000000000000000000000000000000",@"ammostore_probability",
+ @"000000000000020550000004000700400000000020000000000",@"ammostore_delay",
+ @"111111111111111111111111111111111111111110010111111",@"ammostore_crate", nil];
break;
case 3: //shoppa
theWeapon = [[NSDictionary alloc] initWithObjectsAndKeys:
- @"00000099000000000000000000000000000000000000000000",@"ammostore_initialqt",
- @"44444100442444022101121212224220000000020004000100",@"ammostore_probability",
- @"00000000000000000000000000000000000000000000000000",@"ammostore_delay",
- @"11111111111111111111111111111111111111111011011111",@"ammostore_crate", nil];
+ @"000000990000000000000000000000000000000000000000000",@"ammostore_initialqt",
+ @"444441004424440221011212122242200000000200040001001",@"ammostore_probability",
+ @"000000000000000000000000000000000000000000000000000",@"ammostore_delay",
+ @"111111111111111111111111111111111111111110110111111",@"ammostore_crate", nil];
break;
case 4: //clean slate
theWeapon = [[NSDictionary alloc] initWithObjectsAndKeys:
- @"10100090000100000110000000000000000000000000000010",@"ammostore_initialqt",
- @"04050405416006555465544647765766666661555101011154",@"ammostore_probability",
- @"00000000000002055000000400070040000000002000000000",@"ammostore_delay",
- @"13111103121111111231141111111111111112111111011111",@"ammostore_crate", nil];
+ @"101000900001000001100000000000000000000000000000100",@"ammostore_initialqt",
+ @"040504054160065554655446477657666666615551010111541",@"ammostore_probability",
+ @"000000000000020550000004000700400000000020000000000",@"ammostore_delay",
+ @"131111031211111112311411111111111111121111110111111",@"ammostore_crate", nil];
break;
case 5: //minefield
theWeapon = [[NSDictionary alloc] initWithObjectsAndKeys:
- @"00000099000900000003000000000000000000000000000000",@"ammostore_initialqt",
- @"00000000000000000000000000000000000000000000000000",@"ammostore_probability",
- @"00000000000002055000000400070040000000002000000000",@"ammostore_delay",
- @"11111111111111111111111111111111111111111111011111",@"ammostore_crate", nil];
+ @"000000990009000000030000000000000000000000000000000",@"ammostore_initialqt",
+ @"000000000000000000000000000000000000000000000000000",@"ammostore_probability",
+ @"000000000000020550000004000700400000000020000000000",@"ammostore_delay",
+ @"111111111111111111111111111111111111111111110111111",@"ammostore_crate", nil];
break;
case 6: //thinking with portals
theWeapon = [[NSDictionary alloc] initWithObjectsAndKeys:
- @"90000090020000000021000000000000001100000900000000",@"ammostore_initialqt",
- @"04050405416006555465544647765766666661555101011154",@"ammostore_probability",
- @"00000000000002055000000400070040000000002000000006",@"ammostore_delay",
- @"13111103121111111231141111111111111112111111011111",@"ammostore_crate", nil];
- break;
- default:
- NSLog(@"Nope");
+ @"900000900200000000210000000000000011000009000000000",@"ammostore_initialqt",
+ @"040504054160065554655446477657666666615551010111541",@"ammostore_probability",
+ @"000000000000020550000004000700400000000020000000060",@"ammostore_delay",
+ @"131111031211111112311411111111111111121111110111111",@"ammostore_crate", nil];
break;
}
@@ -145,47 +142,51 @@
error:NULL];
}
+ int basicFlags[] = {100, 100, 45, 15, 47, 5, 100, 5, 35, 25, 3, 4, 0, 2};
+ BOOL gameFlags[] = {NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, YES, NO, NO, NO, NO,
+ NO, NO, NO, NO, NO, NO, NO};
+
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
- [NSNumber numberWithInt:5], //healthdecrease
- [NSNumber numberWithInt:100], //ropelength
- [NSNumber numberWithInt:5], //cratedrops
- [NSNumber numberWithInt:35], //healthprob
- [NSNumber numberWithInt:25], //healthamount
- [NSNumber numberWithInt:4], //minesnumber
- [NSNumber numberWithInt:0], //dudmines
- [NSNumber numberWithInt:2], //explosives
+ [NSNumber numberWithInt:basicFlags[0]], //initialhealth
+ [NSNumber numberWithInt:basicFlags[1]], //damagemodifier
+ [NSNumber numberWithInt:basicFlags[2]], //turntime
+ [NSNumber numberWithInt:basicFlags[3]], //suddendeathtimeout
+ [NSNumber numberWithInt:basicFlags[4]], //waterrise
+ [NSNumber numberWithInt:basicFlags[5]], //healthdecrease
+ [NSNumber numberWithInt:basicFlags[6]], //ropelength
+ [NSNumber numberWithInt:basicFlags[7]], //cratedrops
+ [NSNumber numberWithInt:basicFlags[8]], //healthprob
+ [NSNumber numberWithInt:basicFlags[9]], //healthamount
+ [NSNumber numberWithInt:basicFlags[10]], //minestime
+ [NSNumber numberWithInt:basicFlags[11]], //minesnumber
+ [NSNumber numberWithInt:basicFlags[12]], //dudmines
+ [NSNumber numberWithInt:basicFlags[13]], //explosives
nil];
NSMutableArray *gamemodArray= [[NSMutableArray alloc] initWithObjects:
- [NSNumber numberWithBool:NO], //fortmode
- [NSNumber numberWithBool:NO], //divideteam
- [NSNumber numberWithBool:NO], //solidland
- [NSNumber numberWithBool:NO], //addborder
- [NSNumber numberWithBool:NO], //lowgravity
- [NSNumber numberWithBool:NO], //lasersight
- [NSNumber numberWithBool:NO], //invulnerable
- [NSNumber numberWithBool:NO], //resethealth
- [NSNumber numberWithBool:NO], //vampirism
- [NSNumber numberWithBool:NO], //karma
- [NSNumber numberWithBool:NO], //artillery
- [NSNumber numberWithBool:YES], //randomorder
- [NSNumber numberWithBool:NO], //king
- [NSNumber numberWithBool:NO], //placehedgehogs
- [NSNumber numberWithBool:NO], //clansharesammo
- [NSNumber numberWithBool:NO], //disablegirders
- [NSNumber numberWithBool:NO], //disablelandobjects
- [NSNumber numberWithBool:NO], //aisurvival
- [NSNumber numberWithBool:NO], //infattack
- [NSNumber numberWithBool:NO], //resetweaps
- [NSNumber numberWithBool:NO], //perhogammo
- [NSNumber numberWithBool:NO], //nowind
- [NSNumber numberWithBool:NO], //morewind
+ [NSNumber numberWithBool:gameFlags[0]], //fortmode
+ [NSNumber numberWithBool:gameFlags[1]], //divideteam
+ [NSNumber numberWithBool:gameFlags[2]], //solidland
+ [NSNumber numberWithBool:gameFlags[3]], //addborder
+ [NSNumber numberWithBool:gameFlags[4]], //lowgravity
+ [NSNumber numberWithBool:gameFlags[5]], //lasersight
+ [NSNumber numberWithBool:gameFlags[6]], //invulnerable
+ [NSNumber numberWithBool:gameFlags[7]], //resethealth
+ [NSNumber numberWithBool:gameFlags[8]], //vampirism
+ [NSNumber numberWithBool:gameFlags[9]], //karma
+ [NSNumber numberWithBool:gameFlags[10]], //artillery
+ [NSNumber numberWithBool:gameFlags[11]], //randomorder
+ [NSNumber numberWithBool:gameFlags[12]], //king
+ [NSNumber numberWithBool:gameFlags[13]], //placehedgehogs
+ [NSNumber numberWithBool:gameFlags[14]], //clansharesammo
+ [NSNumber numberWithBool:gameFlags[15]], //disablegirders
+ [NSNumber numberWithBool:gameFlags[16]], //disablelandobjects
+ [NSNumber numberWithBool:gameFlags[17]], //aisurvival
+ [NSNumber numberWithBool:gameFlags[18]], //infattack
+ [NSNumber numberWithBool:gameFlags[19]], //resetweaps
+ [NSNumber numberWithBool:gameFlags[20]], //perhogammo
+ [NSNumber numberWithBool:gameFlags[21]], //nowind
+ [NSNumber numberWithBool:gameFlags[22]], //morewind
nil];
NSMutableDictionary *theScheme = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
--- a/project_files/HedgewarsMobile/Classes/GameSetup.m Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/GameSetup.m Wed Dec 22 04:09:56 2010 +0100
@@ -182,28 +182,16 @@
NSArray *mods = [[NSArray alloc] initWithContentsOfFile:path];
[path release];
- int i = 0;
- // initial health
- result = [[basicArray objectAtIndex:i++] intValue];
+ result = [[basicArray objectAtIndex:0] intValue];
- // turn time
- 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:i++] intValue] * 1000];
- [self sendToEngine:minesTime];
- [minesTime release];
-
- for (; i < [basicArray count]; i++) {
- NSDictionary *basicDict = [mods objectAtIndex:i];
- NSString *command = [basicDict objectForKey:@"command"];
+ for (int i = 1; i < [basicArray count]; i++) {
+ NSDictionary *dict = [mods objectAtIndex:i];
+ NSString *command = [dict objectForKey:@"command"];
NSInteger value = [[basicArray objectAtIndex:i] intValue];
- if ([basicDict objectForKey:@"checkOverMax"] && value >= [[basicDict objectForKey:@"max"] intValue])
+ if ([[dict objectForKey:@"checkOverMax"] boolValue] && value >= [[dict objectForKey:@"max"] intValue])
value = 9999;
+ if ([[dict objectForKey:@"times1000"] boolValue])
+ value = value * 1000;
NSString *strToSend = [[NSString alloc] initWithFormat:@"%@ %d",command,value];
[self sendToEngine:strToSend];
[strToSend release];
@@ -345,14 +333,14 @@
[self dumpRawData:buffer ofSize:msgSize];
sscanf((char *)buffer, "%*s %d", &eProto);
- short int netProto;
+ int netProto;
char *versionStr;
HW_versionInfo(&netProto, &versionStr);
if (netProto == eProto) {
DLog(@"Setting protocol version %d (%s)", eProto, versionStr);
} else {
- DLog(@"ERROR - wrong protocol number: [%s] - expecting %d", &buffer[1], eProto);
+ DLog(@"ERROR - wrong protocol number: %d (expecting %d)", netProto, eProto);
clientQuit = YES;
}
break;
--- a/project_files/HedgewarsMobile/Classes/PascalImports.h Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/PascalImports.h Wed Dec 22 04:09:56 2010 +0100
@@ -34,7 +34,7 @@
void GenLandPreview(void);
void LoadLocaleWrapper(const char *filename);
- void HW_versionInfo(short int *netProto, char **versionStr);
+ void HW_versionInfo(int *protoNum, char **versionStr);
void HW_click(void);
void HW_ammoMenu(void);
--- a/project_files/HedgewarsMobile/Classes/ServerSetup.m Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/ServerSetup.m Wed Dec 22 04:09:56 2010 +0100
@@ -181,7 +181,7 @@
[self sendToServer:@"PASSWORD" withArgument:pwd];
}
else if ([command isEqualToString:@"CONNECTED"]) {
- short int netProto;
+ int netProto;
char *versionStr;
HW_versionInfo(&netProto, &versionStr);
NSString *nick = [self.systemSettings objectForKey:@"username"];
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Barrel Mayhem.plist Wed Dec 22 04:09:56 2010 +0100
@@ -5,9 +5,8 @@
<key>basic</key>
<array>
<integer>100</integer>
+ <integer>100</integer>
<integer>30</integer>
- <integer>0</integer>
- <integer>100</integer>
<integer>15</integer>
<integer>47</integer>
<integer>5</integer>
@@ -17,6 +16,7 @@
<integer>25</integer>
<integer>0</integer>
<integer>0</integer>
+ <integer>0</integer>
<integer>40</integer>
</array>
<key>gamemod</key>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Clean Slate.plist Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Clean Slate.plist Wed Dec 22 04:09:56 2010 +0100
@@ -5,9 +5,8 @@
<key>basic</key>
<array>
<integer>100</integer>
+ <integer>100</integer>
<integer>45</integer>
- <integer>3</integer>
- <integer>100</integer>
<integer>15</integer>
<integer>47</integer>
<integer>5</integer>
@@ -15,6 +14,7 @@
<integer>5</integer>
<integer>35</integer>
<integer>25</integer>
+ <integer>3</integer>
<integer>4</integer>
<integer>0</integer>
<integer>2</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Default.plist Wed Dec 22 04:09:56 2010 +0100
@@ -5,9 +5,8 @@
<key>basic</key>
<array>
<integer>100</integer>
+ <integer>100</integer>
<integer>45</integer>
- <integer>3</integer>
- <integer>100</integer>
<integer>15</integer>
<integer>47</integer>
<integer>5</integer>
@@ -15,6 +14,7 @@
<integer>5</integer>
<integer>35</integer>
<integer>25</integer>
+ <integer>3</integer>
<integer>4</integer>
<integer>0</integer>
<integer>2</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Fort Mode.plist Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Fort Mode.plist Wed Dec 22 04:09:56 2010 +0100
@@ -5,9 +5,8 @@
<key>basic</key>
<array>
<integer>100</integer>
+ <integer>100</integer>
<integer>45</integer>
- <integer>3</integer>
- <integer>100</integer>
<integer>15</integer>
<integer>47</integer>
<integer>5</integer>
@@ -15,6 +14,7 @@
<integer>5</integer>
<integer>35</integer>
<integer>25</integer>
+ <integer>3</integer>
<integer>0</integer>
<integer>0</integer>
<integer>0</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/King Mode.plist Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/King Mode.plist Wed Dec 22 04:09:56 2010 +0100
@@ -5,9 +5,8 @@
<key>basic</key>
<array>
<integer>100</integer>
+ <integer>100</integer>
<integer>45</integer>
- <integer>3</integer>
- <integer>100</integer>
<integer>15</integer>
<integer>47</integer>
<integer>5</integer>
@@ -15,6 +14,7 @@
<integer>5</integer>
<integer>35</integer>
<integer>25</integer>
+ <integer>3</integer>
<integer>4</integer>
<integer>0</integer>
<integer>2</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Minefield.plist Wed Dec 22 04:09:56 2010 +0100
@@ -5,9 +5,8 @@
<key>basic</key>
<array>
<integer>50</integer>
+ <integer>150</integer>
<integer>30</integer>
- <integer>0</integer>
- <integer>150</integer>
<integer>15</integer>
<integer>47</integer>
<integer>5</integer>
@@ -15,6 +14,7 @@
<integer>0</integer>
<integer>35</integer>
<integer>25</integer>
+ <integer>0</integer>
<integer>80</integer>
<integer>0</integer>
<integer>0</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Pro Mode.plist Wed Dec 22 04:09:56 2010 +0100
@@ -5,9 +5,8 @@
<key>basic</key>
<array>
<integer>100</integer>
+ <integer>100</integer>
<integer>15</integer>
- <integer>3</integer>
- <integer>100</integer>
<integer>15</integer>
<integer>47</integer>
<integer>5</integer>
@@ -15,6 +14,7 @@
<integer>0</integer>
<integer>35</integer>
<integer>25</integer>
+ <integer>3</integer>
<integer>0</integer>
<integer>0</integer>
<integer>2</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Shoppa.plist Wed Dec 22 04:09:56 2010 +0100
@@ -5,9 +5,8 @@
<key>basic</key>
<array>
<integer>100</integer>
+ <integer>100</integer>
<integer>300</integer>
- <integer>3</integer>
- <integer>100</integer>
<integer>50</integer>
<integer>47</integer>
<integer>5</integer>
@@ -15,6 +14,7 @@
<integer>1</integer>
<integer>0</integer>
<integer>35</integer>
+ <integer>3</integer>
<integer>0</integer>
<integer>0</integer>
<integer>0</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Thinking with Portals.plist Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Thinking with Portals.plist Wed Dec 22 04:09:56 2010 +0100
@@ -5,9 +5,8 @@
<key>basic</key>
<array>
<integer>100</integer>
+ <integer>100</integer>
<integer>45</integer>
- <integer>4</integer>
- <integer>100</integer>
<integer>15</integer>
<integer>47</integer>
<integer>5</integer>
@@ -15,6 +14,7 @@
<integer>2</integer>
<integer>25</integer>
<integer>25</integer>
+ <integer>4</integer>
<integer>5</integer>
<integer>0</integer>
<integer>5</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Timeless.plist Wed Dec 22 04:09:56 2010 +0100
@@ -6,7 +6,6 @@
<array>
<integer>100</integer>
<integer>100</integer>
- <integer>5</integer>
<integer>100</integer>
<integer>100</integer>
<integer>47</integer>
@@ -15,6 +14,7 @@
<integer>5</integer>
<integer>35</integer>
<integer>30</integer>
+ <integer>5</integer>
<integer>3</integer>
<integer>10</integer>
<integer>2</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/Schemes/Tunnel Hogs.plist Wed Dec 22 04:09:56 2010 +0100
@@ -5,15 +5,15 @@
<key>basic</key>
<array>
<integer>100</integer>
+ <integer>100</integer>
<integer>30</integer>
- <integer>3</integer>
- <integer>100</integer>
<integer>15</integer>
<integer>47</integer>
<integer>5</integer>
<integer>100</integer>
<integer>5</integer>
<integer>35</integer>
+ <integer>3</integer>
<integer>25</integer>
<integer>10</integer>
<integer>10</integer>
--- a/project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist Wed Dec 22 02:50:17 2010 +0100
+++ b/project_files/HedgewarsMobile/Resources/Settings/iFrontend/basicFlags_en.plist Wed Dec 22 04:09:56 2010 +0100
@@ -3,10 +3,6 @@
<plist version="1.0">
<array>
<dict>
- <key>checkOverMax</key>
- <false/>
- <key>command</key>
- <string></string>
<key>default</key>
<integer>100</integer>
<key>image</key>
@@ -21,37 +17,7 @@
<dict>
<key>checkOverMax</key>
<false/>
- <key>command</key>
- <string>e$turntime</string>
- <key>default</key>
- <integer>45</integer>
- <key>image</key>
- <string>Time</string>
- <key>max</key>
- <integer>100</integer>
- <key>min</key>
- <integer>1</integer>
- <key>title</key>
- <string>Turn Time</string>
- </dict>
- <dict>
- <key>checkOverMax</key>
- <false/>
- <key>command</key>
- <string>e$minestime</string>
- <key>default</key>
- <integer>3</integer>
- <key>image</key>
- <string>Time</string>
- <key>max</key>
- <integer>5</integer>
- <key>min</key>
- <integer>-1</integer>
- <key>title</key>
- <string>Mines Time</string>
- </dict>
- <dict>
- <key>checkOverMax</key>
+ <key>times1000</key>
<false/>
<key>command</key>
<string>e$damagepct</string>
@@ -69,6 +35,26 @@
<dict>
<key>checkOverMax</key>
<true/>
+ <key>times1000</key>
+ <true/>
+ <key>command</key>
+ <string>e$turntime</string>
+ <key>default</key>
+ <integer>45</integer>
+ <key>image</key>
+ <string>Time</string>
+ <key>max</key>
+ <integer>100</integer>
+ <key>min</key>
+ <integer>1</integer>
+ <key>title</key>
+ <string>Turn Time</string>
+ </dict>
+ <dict>
+ <key>checkOverMax</key>
+ <true/>
+ <key>times1000</key>
+ <false/>
<key>command</key>
<string>e$sd_turns</string>
<key>default</key>
@@ -85,6 +71,8 @@
<dict>
<key>checkOverMax</key>
<false/>
+ <key>times1000</key>
+ <false/>
<key>command</key>
<string>e$waterrise</string>
<key>default</key>
@@ -101,6 +89,8 @@
<dict>
<key>checkOverMax</key>
<false/>
+ <key>times1000</key>
+ <false/>
<key>command</key>
<string>e$healthdec</string>
<key>default</key>
@@ -117,6 +107,8 @@
<dict>
<key>checkOverMax</key>
<false/>
+ <key>times1000</key>
+ <false/>
<key>command</key>
<string>e$ropepct</string>
<key>default</key>
@@ -133,6 +125,8 @@
<dict>
<key>checkOverMax</key>
<false/>
+ <key>times1000</key>
+ <false/>
<key>command</key>
<string>e$casefreq</string>
<key>default</key>
@@ -149,6 +143,8 @@
<dict>
<key>checkOverMax</key>
<false/>
+ <key>times1000</key>
+ <false/>
<key>command</key>
<string>e$healthprob</string>
<key>default</key>
@@ -165,6 +161,8 @@
<dict>
<key>checkOverMax</key>
<false/>
+ <key>times1000</key>
+ <false/>
<key>command</key>
<string>e$hcaseamount</string>
<key>default</key>
@@ -181,6 +179,26 @@
<dict>
<key>checkOverMax</key>
<false/>
+ <key>times1000</key>
+ <true/>
+ <key>command</key>
+ <string>e$minestime</string>
+ <key>default</key>
+ <integer>3</integer>
+ <key>image</key>
+ <string>Time</string>
+ <key>max</key>
+ <integer>5</integer>
+ <key>min</key>
+ <integer>-1</integer>
+ <key>title</key>
+ <string>Mines Time</string>
+ </dict>
+ <dict>
+ <key>checkOverMax</key>
+ <false/>
+ <key>times1000</key>
+ <false/>
<key>command</key>
<string>e$minesnum</string>
<key>default</key>
@@ -197,6 +215,8 @@
<dict>
<key>checkOverMax</key>
<false/>
+ <key>times1000</key>
+ <false/>
<key>command</key>
<string>e$minedudpct</string>
<key>default</key>
@@ -213,6 +233,8 @@
<dict>
<key>checkOverMax</key>
<false/>
+ <key>times1000</key>
+ <false/>
<key>command</key>
<string>e$explosives</string>
<key>default</key>