hedgewars-draft: comparison cocoaTouch/GameSetup.m

equal deleted inserted replaced

-:5d3daec0d0b5
+:c1ff724a5c34
 @synthesize systemSettings, gameConfig;
 -(id) init {
 	if (self = [super init]) {
-	srandom(time(NULL));
 ipcPort = randomPort();
-NSDictionary *dictSett = [[NSDictionary alloc] initWithContentsOfFile:SETTINGS_FILE()]; //should check it exists
+// should check they exist and throw and exection if not
+NSDictionary *dictSett = [[NSDictionary alloc] initWithContentsOfFile:SETTINGS_FILE()];
 self.systemSettings = dictSett;
 [dictSett release];
 NSDictionary *dictGame = [[NSDictionary alloc] initWithContentsOfFile:GAMECONFIG_FILE()];
 self.gameConfig = dictGame;
 	[super dealloc];
 }
 #pragma mark -
 #pragma mark Thread/Network relevant code
+// select one of GameSetup method and execute it in a seprate thread
 -(void) startThread: (NSString *) selector {
 	SEL usage = NSSelectorFromString(selector);
 	[NSThread detachNewThreadSelector:usage toTarget:self withObject:nil];
 }
+// wrapper that computes the length of the message and then sends the command string
 -(int) sendToEngine: (NSString *)string {
 	unsigned char length = [string length];
 	SDLNet_TCP_Send(csd, &length , 1);
 	return SDLNet_TCP_Send(csd, [string UTF8String], length);
 }
+// unpacks team data from the team.plist to a sequence of commands for engine
 -(void) sendTeamData:(NSString *)fileName withPlayingHogs:(NSInteger) playingHogs ofColor:(NSNumber *)color{
 NSString *teamFile = [[NSString alloc] initWithFormat:@"%@/%@", TEAMS_DIRECTORY(), fileName];
 NSDictionary *teamData = [[NSDictionary alloc] initWithContentsOfFile:teamFile];
 [teamFile release];
 }
 [teamData release];
 }
+// unpacks ammodata from the ammo.plist to a sequence of commands for engine
 -(void) sendAmmoData:(NSDictionary *)ammoData forTeams: (NSInteger)numberPlaying {
 NSString *ammloadt = [[NSString alloc] initWithFormat:@"eammloadt %@", [ammoData objectForKey:@"ammostore_initialqt"]];
 [self sendToEngine: ammloadt];
 [ammloadt release];
 for (int i = 0; i < numberPlaying; i++)
 [self sendToEngine: ammstore];
 [ammstore release];
 }
+// method that handles net setup with engine and keeps connection alive
 -(void) engineProtocol {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	IPaddress ip;
 	int eProto;
 	BOOL clientQuit, serverQuit;
 	if (SDLNet_Init() < 0) {
 		NSLog(@"SDLNet_Init: %s", SDLNet_GetError());
 serverQuit = YES;
 	}
-	/* Resolving the host using NULL make network interface to listen */
+	// Resolving the host using NULL make network interface to listen
 	if (SDLNet_ResolveHost(&ip, NULL, ipcPort) < 0) {
 		NSLog(@"SDLNet_ResolveHost: %s\n", SDLNet_GetError());
 serverQuit = YES;
 	}
-	/* Open a connection with the IP provided (listen on the host's port) */
+	// Open a connection with the IP provided (listen on the host's port)
 	if (!(sd = SDLNet_TCP_Open(&ip))) {
 		NSLog(@"SDLNet_TCP_Open: %s %\n", SDLNet_GetError(), ipcPort);
 serverQuit = YES;
 	}
 	NSLog(@"engineProtocol - Waiting for a client on port %d", ipcPort);
 	while (!serverQuit) {
-		/* This check the sd if there is a pending connection.
+		// This check the sd if there is a pending connection.
-		 * If there is one, accept that, and open a new socket for communicating */
+// If there is one, accept that, and open a new socket for communicating
 		csd = SDLNet_TCP_Accept(sd);
 		if (NULL != csd) {
+			// Now we can communicate with the client using csd socket
+			// sd will remain opened waiting other connections
 			NSLog(@"engineProtocol - Client found");
 			//first byte of the command alwayas contain the size of the command
 			SDLNet_TCP_Recv(csd, &msgSize, sizeof(Uint8));
 			SDLNet_TCP_Recv(csd, buffer, msgSize);
-			gameTicks = SDLNet_Read16(&buffer[msgSize - 2]);
+			gameTicks = SDLNet_Read16 (&buffer[msgSize - 2]);
 			//NSLog(@"engineProtocol - %d: received [%s]", gameTicks, buffer);
 			if ('C' == buffer[0]) {
 				NSLog(@"engineProtocol - sending game config");
 				// seed info
 				[self sendToEngine:[self.gameConfig objectForKey:@"seed_command"]];
 				// various flags
-				[self sendToEngine:@"e$gmflags 256"];
+				[self sendToEngine:@"e$gmflags 8448"];
 				[self sendToEngine:@"e$damagepct 100"];
 				[self sendToEngine:@"e$turntime 45000"];
 				[self sendToEngine:@"e$minestime 3000"];
 				[self sendToEngine:@"e$landadds 4"];
 				[self sendToEngine:@"e$sd_turns 15"];
 				[self sendToEngine:@"e$casefreq 5"];
+				[self sendToEngine:@"e$explosives 2"];
+				[self sendToEngine:@"e$minedudpct 0"];
 				// dimension of the map
 				[self sendToEngine:[self.gameConfig objectForKey:@"templatefilter_command"]];
 				[self sendToEngine:[self.gameConfig objectForKey:@"mapgen_command"]];
 				[self sendToEngine:[self.gameConfig objectForKey:@"mazesize_command"]];
 				// theme info
-				[self sendToEngine:@"etheme Compost"];
+				[self sendToEngine:[self.gameConfig objectForKey:@"theme_command"]];
 NSArray *teamsConfig = [self.gameConfig objectForKey:@"teams_list"];
 for (NSDictionary *teamData in teamsConfig) {
 [self sendTeamData:[teamData objectForKey:@"team"]
 withPlayingHogs:[[teamData objectForKey:@"number"] intValue]
 ofColor:[teamData objectForKey:@"color"]];
-NSLog(@"teamData sent");
 }
 NSDictionary *ammoData = [[NSDictionary alloc] initWithObjectsAndKeys:
 @"9391929422199121032235111001201000000211190",@"ammostore_initialqt",
 @"0405040541600655546554464776576666666155501",@"ammostore_probability",
 				NSLog(@"engineProtocolThread - wrong message or client closed connection");
 				clientQuit = YES;
 			}
 			while (!clientQuit){
-				/* Now we can communicate with the client using csd socket
-				 * sd will remain opened waiting other connections */
 				msgSize = 0;
 				memset(buffer, 0, BUFFER_SIZE);
 				memset(string, 0, BUFFER_SIZE);
 				if (SDLNet_TCP_Recv(csd, &msgSize, sizeof(Uint8)) <= 0)
 					clientQuit = YES;
 	[NSThread exit];
 }
 #pragma mark -
 #pragma mark Setting methods
+// returns an array of c-strings that are read by engine at startup
 -(const char **)getSettings {
 	NSString *ipcString = [[NSString alloc] initWithFormat:@"%d", ipcPort];
 	NSString *localeString = [[NSString alloc] initWithFormat:@"%@.txt", [[NSLocale currentLocale] objectForKey:NSLocaleLanguageCode]];
 CGRect screenBounds = [[UIScreen mainScreen] bounds];
 NSString *wSize = [[NSString alloc] initWithFormat:@"%d", (int) screenBounds.size.width];
 */
 // prevents using an empty nickname
 NSString *username;
 NSString *originalUsername = [self.systemSettings objectForKey:@"username"];
-if ([originalUsername length] == 0) {
+if ([originalUsername length] == 0)
 username = [[NSString alloc] initWithFormat:@"MobileUser-%@",ipcString];
-} else {
+else
 username = [[NSString alloc] initWithString:originalUsername];
-}
 	gameArgs[0] = [username UTF8String];                                                        //UserNick
 	gameArgs[1] = [ipcString UTF8String];                                                       //ipcPort
 	gameArgs[2] = [[[self.systemSettings objectForKey:@"sound"] stringValue] UTF8String];       //isSoundEnabled
 	gameArgs[3] = [[[self.systemSettings objectForKey:@"music"] stringValue] UTF8String];       //isMusicEnabled

changeset 3373	c1ff724a5c34
parent 3369	c7289e42f0ee
child 3395	095273ad0e08