sheepy-clone: comparison project_files/HedgewarsMobile/Classes/GameSetup.m

equal deleted inserted replaced

-:c3dcb80bdb1d
+:156c04c6a3d8
 [teamData release];
 }
 // unpacks ammostore data from the selected ammo.plist to a sequence of engine commands
 -(void) provideAmmoData:(NSString *)ammostoreName forPlayingTeams:(NSInteger) numberOfTeams {
+NSString *weaponPath = [[NSString alloc] initWithFormat:@"%@/%@",WEAPONS_DIRECTORY(),ammostoreName];
-//NSDictionary *ammoData = [[NSDictionary alloc] initWithContentsOfFile:ammoDataFile];
+NSDictionary *ammoData = [[NSDictionary alloc] initWithContentsOfFile:ammoDataFile];
-NSDictionary *ammoData = [[NSDictionary alloc] initWithObjectsAndKeys:
+[weaponPath release];
-@"9391929422199121032235111001201000000211190911",@"ammostore_initialqt",
-@"0405040541600655546554464776576666666155501000",@"ammostore_probability",
-@"0000000000000205500000040007004000000000200000",@"ammostore_delay",
-@"1311110312111111123114111111111111111211101111",@"ammostore_crate", nil];
 NSString *ammloadt = [[NSString alloc] initWithFormat:@"eammloadt %@", [ammoData objectForKey:@"ammostore_initialqt"]];
 [self sendToEngine: ammloadt];
 [ammloadt release];
 	uint16_t gameTicks;
 serverQuit = NO;
 	if (SDLNet_Init() < 0) {
-		NSLog(@"SDLNet_Init: %s", SDLNet_GetError());
+		DLog(@"SDLNet_Init: %s", SDLNet_GetError());
 serverQuit = YES;
 	}
 	// Resolving the host using NULL make network interface to listen
 	if (SDLNet_ResolveHost(&ip, NULL, ipcPort) < 0) {
-		NSLog(@"SDLNet_ResolveHost: %s\n", SDLNet_GetError());
+		DLog(@"SDLNet_ResolveHost: %s\n", SDLNet_GetError());
 serverQuit = YES;
 	}
 	// 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);
+		DLog(@"SDLNet_TCP_Open: %s %\n", SDLNet_GetError(), ipcPort);
 serverQuit = YES;
 	}
-	NSLog(@"engineProtocol - Waiting for a client on port %d", ipcPort);
+	DLog(@"Waiting for a client on port %d", ipcPort);
 	while (!serverQuit) {
 		// This check the sd if there is a pending connection.
 // 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");
+			DLog(@"client found");
 			//first byte of the command alwayas contain the size of the command
 			SDLNet_TCP_Recv(csd, &msgSize, sizeof(uint8_t));
 			SDLNet_TCP_Recv(csd, buffer, msgSize);
 			gameTicks = SDLNet_Read16 (&buffer[msgSize - 2]);
-			//NSLog(@"engineProtocol - %d: received [%s]", gameTicks, buffer);
+			//DLog(@"engineProtocol - %d: received [%s]", gameTicks, buffer);
 			if ('C' == buffer[0]) {
-				NSLog(@"engineProtocol - sending game config");
+				DLog(@"sending game config");
 				// local game
 				[self sendToEngine:@"TL"];
 				// seed info
 forHogs:[[teamData objectForKey:@"number"] intValue]
 withHealth:health
 ofColor:[teamData objectForKey:@"color"]];
 }
-[self provideAmmoData:nil forPlayingTeams:[teamsConfig count]];
+[self provideAmmoData:@"Default" forPlayingTeams:[teamsConfig count]];
 clientQuit = NO;
 			} else {
-				NSLog(@"engineProtocolThread - wrong message or client closed connection");
+				DLog(@"wrong message or client closed connection");
 				clientQuit = YES;
 			}
 			while (!clientQuit){
 				msgSize = 0;
 					clientQuit = YES;
 				if (SDLNet_TCP_Recv(csd, buffer, msgSize) <=0)
 					clientQuit = YES;
 				gameTicks = SDLNet_Read16(&buffer[msgSize - 2]);
-				//NSLog(@"engineProtocolThread - %d: received [%s]", gameTicks, buffer);
+				//DLog(@"engineProtocolThread - %d: received [%s]", gameTicks, buffer);
 				switch (buffer[0]) {
 					case '?':
-						NSLog(@"Ping? Pong!");
+						DLog(@"Ping? Pong!");
 						[self sendToEngine:@"!"];
 						break;
 					case 'E':
-						NSLog(@"ERROR - last console line: [%s]", buffer);
+						DLog(@"ERROR - last console line: [%s]", buffer);
 						clientQuit = YES;
 						break;
 					case 'e':
 						sscanf(buffer, "%*s %d", &eProto);
 						short int netProto = 0;
 						char *versionStr;
 HW_versionInfo(&netProto, &versionStr);
 						if (netProto == eProto) {
-							NSLog(@"Setting protocol version %d (%s)", eProto, versionStr);
+							DLog(@"Setting protocol version %d (%s)", eProto, versionStr);
 						} else {
-							NSLog(@"ERROR - wrong protocol number: [%s] - expecting %d", buffer, eProto);
+							DLog(@"ERROR - wrong protocol number: [%s] - expecting %d", buffer, eProto);
 							clientQuit = YES;
 						}
 						break;
 					case 'i':
 						switch (buffer[1]) {
 							case 'r':
 								NSLog(@"Winning team: %s", &buffer[2]);
 								break;
 							case 'k':
-								NSLog(@"Best Hedgehog: %s", &buffer[2]);
+NSLog(@"Best Hedgehog: %s", &buffer[2]);
 								break;
 						}
 						break;
 					default:
 						// empty packet or just statistics
 						break;
 					// missing case for exiting right away
 				}
 			}
-			NSLog(@"Engine exited, closing server");
+			DLog(@"Engine exited, closing server");
 			// wait a little to let the client close cleanly
 			[NSThread sleepForTimeInterval:2];
 			// Close the client socket
 			SDLNet_TCP_Close(csd);
 			serverQuit = YES;

changeset 3522	156c04c6a3d8
parent 3514	59dbd31e9953
child 3523	6592fbb969da