Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 13:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Refactored svflags and use the correct entity server flags

Browse source
This commit is contained in:
smallmodel 2024-09-30 19:58:41 +02:00
parent c406aaf74f
commit 3a7e249edf
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
3 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
code/fgame/damagemodel.cpp
View file

@ -286,7 +286,7 @@ void DamageModel::SpawnOrientedBoundingBox(Event *ev)
yawoffset = ev->GetFloat(3);
boundingBoxEnt = new Entity();
boundingBoxEnt->edict->r.svFlags |= SVF_PORTAL;
boundingBoxEnt->edict->r.svFlags |= SVF_SENDPVS;
boundingBoxEnt->edict->s.eFlags |= EF_LINKANGLES;
boundingBoxEnt->edict->r.contents = CONTENTS_SOLID;
boundingBoxEnt->setSolidType(SOLID_BBOX);

43
code/fgame/g_public.h
View file

@ -36,29 +36,28 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// the server does not know how to interpret most of the values
// in entityStates (level eType), so the game must explicitly flag
// special server behaviors
#define SVF_NOCLIENT 0x00000001 // don't send entity to clients, even if it has effects
#define SVF_NOCLIENT (1<<0) // don't send entity to clients, even if it has effects
#define SVF_BOT (1<<1)
#define SVF_BROADCAST (1<<2) // send to all connected clients
#define SVF_PORTAL (1<<3) // merge a second pvs at origin2 into snapshots
#define SVF_SENDPVS (1<<4) // even though it doesn't have a sound or modelindex, still run it through the pvs
#define SVF_USE_CURRENT_ORIGIN (1<<5) // entity->currentOrigin instead of entity->s.origin
// for link position (missiles and movers)
#define SVF_NOTSINGLECLIENT (1<<6) // send entity to everyone but one client
// (entityShared_t->singleClient)
#define SVF_MONSTER (1<<7) // treat as CONTENTS_MONSTER for collision
#define SVF_SINGLECLIENT (1<<8) // only send to a single client (entityShared_t->singleClient)
#define SVF_USEBBOX (1<<9) // do not perform perfect collision use the bbox instead
#define SVF_NOFARPLANE (1<<10) // only send this entity to its parent
#define SVF_HIDEOWNER (1<<11) // hide the owner of the client
#define SVF_MONSTERCLIP (1<<12) // treat as CONTENTS_MONSTERCLIP for collision
#define SVF_PLAYERCLIP (1<<13) // treat as CONTENTS_PLAYERCLIP for collision
#define SVF_SENDONCE (1<<14) // Send this entity over the network at least one time
#define SVF_SENT (1<<15) // This flag is set when the entity has been sent over at least one time
// TTimo
// https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=551
#define SVF_CLIENTMASK 0x00000002
#define SVF_BROADCAST 0x00000004 // send to all connected clients
#define SVF_SENDPVS 0x00000008
#define SVF_PORTAL 0x00000010 // merge a second pvs at origin2
#define SVF_NOTSINGLECLIENT \
0x00000040 // send entity to everyone but one client \
// (entityShared_t->singleClient)
#define SVF_MONSTER 0x00000080 // set if the entity is a bot into snapshots
#define SVF_SINGLECLIENT 0x00000100 // only send to a single client (entityShared_t->singleClient)
#define SVF_USEBBOX 0x00000200
#define SVF_NOFARPLANE 0x00000400
#define SVF_NOSERVERINFO \
0x00000800 // don't send CS_SERVERINFO updates to this client \
// so that it can be updated for ping tools without \
// lagging clients
#define SVF_SENDONCE 0x00004000
#define SVF_SENT 0x00008000
#define SVF_NOSERVERINFO (1<<16) // don't send CS_SERVERINFO updates to this client
// so that it can be updated for ping tools without
// lagging clients
typedef struct gclient_s gclient_t;
typedef struct dtiki_s dtiki_t;

8
code/server/sv_snapshot.c
View file

@ -444,7 +444,7 @@ SV_AddEntToSnapshot
static void SV_AddEntToSnapshot( svEntity_t *svEnt, gentity_t *gEnt, snapshotEntityNumbers_t *eNums, svEntity_t* portalEnt, qboolean portalsky) {
// if we have already added this entity to this snapshot, don't add again
if ( svEnt->snapshotCounter == sv.snapshotCounter ) {
gEnt->s.renderfx &= ~RF_SHADOW_PLANE;
gEnt->s.renderfx &= ~(RF_SHADOW_PLANE | RF_WRAP_FRAMES);
gEnt->s.renderfx |= RF_WRAP_FRAMES;
return;
}
@ -592,12 +592,16 @@ static void SV_AddEntitiesVisibleFromPoint(const vec3_t origin, clientSnapshot_t
}
}
// entities can be flagged to be sent to a given mask of clients
// Removed in OPM
// This doesn't make sense it it only supports half of the client
/*
if ( ent->r.svFlags & SVF_CLIENTMASK ) {
if (frame->ps.clientNum >= 32)
Com_Error( ERR_DROP, "SVF_CLIENTMASK: clientNum > 32\n" );
if (~ent->r.singleClient & (1 << frame->ps.clientNum))
continue;
}
*/
parentEnt = NULL;
if (ent->s.parent != ENTITYNUM_NONE) {
@ -648,7 +652,7 @@ static void SV_AddEntitiesVisibleFromPoint(const vec3_t origin, clientSnapshot_t
svCheckEnt = svEnt;
}
if (!(ent->r.svFlags & SVF_PORTAL) && !ent->s.modelindex && !ent->s.loopSound) {
if (!(ent->r.svFlags & SVF_SENDPVS) && !ent->s.modelindex && !ent->s.loopSound) {
// don't send entities that have nothing to draw
continue;
}