Overview
Comment: | More string migration |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
4a87b39dfe44d37093be0ed635660eea |
User & Date: | js on 2025-03-08 03:40:26 |
Other Links: | manifest | tags |
Context
2025-03-08
| ||
10:12 | Fix crash check-in: b5a250176b user: js tags: trunk | |
03:40 | More string migration check-in: 4a87b39dfe user: js tags: trunk | |
03:26 | Use ObjFW functions for memory management check-in: 71ebb79f8f user: js tags: trunk | |
Changes
Modified src/renderextras.mm from [f6d88ed878] to [3268694917].
︙ | ︙ | |||
142 143 144 145 146 147 148 | } } glDisable(GL_BLEND); glDepthMask(GL_TRUE); } | | | 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 | } } glDisable(GL_BLEND); glDepthMask(GL_TRUE); } static OFString *closeent; OFString *entnames[] = { @"none?", @"light", @"playerstart", @"shells", @"bullets", @"rockets", |
︙ | ︙ | |||
172 173 174 175 176 177 178 | @"?", @"?", }; void renderents() // show sparkly thingies for map entities in edit mode { | | < | | | | < | < | 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 | @"?", @"?", }; void renderents() // show sparkly thingies for map entities in edit mode { closeent = @""; if (!editmode) return; loopv(ents) { entity &e = ents[i]; if (e.type == NOTUSED) continue; OFVector3D v = OFMakeVector3D(e.x, e.y, e.z); particle_splash(2, 2, 40, v); } int e = closestent(); if (e >= 0) { entity &c = ents[e]; closeent = [[OFString alloc] initWithFormat:@"closest entity = %@ (%d, %d, %d, %d), " @"selection = (%d, %d)", entnames[c.type], c.attr1, c.attr2, c.attr3, c.attr4, getvar(@"selxs"), getvar(@"selys")]; } } void loadsky(OFString *basename) { @autoreleasepool { |
︙ | ︙ | |||
367 368 369 370 371 372 373 | @autoreleasepool { OFString *command = getcurcommand(); OFString *player = playerincrosshair(); if (command) draw_textf(@"> %@_", 20, 1570, 2, command); | | | | 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 | @autoreleasepool { OFString *command = getcurcommand(); OFString *player = playerincrosshair(); if (command) draw_textf(@"> %@_", 20, 1570, 2, command); else if (closeent.length > 0) draw_text(closeent, 20, 1570, 2); else if (player != nil) draw_text(player, 20, 1570, 2); } renderscores(); if (!rendermenu()) { glBlendFunc(GL_SRC_ALPHA, GL_SRC_ALPHA); |
︙ | ︙ |
Modified src/worldio.mm from [09e55787b5] to [804d0f5ee3].
1 2 3 4 5 | // worldio.cpp: loading & saving of maps and savegames #include "cube.h" void | | | | | | > > | | | | | | | | | > > | | > | > | > | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | // worldio.cpp: loading & saving of maps and savegames #include "cube.h" void backup(OFString *name, OFString *backupname) { [OFFileManager.defaultManager removeItemAtPath:backupname]; [OFFileManager.defaultManager moveItemAtPath:name toPath:backupname]; } static OFString *cgzname, *bakname, *pcfname, *mcfname; static void setnames(OFString *name_) { @autoreleasepool { const char *name = name_.UTF8String; string pakname, mapname; const char *slash = strpbrk(name, "/\\"); if (slash) { strn0cpy(pakname, name, slash - name + 1); strcpy_s(mapname, slash + 1); } else { strcpy_s(pakname, "base"); strcpy_s(mapname, name); } cgzname = [[OFString alloc] initWithFormat:@"packages/%s/%s.cgz", pakname, mapname]; bakname = [[OFString alloc] initWithFormat:@"packages/%s/%s_%d.BAK", pakname, mapname, lastmillis]; pcfname = [[OFString alloc] initWithFormat:@"packages/%s/package.cfg", pakname]; mcfname = [[OFString alloc] initWithFormat:@"packages/%s/%s.cfg", pakname, mapname]; } } // the optimize routines below are here to reduce the detrimental effects of // messy mapping by setting certain properties (vdeltas and textures) to // neighbouring values wherever there is no visible difference. This allows the // mipmapper to generate more efficient mips. the reason it is done on save is // to reduce the amount spend in the mipmapper (as that is done in realtime). |
︙ | ︙ | |||
118 119 120 121 122 123 124 | } // these two are used by getmap/sendmap.. transfers compressed maps directly void writemap(OFString *mname, int msize, uchar *mdata) { | < | < | < | < | | > | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 | } // these two are used by getmap/sendmap.. transfers compressed maps directly void writemap(OFString *mname, int msize, uchar *mdata) { setnames(mname); backup(cgzname, bakname); FILE *f = fopen([cgzname cStringWithEncoding:OFLocale.encoding], "wb"); if (!f) { conoutf(@"could not write map to %s", cgzname); return; } fwrite(mdata, 1, msize, f); fclose(f); conoutf(@"wrote map %@ as file %s", mname, cgzname); } OFData * readmap(OFString *mname) { setnames(mname); return [OFData dataWithContentsOfFile:mname]; } // save map as .cgz file. uses 2 layers of compression: first does simple // run-length encoding and leaves out data for certain kinds of cubes, then zlib // removes the last bits of redundancy. Both passes contribute greatly to the // miniscule map sizes. void save_world(OFString *mname) { @autoreleasepool { resettagareas(); // wouldn't be able to reproduce tagged areas // otherwise voptimize(); toptimize(); if (mname.length == 0) mname = getclientmap(); setnames(mname); backup(cgzname, bakname); gzFile f = gzopen( [cgzname cStringWithEncoding:OFLocale.encoding], "wb9"); if (!f) { conoutf(@"could not write map to %s", cgzname); return; } hdr.version = MAPVERSION; hdr.numents = 0; loopv(ents) if (ents[i].type != NOTUSED) hdr.numents++; |
︙ | ︙ | |||
243 244 245 246 247 248 249 | } COMMANDN(savemap, save_world, ARG_1STR) void load_world(OFString *mname) // still supports all map formats that have existed // since the earliest cube betas! { | > | | | < | < | > | | | | | | | | | | | | | | | | | | | | | | | | | | | > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > | > | | | | | | | | | | | | | | | > | | | | | | | | | | > | | | | | | | | | | | | < < | < | | | 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 | } COMMANDN(savemap, save_world, ARG_1STR) void load_world(OFString *mname) // still supports all map formats that have existed // since the earliest cube betas! { @autoreleasepool { stopifrecording(); cleardlights(); pruneundos(); setnames(mname); gzFile f = gzopen( [cgzname cStringWithEncoding:OFLocale.encoding], "rb9"); if (!f) { conoutf(@"could not read map %s", cgzname); return; } gzread(f, &hdr, sizeof(header) - sizeof(int) * 16); endianswap(&hdr.version, sizeof(int), 4); if (strncmp(hdr.head, "CUBE", 4) != 0) fatal(@"while reading map: header malformatted"); if (hdr.version > MAPVERSION) fatal(@"this map requires a newer version of cube"); if (sfactor < SMALLEST_FACTOR || sfactor > LARGEST_FACTOR) fatal(@"illegal map size"); if (hdr.version >= 4) { gzread(f, &hdr.waterlevel, sizeof(int) * 16); endianswap(&hdr.waterlevel, sizeof(int), 16); } else { hdr.waterlevel = -100000; } ents.setsize(0); loopi(hdr.numents) { entity &e = ents.add(); gzread(f, &e, sizeof(persistent_entity)); endianswap(&e, sizeof(short), 4); e.spawned = false; if (e.type == LIGHT) { if (!e.attr2) e.attr2 = 255; // needed for MAPVERSION<=2 if (e.attr1 > 32) e.attr1 = 32; // 12_03 and below } } free(world); setupworld(hdr.sfactor); char texuse[256]; loopi(256) texuse[i] = 0; sqr *t = NULL; loopk(cubicsize) { sqr *s = &world[k]; int type = gzgetc(f); switch (type) { case 255: { int n = gzgetc(f); for (int i = 0; i < n; i++, k++) memcpy(&world[k], t, sizeof(sqr)); k--; break; } case 254: // only in MAPVERSION<=2 { memcpy(s, t, sizeof(sqr)); s->r = s->g = s->b = gzgetc(f); gzgetc(f); break; } case SOLID: { s->type = SOLID; s->wtex = gzgetc(f); s->vdelta = gzgetc(f); if (hdr.version <= 2) { gzgetc(f); gzgetc(f); } s->ftex = DEFAULT_FLOOR; s->ctex = DEFAULT_CEIL; s->utex = s->wtex; s->tag = 0; s->floor = 0; s->ceil = 16; break; } default: { if (type < 0 || type >= MAXTYPE) { OFString *t = [OFString stringWithFormat:@"%d @ %d", type, k]; fatal(@"while reading map: type out of " @"range: ", t); } s->type = type; s->floor = gzgetc(f); s->ceil = gzgetc(f); if (s->floor >= s->ceil) s->floor = s->ceil - 1; // for pre 12_13 s->wtex = gzgetc(f); s->ftex = gzgetc(f); s->ctex = gzgetc(f); if (hdr.version <= 2) { gzgetc(f); gzgetc(f); } s->vdelta = gzgetc(f); s->utex = (hdr.version >= 2) ? gzgetc(f) : s->wtex; s->tag = (hdr.version >= 5) ? gzgetc(f) : 0; s->type = type; } } s->defer = 0; t = s; texuse[s->wtex] = 1; if (!SOLID(s)) texuse[s->utex] = texuse[s->ftex] = texuse[s->ctex] = 1; } gzclose(f); calclight(); settagareas(); int xs, ys; loopi(256) if (texuse) lookuptexture(i, &xs, &ys); conoutf(@"read map %s (%d milliseconds)", cgzname, SDL_GetTicks() - lastmillis); conoutf(@"%s", hdr.maptitle); startmap(mname); loopl(256) { // can this be done smarter? OFString *aliasname = [OFString stringWithFormat:@"level_trigger_%d", l]; if (identexists(aliasname)) alias(aliasname, @""); } execfile(@"data/default_map_settings.cfg"); execfile(pcfname); execfile(mcfname); } } |