Differences From Artifact [2ac8b85a8f]:
- File
src/world.mm
— part of check-in
[489124a92f]
at
2025-03-16 10:11:39
on branch trunk
— Use one autorelease pool per frame
This way, nowhere else autorelease pools need to be managed. (user: js, size: 10859) [annotate] [blame] [check-ins using]
To Artifact [ffa7840406]:
- File src/world.mm — part of check-in [4b002822f9] at 2025-03-20 16:04:35 on branch trunk — Convert entity to a class (user: js, size: 11045) [annotate] [blame] [check-ins using]
1 2 3 4 5 6 7 8 9 10 11 12 | // world.cpp: core map management stuff #include "cube.h" #import "DynamicEntity.h" extern OFString *entnames[]; // lookup from map entities above to strings sqr *world = NULL; int sfactor, ssize, cubicsize, mipsize; header hdr; | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 | // world.cpp: core map management stuff #include "cube.h" #import "DynamicEntity.h" #import "Entity.h" extern OFString *entnames[]; // lookup from map entities above to strings sqr *world = NULL; int sfactor, ssize, cubicsize, mipsize; header hdr; |
︙ | ︙ | |||
49 50 51 52 53 54 55 | { settag(0, 0); } // reset for editing or map saving void settagareas() { settag(0, 1); | > > | > > | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | { settag(0, 0); } // reset for editing or map saving void settagareas() { settag(0, 1); [ents enumerateObjectsUsingBlock:^(Entity *e, size_t i, bool *stop) { if (ents[i].type == CARROT) setspawn(i, true); }]; } // set for playing void trigger(int tag, int type, bool savegame) { if (!tag) return; |
︙ | ︙ | |||
252 253 254 255 256 257 258 | } int closestent() // used for delent and edit mode ent display { if (noteditmode()) return -1; | > | | | < < > | > | | | 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 | } int closestent() // used for delent and edit mode ent display { if (noteditmode()) return -1; __block int best; __block float bdist = 99999; [ents enumerateObjectsUsingBlock:^(Entity *e, size_t i, bool *stop) { if (e.type == NOTUSED) return; OFVector3D v = OFMakeVector3D(e.x, e.y, e.z); vdist(dist, t, player1.o, v); if (dist < bdist) { best = i; bdist = dist; } }]; return (bdist == 99999 ? -1 : best); } void entproperty(int prop, int amount) { int e = closestent(); if (e < 0) |
︙ | ︙ | |||
315 316 317 318 319 320 321 | findtype(OFString *what) { loopi(MAXENTTYPES) if ([what isEqual:entnames[i]]) return i; conoutf(@"unknown entity type \"%@\"", what); return NOTUSED; } | | | > > > > > > > > > | | > | > > | > < | | | | | | | < < > > | | | > | | 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 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 | findtype(OFString *what) { loopi(MAXENTTYPES) if ([what isEqual:entnames[i]]) return i; conoutf(@"unknown entity type \"%@\"", what); return NOTUSED; } Entity * newentity(int x, int y, int z, OFString *what, int v1, int v2, int v3, int v4) { int type = findtype(what); PersistentEntity *e = [PersistentEntity entity]; e.x = x; e.y = y; e.z = z; e.attr1 = v1; e.type = type; e.attr2 = v2; e.attr3 = v3; e.attr4 = v4; switch (type) { case LIGHT: if (v1 > 32) v1 = 32; if (!v1) e.attr1 = 16; if (!v2 && !v3 && !v4) e.attr2 = 255; break; case MAPMODEL: e.attr4 = e.attr3; e.attr3 = e.attr2; case MONSTER: case TELEDEST: e.attr2 = (uchar)e.attr1; case PLAYERSTART: e.attr1 = (int)player1.yaw; break; } addmsg(1, 10, SV_EDITENT, ents.count, type, e.x, e.y, e.z, e.attr1, e.attr2, e.attr3, e.attr4); [ents addObject:e]; // unsafe! if (type == LIGHT) calclight(); return e; } void clearents(OFString *name) { int type = findtype(name); if (noteditmode() || multiplayer()) return; for (Entity *e in ents) if (e.type == type) e.type = NOTUSED; if (type == LIGHT) calclight(); } COMMAND(clearents, ARG_1STR) static uchar scalecomp(uchar c, int intens) { int n = c * intens / 100; if (n > 255) n = 255; return n; } void scalelights(int f, int intens) { for (Entity *e in ents) { if (e.type != LIGHT) continue; e.attr1 = e.attr1 * f / 100; if (e.attr1 < 2) e.attr1 = 2; if (e.attr1 > 32) e.attr1 = 32; if (intens) { e.attr2 = scalecomp(e.attr2, intens); e.attr3 = scalecomp(e.attr3, intens); e.attr4 = scalecomp(e.attr4, intens); } } calclight(); } COMMAND(scalelights, ARG_2INT) int findentity(int type, int index) { for (int i = index; i < ents.count; i++) if (ents[i].type == type) return i; loopj(index) if (ents[j].type == type) return j; return -1; } sqr *wmip[LARGEST_FACTOR * 2]; |
︙ | ︙ | |||
470 471 472 473 474 475 476 | if (copy) { loop(x, ssize / 2) loop(y, ssize / 2) { *S(x + ssize / 4, y + ssize / 4) = *SWS(oldworld, x, y, ssize / 2); } | < | > | | | | 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 | if (copy) { loop(x, ssize / 2) loop(y, ssize / 2) { *S(x + ssize / 4, y + ssize / 4) = *SWS(oldworld, x, y, ssize / 2); } for (Entity *e in ents) { e.x += ssize / 4; e.y += ssize / 4; } } else { char buffer[128] = "Untitled Map by Unknown"; memcpy(hdr.maptitle, buffer, 128); hdr.waterlevel = -100000; loopi(15) hdr.reserved[i] = 0; loopk(3) loopi(256) hdr.texlists[k][i] = i; [ents removeAllObjects]; block b = { 8, 8, ssize - 16, ssize - 16 }; edittypexy(SPACE, b); } calclight(); startmap(@"base/unnamed"); if (oldworld) { |
︙ | ︙ |