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

SimpleEntity subclass flags name now starts with ECF_ prefix

Browse source
This commit is contained in:
smallmodel 2023-11-16 23:11:48 +01:00
parent ce0e9fe77e
commit e50a041c12
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
22 changed files with 78 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

4
code/fgame/actor.cpp
View file

@ -2710,7 +2710,7 @@ Constructor
Actor::Actor()
: mVoiceType(-1)
{
entflags |= EF_ACTOR;
entflags |= ECF_ACTOR;
m_pszDebugState = "";
m_pFallPath = NULL;
@ -2963,7 +2963,7 @@ Actor::~Actor()
ClearPointEntity();
ClearTurnEntity();
entflags &= ~EF_ACTOR;
entflags &= ~ECF_ACTOR;
}
/*

4
code/fgame/animate.cpp
View file

@ -167,7 +167,7 @@ static size_t GetLongestClientCmdAllFramesLength(dtiki_t *tiki, int animnum, int
Animate::Animate()
{
entflags |= EF_ANIMATE;
entflags |= ECF_ANIMATE;
syncTime = 0.0f;
syncRate = 1.0f;
@ -198,7 +198,7 @@ Animate::Animate()
Animate::~Animate()
{
entflags &= ~EF_ANIMATE;
entflags &= ~ECF_ANIMATE;
}
void Animate::ForwardExec(Event *ev)

2
code/fgame/bg_public.h
View file

@ -389,6 +389,7 @@ movement on the server game.
// entityState_t->eFlags
// su44: eFlags used in MoHAA
#define EF_EVERYFRAME 0x00000008
#define EF_CLIMBWALL 0x00000010
#define EF_UNARMED 0x00000020 // su44: this player has his weapon holstered
#define EF_LINKANGLES 0x00000040
@ -422,7 +423,6 @@ movement on the server game.
#define EF_AWARD_ASSIST 0x00020000 // draw a assist sprite
#define EF_AWARD_DENIED 0x00040000 // denied
#define EF_TEAMVOTED 0x00080000 // already cast a team vote
#define EF_EVERYFRAME 0x00100000 // def commands will be run every client frame
#define EF_ANTISBJUICE 0x00200000 // anti sucknblow juice
#define EF_DONT_PROCESS_COMMANDS 0x00400000 // don't process client commands for this entity

2
code/fgame/bspline.cpp
View file

@ -542,7 +542,7 @@ CLASS_DECLARATION(Entity, SplinePath, "info_splinepath") {
SplinePath::SplinePath()
{
entflags |= EF_SPLINEPATH;
entflags |= ECF_SPLINEPATH;
AddWaitTill(STRING_REACH);

2
code/fgame/camera.cpp
View file

@ -702,7 +702,7 @@ Camera::Camera()
{
Vector ang;
entflags |= EF_CAMERA;
entflags |= ECF_CAMERA;
AddWaitTill(STRING_START);
AddWaitTill(STRING_TRIGGER);

2
code/fgame/crateobject.cpp
View file

@ -101,7 +101,7 @@ CLASS_DECLARATION(Entity, CrateObject, "func_crate") {
CrateObject::CrateObject()
{
entflags |= EF_CRATEOBJECT;
entflags |= ECF_CRATEOBJECT;
AddWaitTill(STRING_DEATH);

2
code/fgame/doors.cpp
View file

@ -321,7 +321,7 @@ Door::Door()
{
float t;
entflags |= EF_DOOR;
entflags |= ECF_DOOR;
if (LoadingSavegame) {
return;
}

4
code/fgame/entity.cpp
View file

@ -1686,7 +1686,7 @@ Entity::Entity()
entnum = edict->s.number;
radnum = -1;
entflags |= EF_ENTITY;
entflags |= ECF_ENTITY;
AddWaitTill(STRING_DAMAGE);
AddWaitTill(STRING_SPAWN);
@ -1852,7 +1852,7 @@ Entity::~Entity()
level.FreeEdict(edict);
entflags &= ~EF_ENTITY;
entflags &= ~ECF_ENTITY;
}
void Entity::ClassnameEvent(Event *ev)

4
code/fgame/inventoryitem.cpp
View file

@ -53,7 +53,7 @@ CLASS_DECLARATION( Weapon, InventoryItem, NULL )
InventoryItem::InventoryItem()
{
entflags |= EF_INVENTORYITEM;
entflags |= ECF_INVENTORYITEM;
if ( LoadingSavegame )
{
@ -65,7 +65,7 @@ InventoryItem::InventoryItem()
InventoryItem::~InventoryItem()
{
entflags &= ~EF_INVENTORYITEM;
entflags &= ~ECF_INVENTORYITEM;
}
void InventoryItem::ActivateItem

4
code/fgame/item.cpp
View file

@ -341,7 +341,7 @@ Item::Item()
{
str fullname;
entflags |= EF_ITEM;
entflags |= ECF_ITEM;
AddWaitTill(STRING_PICKUP);
@ -403,7 +403,7 @@ Item::~Item()
owner = NULL;
}
entflags &= ~EF_ITEM;
entflags &= ~ECF_ITEM;
}
void Item::RemoveFromOwner(void)

6
code/fgame/misc.cpp
View file

@ -1960,7 +1960,7 @@ CLASS_DECLARATION(SimpleArchivedEntity, Waypoint, "info_waypoint") {
Waypoint::Waypoint()
{
entflags |= EF_WAYPOINT;
entflags |= ECF_WAYPOINT;
}
CLASS_DECLARATION(SimpleArchivedEntity, TempWaypoint, NULL) {
@ -1969,7 +1969,7 @@ CLASS_DECLARATION(SimpleArchivedEntity, TempWaypoint, NULL) {
TempWaypoint::TempWaypoint()
{
entflags |= EF_TEMPWAYPOINT;
entflags |= ECF_TEMPWAYPOINT;
}
/*****************************************************************************/
@ -1988,7 +1988,7 @@ CLASS_DECLARATION(Waypoint, VehiclePoint, "info_vehiclepoint") {
VehiclePoint::VehiclePoint()
{
entflags |= EF_VEHICLEPOINT;
entflags |= ECF_VEHICLEPOINT;
spawnflags = 0;
}

4
code/fgame/navigate.cpp
View file

@ -1166,7 +1166,7 @@ void PathNode::operator delete(void *ptr)
PathNode::PathNode()
{
entflags |= EF_PATHNODE;
entflags |= ECF_PATHNODE;
findCount = 0;
pLastClaimer = NULL;
numChildren = 0;
@ -1186,7 +1186,7 @@ PathNode::PathNode()
PathNode::~PathNode()
{
entflags &= ~EF_PATHNODE;
entflags &= ~ECF_PATHNODE;
}
void PathNode::Remove(Event *ev)

4
code/fgame/player.cpp
View file

@ -1950,7 +1950,7 @@ Player::Player()
//
// set the entity type
//
entflags |= EF_PLAYER;
entflags |= ECF_PLAYER;
mCurTrailOrigin = 0;
mLastTrailTime = 0;
@ -2171,7 +2171,7 @@ Player::~Player()
legs_conditionals.FreeObjectList();
torso_conditionals.FreeObjectList();
entflags &= ~EF_PLAYER;
entflags &= ~ECF_PLAYER;
}
static qboolean logfile_started = qfalse;

2
code/fgame/playerbot.cpp
View file

@ -44,7 +44,7 @@ PlayerBot::botfunc_t PlayerBot::botfuncs[MAX_BOT_FUNCTIONS];
PlayerBot::PlayerBot()
{
entflags |= EF_BOT;
entflags |= ECF_BOT;
if (LoadingSavegame) {
return;

4
code/fgame/sentient.cpp
View file

@ -693,7 +693,7 @@ Sentient::Sentient()
: m_bIsAnimal(false)
{
SentientList.AddObject((Sentient *)this);
entflags |= EF_SENTIENT;
entflags |= ECF_SENTIENT;
m_bOvercookDied = false;
@ -824,7 +824,7 @@ Sentient::~Sentient()
SentientList.RemoveObject((Sentient *)this);
FreeInventory();
entflags &= ~EF_SENTIENT;
entflags &= ~ECF_SENTIENT;
}
void Sentient::Link()

44
code/fgame/simpleentity.cpp
View file

@ -253,112 +253,112 @@ SimpleEntity::~SimpleEntity()
int SimpleEntity::IsSubclassOfEntity(void) const
{
return (entflags & EF_ENTITY);
return (entflags & ECF_ENTITY);
}
int SimpleEntity::IsSubclassOfAnimate(void) const
{
return (entflags & EF_ANIMATE);
return (entflags & ECF_ANIMATE);
}
int SimpleEntity::IsSubclassOfSentient(void) const
{
return (entflags & EF_SENTIENT);
return (entflags & ECF_SENTIENT);
}
int SimpleEntity::IsSubclassOfPlayer(void) const
{
return (entflags & EF_PLAYER);
return (entflags & ECF_PLAYER);
}
int SimpleEntity::IsSubclassOfActor(void) const
{
return (entflags & EF_ACTOR);
return (entflags & ECF_ACTOR);
}
int SimpleEntity::IsSubclassOfItem(void) const
{
return (entflags & EF_ITEM);
return (entflags & ECF_ITEM);
}
int SimpleEntity::IsSubclassOfInventoryItem(void) const
{
return (entflags & EF_INVENTORYITEM);
return (entflags & ECF_INVENTORYITEM);
}
int SimpleEntity::IsSubclassOfWeapon(void) const
{
return (entflags & EF_WEAPON);
return (entflags & ECF_WEAPON);
}
int SimpleEntity::IsSubclassOfProjectile(void) const
{
return (entflags & EF_PROJECTILE);
return (entflags & ECF_PROJECTILE);
}
int SimpleEntity::IsSubclassOfDoor(void) const
{
return (entflags & EF_DOOR);
return (entflags & ECF_DOOR);
}
int SimpleEntity::IsSubclassOfCamera(void) const
{
return (entflags & EF_CAMERA);
return (entflags & ECF_CAMERA);
}
int SimpleEntity::IsSubclassOfVehicle(void) const
{
return (entflags & EF_VEHICLE);
return (entflags & ECF_VEHICLE);
}
int SimpleEntity::IsSubclassOfVehicleTank(void) const
{
return (entflags & EF_VEHICLETANK);
return (entflags & ECF_VEHICLETANK);
}
int SimpleEntity::IsSubclassOfVehicleTurretGun(void) const
{
return (entflags & EF_VEHICLETURRET);
return (entflags & ECF_VEHICLETURRET);
}
int SimpleEntity::IsSubclassOfTurretGun(void) const
{
return (entflags & EF_TURRET);
return (entflags & ECF_TURRET);
}
int SimpleEntity::IsSubclassOfPathNode(void) const
{
return (entflags & EF_PATHNODE);
return (entflags & ECF_PATHNODE);
}
int SimpleEntity::IsSubclassOfWaypoint(void) const
{
return (entflags & EF_WAYPOINT);
return (entflags & ECF_WAYPOINT);
}
int SimpleEntity::IsSubclassOfTempWaypoint(void) const
{
return (entflags & EF_TEMPWAYPOINT);
return (entflags & ECF_TEMPWAYPOINT);
}
int SimpleEntity::IsSubclassOfVehiclePoint(void) const
{
return (entflags & EF_VEHICLEPOINT);
return (entflags & ECF_VEHICLEPOINT);
}
int SimpleEntity::IsSubclassOfSplinePath(void) const
{
return (entflags & EF_SPLINEPATH);
return (entflags & ECF_SPLINEPATH);
}
int SimpleEntity::IsSubclassOfCrateObject(void) const
{
return (entflags & EF_CRATEOBJECT);
return (entflags & ECF_CRATEOBJECT);
}
int SimpleEntity::IsSubclassOfBot(void) const
{
return (entflags & EF_BOT);
return (entflags & ECF_BOT);
}
void SimpleEntity::SetTargetName(str targetname)

4
code/fgame/vehicle.cpp
View file

@ -960,7 +960,7 @@ Vehicle::Vehicle()
{
int i;
entflags |= EF_VEHICLE;
entflags |= ECF_VEHICLE;
AddWaitTill(STRING_DRIVE);
AddWaitTill(STRING_VEHICLEANIMDONE);
@ -1204,7 +1204,7 @@ Vehicle::~Vehicle()
m_pCollisionEntity->ProcessEvent(EV_Remove);
}
entflags &= ~EF_VEHICLE;
entflags &= ~ECF_VEHICLE;
}
/*

4
code/fgame/vehicleturret.cpp
View file

@ -210,7 +210,7 @@ CLASS_DECLARATION(TurretGun, VehicleTurretGun, NULL) {
VehicleTurretGun::VehicleTurretGun()
{
entflags |= EF_VEHICLETURRET;
entflags |= ECF_VEHICLETURRET;
AddWaitTill(STRING_DEATH);
@ -300,7 +300,7 @@ VehicleTurretGun::~VehicleTurretGun()
m_pCollisionEntity->PostEvent(EV_Remove, 0);
}
entflags &= ~EF_VEHICLETURRET;
entflags &= ~ECF_VEHICLETURRET;
}
void VehicleTurretGun::Think(void)

4
code/fgame/weapon.cpp
View file

@ -974,7 +974,7 @@ CLASS_DECLARATION(Item, Weapon, NULL) {
//======================
Weapon::Weapon()
{
entflags |= EF_WEAPON;
entflags |= ECF_WEAPON;
mAIRange = RANGE_SHORT;
@ -1192,7 +1192,7 @@ Weapon::~Weapon()
RemoveFromOwner();
}
entflags &= ~EF_WEAPON;
entflags &= ~ECF_WEAPON;
}
//======================

4
code/fgame/weapturret.cpp
View file

@ -394,7 +394,7 @@ CLASS_DECLARATION(Weapon, TurretGun, NULL) {
TurretGun::TurretGun()
{
entflags |= EF_TURRET;
entflags |= ECF_TURRET;
AddWaitTill(STRING_ONTARGET);
@ -522,7 +522,7 @@ TurretGun::~TurretGun()
player->ExitTurret();
}
entflags &= ~EF_TURRET;
entflags &= ~ECF_TURRET;
}
void TurretGun::PlaceTurret(Event *ev)

2
code/fgame/weaputils.cpp
View file

@ -595,7 +595,7 @@ CLASS_DECLARATION(Animate, Projectile, NULL) {
Projectile::Projectile()
{
entflags |= EF_PROJECTILE;
entflags |= ECF_PROJECTILE;
if (LoadingSavegame) {
// Archive function will setup all necessary data

44
code/qcommon/listener.h
View file

@ -42,28 +42,28 @@ class Archiver;
class EventQueueNode;
// entity subclass
#define EF_ENTITY (1 << 0)
#define EF_ANIMATE (1 << 1)
#define EF_SENTIENT (1 << 2)
#define EF_PLAYER (1 << 3)
#define EF_ACTOR (1 << 4)
#define EF_ITEM (1 << 5)
#define EF_INVENTORYITEM (1 << 6)
#define EF_WEAPON (1 << 7)
#define EF_PROJECTILE (1 << 8)
#define EF_DOOR (1 << 9)
#define EF_CAMERA (1 << 10)
#define EF_VEHICLE (1 << 11)
#define EF_VEHICLETANK (1 << 12)
#define EF_VEHICLETURRET (1 << 13)
#define EF_TURRET (1 << 14)
#define EF_PATHNODE (1 << 15)
#define EF_WAYPOINT (1 << 16)
#define EF_TEMPWAYPOINT (1 << 17)
#define EF_VEHICLEPOINT (1 << 18)
#define EF_SPLINEPATH (1 << 19)
#define EF_CRATEOBJECT (1 << 20)
#define EF_BOT (1 << 21)
#define ECF_ENTITY (1 << 0)
#define ECF_ANIMATE (1 << 1)
#define ECF_SENTIENT (1 << 2)
#define ECF_PLAYER (1 << 3)
#define ECF_ACTOR (1 << 4)
#define ECF_ITEM (1 << 5)
#define ECF_INVENTORYITEM (1 << 6)
#define ECF_WEAPON (1 << 7)
#define ECF_PROJECTILE (1 << 8)
#define ECF_DOOR (1 << 9)
#define ECF_CAMERA (1 << 10)
#define ECF_VEHICLE (1 << 11)
#define ECF_VEHICLETANK (1 << 12)
#define ECF_VEHICLETURRET (1 << 13)
#define ECF_TURRET (1 << 14)
#define ECF_PATHNODE (1 << 15)
#define ECF_WAYPOINT (1 << 16)
#define ECF_TEMPWAYPOINT (1 << 17)
#define ECF_VEHICLEPOINT (1 << 18)
#define ECF_SPLINEPATH (1 << 19)
#define ECF_CRATEOBJECT (1 << 20)
#define ECF_BOT (1 << 21)
// Event flags
#define EV_CONSOLE (1 << 0) // Allow entry from console