Index: src/Cube.m ================================================================== --- src/Cube.m +++ src/Cube.m @@ -82,18 +82,16 @@ _gameDataIRI = [OFFileManager.defaultManager currentDirectoryIRI]; _userDataIRI = [OFFileManager.defaultManager currentDirectoryIRI]; - [OFFileManager.defaultManager - createDirectoryAtIRI: + [OFFileManager.defaultManager createDirectoryAtIRI: [_userDataIRI IRIByAppendingPathComponent:@"demos"] - createParents:true]; - [OFFileManager.defaultManager - createDirectoryAtIRI: + createParents:true]; + [OFFileManager.defaultManager createDirectoryAtIRI: [_userDataIRI IRIByAppendingPathComponent:@"savegames"] - createParents:true]; + createParents:true]; if (SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO | par) < 0) fatal(@"Unable to initialize SDL"); initEntities(); @@ -151,27 +149,27 @@ [_gameDataIRI IRIByAppendingPathComponent:@"data/newchars.png"], &xs, &ys, false) || !installtex(3, [_gameDataIRI IRIByAppendingPathComponent: - @"data/martin/base.png"], + @"data/martin/base.png"], &xs, &ys, false) || !installtex(6, [_gameDataIRI IRIByAppendingPathComponent: - @"data/martin/ball1.png"], + @"data/martin/ball1.png"], &xs, &ys, false) || !installtex(7, [_gameDataIRI IRIByAppendingPathComponent: - @"data/martin/smoke.png"], + @"data/martin/smoke.png"], &xs, &ys, false) || !installtex(8, [_gameDataIRI IRIByAppendingPathComponent: - @"data/martin/ball2.png"], + @"data/martin/ball2.png"], &xs, &ys, false) || !installtex(9, [_gameDataIRI IRIByAppendingPathComponent: - @"data/martin/ball3.png"], + @"data/martin/ball3.png"], &xs, &ys, false) || !installtex(4, [_gameDataIRI IRIByAppendingPathComponent:@"data/explosion.jpg"], &xs, &ys, false) || Index: src/OFString+Cube.h ================================================================== --- src/OFString+Cube.h +++ src/OFString+Cube.h @@ -1,8 +1,7 @@ #import -@interface -OFString (Cube) +@interface OFString (Cube) @property (readonly, nonatomic) int cube_intValue; - (int)cube_intValueWithBase:(unsigned char)base; @end Index: src/OFString+Cube.m ================================================================== --- src/OFString+Cube.m +++ src/OFString+Cube.m @@ -1,11 +1,10 @@ #import "OFString+Cube.h" #include "cube.h" -@implementation -OFString (Cube) +@implementation OFString (Cube) - (int)cube_intValue { @try { return self.intValue; } @catch (OFInvalidFormatException *e) { Index: src/clientextras.m ================================================================== --- src/clientextras.m +++ src/clientextras.m @@ -112,14 +112,13 @@ static void renderscore(Player *d) { OFString *lag = [OFString stringWithFormat:@"%d", d.lag]; OFString *name = [OFString stringWithFormat:@"(%@)", d.name]; - OFString *line = - [OFString stringWithFormat:@"%d\t%@\t%d\t%@\t%@", d.frags, - (d.state == CS_LAGGED ? @"LAG" : lag), d.ping, d.team, - (d.state == CS_DEAD ? name : d.name)]; + OFString *line = [OFString stringWithFormat:@"%d\t%@\t%d\t%@\t%@", + d.frags, (d.state == CS_LAGGED ? @"LAG" : lag), d.ping, d.team, + (d.state == CS_DEAD ? name : d.name)]; if (scoreLines == nil) scoreLines = [[OFMutableArray alloc] init]; [scoreLines addObject:line]; @@ -169,11 +168,11 @@ if (!demoplayback) addteamscore(Player.player1); OFMutableString *teamScores = [OFMutableString string]; for (size_t j = 0; j < teamsUsed; j++) [teamScores appendFormat:@"[ %@: %d ]", teamName[j], - teamScore[j]]; + teamScore[j]]; menumanual(0, scoreLines.count, @""); menumanual(0, scoreLines.count + 1, teamScores); } } @@ -206,11 +205,11 @@ sendpackettoserv(packet); conoutf(@"sending map %@ to server...", mapname); OFString *msg = [OFString stringWithFormat:@"[map %@ uploaded to server, " @"\"getmap\" to receive it]", - mapname]; + mapname]; toserver(msg); })) COMMAND(getmap, ARG_NONE, ^{ ENetPacket *packet = Index: src/clients.m ================================================================== --- src/clients.m +++ src/clients.m @@ -94,11 +94,11 @@ void writeclientinfo(OFStream *stream) { [stream writeFormat:@"name \"%@\"\nteam \"%@\"\n", Player.player1.name, - Player.player1.team]; + Player.player1.team]; } void connects(OFString *servername) { Index: src/commands.m ================================================================== --- src/commands.m +++ src/commands.m @@ -351,11 +351,11 @@ if (![identifier isKindOfClass:Variable.class] || ![identifier persisted]) return; [stream writeFormat:@"%@ %d\n", identifier.name, - *[identifier storage]]; + *[identifier storage]]; }]; [stream writeString:@"\n"]; writebinds(stream); [stream writeString:@"\n"]; @@ -365,11 +365,11 @@ if (![identifier isKindOfClass:Alias.class] || [identifier.name hasPrefix:@"nextmap_"]) return; [stream writeFormat:@"alias \"%@\" [%@]\n", identifier.name, - [identifier action]]; + [identifier action]]; }]; [stream close]; } Index: src/console.m ================================================================== --- src/console.m +++ src/console.m @@ -182,12 +182,11 @@ break; case SDLK_BACKSPACE: case SDLK_LEFT: if (commandbuf.length > 0) - [commandbuf - deleteCharactersInRange: + [commandbuf deleteCharactersInRange: OFMakeRange( commandbuf.length - 1, 1)]; resetcomplete(); break; @@ -275,7 +274,7 @@ writebinds(OFStream *stream) { for (KeyMapping *mapping in keyMappings) if (mapping.action.length > 0) [stream writeFormat:@"bind \"%@\" [%@]\n", mapping.name, - mapping.action]; + mapping.action]; } Index: src/renderextras.m ================================================================== --- src/renderextras.m +++ src/renderextras.m @@ -197,12 +197,12 @@ if (e >= 0) { Entity *c = ents[e]; closeent = [OFString stringWithFormat:@"closest entity = %@ (%d, %d, " @"%d, %d), selection = (%d, %d)", - entnames[c.type], c.attr1, c.attr2, c.attr3, - c.attr4, getvar(@"selxs"), getvar(@"selys")]; + entnames[c.type], c.attr1, c.attr2, c.attr3, c.attr4, + getvar(@"selxs"), getvar(@"selys")]; } } COMMAND(loadsky, ARG_1STR, (^(OFString *basename) { static OFString *lastsky = @""; Index: src/server.m ================================================================== --- src/server.m +++ src/server.m @@ -100,11 +100,11 @@ void disconnect_client(int n, OFString *reason) { [OFStdOut writeFormat:@"disconnecting client (%@) [%@]\n", - clients[n].hostname, reason]; + clients[n].hostname, reason]; enet_peer_disconnect(clients[n].peer); clients[n].type = ST_EMPTY; send2(true, -1, SV_CDIS, n); } @@ -488,11 +488,11 @@ break; case ENET_EVENT_TYPE_DISCONNECT: if ((intptr_t)event.peer->data < 0) break; [OFStdOut writeFormat:@"disconnected client (%@)\n", - clients[(size_t)event.peer->data].hostname]; + clients[(size_t)event.peer->data].hostname]; clients[(size_t)event.peer->data].type = ST_EMPTY; send2(true, -1, SV_CDIS, (intptr_t)event.peer->data); event.peer->data = (void *)-1; break; case ENET_EVENT_TYPE_NONE: Index: src/serverbrowser.m ================================================================== --- src/serverbrowser.m +++ src/serverbrowser.m @@ -219,23 +219,21 @@ __block int maxmenu = 16; [servers enumerateObjectsUsingBlock:^( ServerInfo *si, size_t i, bool *stop) { if (si.address.host != ENET_HOST_ANY && si.ping != 9999) { if (si.protocol != PROTOCOL_VERSION) - si.full = [OFString - stringWithFormat: + si.full = [OFString stringWithFormat: @"%@ [different cube protocol]", si.name]; else si.full = [OFString stringWithFormat:@"%d\t%d\t%@, %@: %@ %@", si.ping, si.numplayers, si.map.length > 0 ? si.map : @"[unknown]", modestr(si.mode), si.name, si.sdesc]; } else - si.full = [OFString - stringWithFormat: + si.full = [OFString stringWithFormat: (si.address.host != ENET_HOST_ANY ? @"%@ [waiting for server response]" : @"%@ [unknown host]\t"), si.name]; Index: src/serverms.m ================================================================== --- src/serverms.m +++ src/serverms.m @@ -28,11 +28,11 @@ ENetBuffer buf; OFString *httpget = [OFString stringWithFormat:@"GET %@ HTTP/1.0\n" @"Host: %@\n" @"Referer: %@\n" @"User-Agent: %@\n\n", - req, hostname, ref, agent]; + req, hostname, ref, agent]; buf.data = (void *)httpget.UTF8String; buf.dataLength = httpget.UTF8StringLength; [OFStdOut writeFormat:@"sending request to %@...\n", hostname]; enet_socket_send(mssock, NULL, &buf, 1); } @@ -138,13 +138,12 @@ p = &pong[len]; putint(&p, PROTOCOL_VERSION); putint(&p, mode); putint(&p, numplayers); putint(&p, minremain); - OFString *mname = - [OFString stringWithFormat:@"%@%@", - (isfull ? @"[FULL] " : @""), smapname]; + OFString *mname = [OFString stringWithFormat:@"%@%@", + (isfull ? @"[FULL] " : @""), smapname]; sendstring(mname, &p); sendstring(serverdesc, &p); buf.dataLength = p - pong; enet_socket_send(pongsock, &addr, &buf, 1); } Index: src/worldio.m ================================================================== --- src/worldio.m +++ src/worldio.m @@ -38,11 +38,11 @@ } cgzname = [[OFString alloc] initWithFormat:@"packages/%@/%@.cgz", pakname, mapname]; bakname = [[OFString alloc] initWithFormat:@"packages/%@/%@_%d.BAK", - pakname, mapname, lastmillis]; + pakname, mapname, lastmillis]; pcfname = [[OFString alloc] initWithFormat:@"packages/%@/package.cfg", pakname]; mcfname = [[OFString alloc] initWithFormat:@"packages/%@/%@.cfg", pakname, mapname]; }