1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
// world.cpp: core map management stuff
#include "cube.h"
#import "Command.h"
#import "DynamicEntity.h"
#import "Entity.h"
#import "Monster.h"
extern OFString *entnames[]; // lookup from map entities above to strings
struct sqr *world = NULL;
int sfactor, ssize, cubicsize, mipsize;
struct header hdr;
|
<
>
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
// world.cpp: core map management stuff
#include "cube.h"
#import "Command.h"
#import "Entity.h"
#import "Monster.h"
#import "Player.h"
extern OFString *entnames[]; // lookup from map entities above to strings
struct sqr *world = NULL;
int sfactor, ssize, cubicsize, mipsize;
struct header hdr;
|
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
|
__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);
float dist = OFDistanceOfVectors3D(v, player1.origin);
if (dist < bdist) {
best = i;
bdist = dist;
}
}];
return (bdist == 99999 ? -1 : best);
|
|
|
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
|
__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);
float dist = OFDistanceOfVectors3D(v, Player.player1.origin);
if (dist < bdist) {
best = i;
bdist = dist;
}
}];
return (bdist == 99999 ? -1 : best);
|
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
|
case MAPMODEL:
e.attr4 = e.attr3;
e.attr3 = e.attr2;
case MONSTER:
case TELEDEST:
e.attr2 = (unsigned char)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];
|
|
|
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
|
case MAPMODEL:
e.attr4 = e.attr3;
e.attr3 = e.attr2;
case MONSTER:
case TELEDEST:
e.attr2 = (unsigned char)e.attr1;
case PLAYERSTART:
e.attr1 = (int)Player.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];
|