kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rewrite calculation of map geometry bounding box

Browse Source 
and rename client-side struct "mapdims" to clmapdims (to avoid confusion
with server-side data)
This commit is contained in:
ac-stef
2016-08-26 14:08:55 +02:00
parent 48e2ce3863
commit e1ce0979d0
13 changed files with 223 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/entities.cpp
+4 -4
View File
@@ -301,7 +301,7 @@ void renderentities()
}
break;
case CTFF_INBASE:
if(!numflagspawn[i]) break;
if(!clentstats.flags[i]) break;
case CTFF_DROPPED:
{
if(OUTBORD(f.pos.x, f.pos.y)) break;
@@ -469,7 +469,7 @@ void checkitems(playerent *d)
{
flaginfo &f = flaginfos[i];
entity &e = *f.flagent;
if(!e.spawned || !f.ack || (f.state == CTFF_INBASE && !numflagspawn[i])) continue;
if(!e.spawned || !f.ack || (f.state == CTFF_INBASE && !clentstats.flags[i])) continue;
if(OUTBORD(f.pos.x, f.pos.y)) continue;
if(f.state==CTFF_DROPPED) // 3d collision for dropped ctf flags
{
@@ -655,7 +655,7 @@ void flagidle(int flag)
flaginfos[flag].flagent->spawned = false;
}
void entstats(void)
void entstats_(void)
{
int entcnt[MAXENTTYPES] = {0}, clipents = 0, spawncnt[5] = {0};
loopv(ents)
@@ -693,7 +693,7 @@ void entstats(void)
conoutf("total entities: %d", ents.length());
}
COMMAND(entstats, "");
COMMANDN(entstats, entstats_, "");
vector<int> changedents;
int lastentsync = 0;