vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Clear warnings.

Browse source
This commit is contained in:
Marco Cawthorne 2024-07-18 13:04:42 -07:00
parent 965d9e96d6
commit e9145091fd
Signed by: eukara
GPG key ID: CE2032F0A2882A22
26 changed files with 89 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/EntityGuide.md
View file

@ -1,4 +0,0 @@
# Entity Guide
# Overview

1
Doxyfile
View file

@ -888,7 +888,6 @@ INPUT = src/ \
Documentation/Bots/ \
Documentation/Modules.md \
Documentation/Modules/ \
Documentation/EntityGuide.md \
Documentation/Classes.md \
Documentation/Singleplayer.md \
Documentation/Singleplayer/ \

4
src/botlib/chat.qc
View file

@ -17,11 +17,11 @@
void
NSBot::ChatSay(string msg)
{
g_grMode.ChatMessageAll(this, msg);
g_grMode.ChatMessageAll((NSClient)this, msg);
}
void
NSBot::ChatSayTeam(string msg)
{
g_grMode.ChatMessageTeam(this, msg);
g_grMode.ChatMessageTeam((NSClient)this, msg);
}

2
src/client/NSView.qc
View file

@ -486,5 +486,5 @@ NSView::UpdateView(void)
if (!m_soundScape)
return;
m_soundScape.DebugDraw(m_vecPosition);
m_soundScape.DebugDraw();
}

2
src/gs-entbase/server/button_target.qc
View file

@ -75,7 +75,7 @@ button_target::Respawn(void)
} else {
SetHealth(1);
SetTakedamage(DAMAGE_YES);
Pain = Death = Damage;
Pain = Death = Damaged;
}
/* purely cosmetic */

6
src/gs-entbase/server/func_button.qc
View file

@ -88,7 +88,7 @@ public:
virtual void Touch(entity);
virtual void Blocked(entity);
virtual void Trigger(entity, triggermode_t);
nonvirtual void DeathTrigger(void);
nonvirtual void DeathTrigger(entity, entity, int, vector, int);
virtual void PlayerUse(void);
virtual void MoverStartsMoving(void);
@ -390,10 +390,10 @@ func_button::Trigger(entity act, triggermode_t state)
}
void
func_button::DeathTrigger(void)
func_button::DeathTrigger(entity inflictor, entity attacker, int damage, vector dir, int location)
{
MakeInvulnerable();
Trigger(g_dmg_eAttacker, TRIG_TOGGLE);
Trigger(attacker, TRIG_TOGGLE);
}
void

24
src/gs-entbase/server/func_train.qc
View file

@ -194,20 +194,28 @@ func_train::Respawn(void)
void
func_train::Blocked(entity eBlocker)
{
vector center;
vector dmgDir;
NSDict damageDecl;
/* HACK: Make corpses gib instantly */
if (eBlocker.solid == SOLID_CORPSE) {
vector center = WorldSpaceCenter();
vector dmgDir = dirFromTarget(center, eBlocker.origin);
string dmgDef = sprintf("\"damage\" \"%i\"", 500i);
entityDamage(eBlocker, this, eBlocker, dmgDef, "", center, dmgDir, eBlocker.origin);
center = WorldSpaceCenter();
dmgDir = dirFromTarget(center, eBlocker.origin);
damageDecl = spawn(NSDict);
damageDecl.AddKey("damage", "500");
entityDamage(eBlocker, this, eBlocker, damageDecl.GetDeclBody(), "", center, dmgDir, eBlocker.origin);
remove(damageDecl);
return;
}
if (eBlocker.takedamage != DAMAGE_NO) {
vector center = WorldSpaceCenter();
vector dmgDir = dirFromTarget(center, eBlocker.origin);
string dmgDef = sprintf("\"damage\" \"%i\"", (int)m_flDamage);
entityDamage(eBlocker, this, eBlocker, dmgDef, "", center, dmgDir, eBlocker.origin);
center = WorldSpaceCenter();
dmgDir = dirFromTarget(center, eBlocker.origin);
damageDecl = spawn(NSDict);
damageDecl.AddKey("damage", ftos(m_flDamage));
entityDamage(eBlocker, this, eBlocker, damageDecl.GetDeclBody(), "", center, dmgDir, eBlocker.origin);
remove(damageDecl);
} else {
remove(eBlocker);
}

15
src/gs-entbase/server/game_player_team.qc
View file

@ -54,6 +54,7 @@ game_player_team::Trigger(entity entityActivator, triggermode_t state)
{
NSClientPlayer targetPlayer = __NULL__;
game_team_master toRead = __NULL__;
NSDict damageDecl;
if (GetMaster(entityActivator) == FALSE) {
return;
@ -70,11 +71,17 @@ game_player_team::Trigger(entity entityActivator, triggermode_t state)
targetPlayer.SetTeam((float)toRead.GetTeamIndex());
if (HasSpawnFlags(4) == true) {
string damageDef = sprintf("\"damage\" \"%i\"\n\"skip_armor\" \"1\"", targetPlayer.health + 100i);
entityDamage(targetPlayer, this, targetPlayer, damageDef, "", GetOrigin(), g_vec_null, targetPlayer.origin);
damageDecl = spawn(NSDict);
damageDecl.AddKey("damage", ftos(targetPlayer.health + 100));
damageDecl.AddKey("skip_armor", "1");
entityDamage(targetPlayer, this, targetPlayer, damageDecl.GetDeclBody(), "", GetOrigin(), g_vec_null, targetPlayer.origin);
remove(damageDecl);
} else if (HasSpawnFlags(2) == true) {
string damageDef = sprintf("\"damage\" \"%i\"\n\"skip_armor\" \"1\"", targetPlayer.health);
entityDamage(targetPlayer, this, targetPlayer, damageDef, "", GetOrigin(), g_vec_null, targetPlayer.origin);
damageDecl = spawn(NSDict);
damageDecl.AddKey("damage", ftos(targetPlayer.health));
damageDecl.AddKey("skip_armor", "1");
entityDamage(targetPlayer, this, targetPlayer, damageDecl.GetDeclBody(), "", GetOrigin(), g_vec_null, targetPlayer.origin);
remove(damageDecl);
}
if (HasSpawnFlags(1)) {

3
src/gs-entbase/server/item_healthcharger.qc
View file

@ -67,6 +67,8 @@ public:
nonvirtual void UpdateProgress(void);
nonvirtual void Disable(void);
nonvirtual void Enable(void);
nonvirtual void GiveShot(void);
nonvirtual void RetractShot(void);
private:
entity m_toucher;
@ -354,7 +356,6 @@ item_healthcharger::customphysics(void)
{
if ((health && m_toucher) && (GetFrame() == HEALTHCHARGER_FRAMEGROUP_DEPLOY || GetFrame() == HEALTHCHARGER_FRAMEGROUP_RETRACTSHOT || GetFrame() == HEALTHCHARGER_FRAMEGROUP_GIVESHOT)) {
vector vecDelta;
float headYaw;
vecDelta = vectorNormalize(m_toucher.origin - GetOrigin() );
m_flSwingArm = ((1.0 + (vecDelta * anglesToRight(angles))) * 0.5);
m_flSwingArm = lerp(-80, 90, 1.0 - m_flSwingArm);

3
src/gs-entbase/server/item_recharge.qc
View file

@ -67,6 +67,8 @@ public:
nonvirtual void UpdateProgress(void);
nonvirtual void Disable(void);
nonvirtual void Enable(void);
nonvirtual void GiveShot(void);
nonvirtual void RetractShot(void);
private:
entity m_toucher;
@ -354,7 +356,6 @@ item_recharge::customphysics(void)
{
if ((health && m_toucher) && (GetFrame() == HEALTHCHARGER_FRAMEGROUP_DEPLOY || GetFrame() == HEALTHCHARGER_FRAMEGROUP_RETRACTSHOT || GetFrame() == HEALTHCHARGER_FRAMEGROUP_GIVESHOT)) {
vector vecDelta;
float headYaw;
vecDelta = vectorNormalize(m_toucher.origin - GetOrigin() );
m_flSwingArm = ((1.0 + (vecDelta * anglesToRight(angles))) * 0.5);
m_flSwingArm = lerp(-80, 90, 1.0 - m_flSwingArm);

8
src/gs-entbase/shared/env_beam.qc
View file

@ -209,9 +209,13 @@ env_beam::CastLaser(void)
if (trace_ent.takedamage == DAMAGE_NO)
return;
NSDict damageDecl = spawn(NSDict);
vector center = WorldSpaceCenter();
string dmgDef = sprintf("\"damage\" \"%i\"\n\"type\" \"electro\"", m_iDamage);
entityDamage(trace_ent, this, trace_ent, dmgDef, "", center, g_vec_null, trace_ent.origin);
damageDecl.AddKey("damage", itos(m_iDamage));
damageDecl.AddKey("type", "electro");
entityDamage(trace_ent, this, trace_ent, damageDecl.GetDeclBody(), "", center, g_vec_null, trace_ent.origin);
remove(damageDecl);
}
/* called first */

8
src/gs-entbase/shared/env_laser.qc
View file

@ -177,9 +177,13 @@ env_laser::CastLaser(void)
if (trace_ent.takedamage == DAMAGE_NO)
return;
NSDict damageDecl = spawn(NSDict);
vector center = WorldSpaceCenter();
string dmgDef = sprintf("\"damage\" \"%i\"\n\"type\" \"electro\"", m_iDamage);
entityDamage(trace_ent, this, trace_ent, dmgDef, "", center, g_vec_null, trace_ent.origin);
damageDecl.AddKey("damage", itos(m_iDamage));
damageDecl.AddKey("type", "electro");
entityDamage(trace_ent, this, trace_ent, damageDecl.GetDeclBody(), "", center, g_vec_null, trace_ent.origin);
remove(damageDecl);
m_flTraceTime = time + 1.0f;
}

1
src/gs-entbase/shared/func_tankmortar.qc
View file

@ -333,7 +333,6 @@ func_tankmortar::PlayerInput(void)
if (input_buttons & INPUT_BUTTON0) {
vector spos;
vector dir;
float dmg;
float damageRange;
/* barrel tip offset */

1
src/nav/node_edit.qc
View file

@ -353,6 +353,7 @@ NodeEdit_SaveFile(string filename)
}
fclose(file);
return (true);
}
void

2
src/nav/nodes.qc
View file

@ -187,5 +187,5 @@ Nodes_Init(void)
void
Nodes_Flush(void)
{
NodeEdit_Flush(g_pNodes, g_iNodes);
NodeEdit_Flush();
}

4
src/server/cmd_sv.qc
View file

@ -242,10 +242,10 @@ Cmd_ParseServerCommand(void)
CMD_TraceMaterial();
break;
case "listPlayerInventory":
NSNavAI_ListInventory(self);
NSNavAI_ListInventory((NSNavAI)self);
break;
case "listInventory":
NSNavAI_ListInventory(self);
NSNavAI_ListInventory((NSNavAI)self);
break;
default:
return (false);

1
src/server/defs.h
View file

@ -124,7 +124,6 @@ string __fullspawndata;
NSEntity g_dmg_eAttacker;
NSEntity g_dmg_eTarget;
int g_dmg_iDamage;
int g_dmg_iRealDamage;
bodyType_t g_dmg_iHitBody;
int g_dmg_iFlags;
int g_dmg_iWeapon;

4
src/shared/NSClientPlayer.qc
View file

@ -1010,10 +1010,10 @@ NSClientPlayer::Restore(string strKey, string strValue)
g_items = ReadInt(strValue);
break;
case "m_itemList":
m_itemList = ReadEntity(strValue);
m_itemList = (NSItem)ReadEntity(strValue);
break;
case "m_activeWeapon":
m_activeWeapon = ReadEntity(strValue);
m_activeWeapon = (NSWeapon)ReadEntity(strValue);
break;
case "vehicle":
vehicle = ReadEntity(strValue);

2
src/shared/NSDict.qc
View file

@ -49,6 +49,8 @@ NSDict::GetString(string keyName)
return argv(c+1);
}
}
return "";
}
vector

10
src/shared/NSEntity.qc
View file

@ -1415,9 +1415,9 @@ NSEntity::_ProjectileAttack(string defName, bool wasReleased)
{
#ifdef SERVER
string attackDef;
int numProjectiles = EntityDef_GetKeyValue(defName, "numProjectiles");
float sX = stof(EntityDef_GetKeyValue(defName, "spread_x"));
float sY = stof(EntityDef_GetKeyValue(defName, "spread_y"));
int numProjectiles = GetSubDefInt(defName, "numProjectiles");
float sX = GetSubDefFloat(defName, "spread_x");
float sY = GetSubDefFloat(defName, "spread_y");
/* always fire at least 1 */
if (numProjectiles <= 0i) {
@ -1425,9 +1425,9 @@ NSEntity::_ProjectileAttack(string defName, bool wasReleased)
}
if (wasReleased == true) {
attackDef = EntityDef_GetKeyValue(defName, "def_onRelease");
attackDef = GetSubDefString(defName, "def_onRelease");
} else {
attackDef = EntityDef_GetKeyValue(defName, "def_onFire");
attackDef = GetSubDefString(defName, "def_onFire");
}
for (int i = 0i; i < numProjectiles; i++) {

6
src/shared/NSNavAI.qc
View file

@ -701,7 +701,7 @@ NSNavAI::GiveItem(string itemName)
/* TODO: Replace this with a 'SwitchBest' type function? */
/* we have no active weapon, and this is our pick */
if (!m_activeWeapon && m_itemList.IsWeapon() == true) {
m_activeWeapon = m_itemList;
m_activeWeapon = (NSWeapon)m_itemList;
m_activeWeapon._SwitchedToCallback();
//m_activeWeapon.PrintDebugInfo();
}
@ -710,7 +710,7 @@ NSNavAI::GiveItem(string itemName)
}
/* since we have something in the inventory, start there */
linkedList = m_itemList;
linkedList = (NSWeapon)m_itemList;
/* iterate through the inventory, then figure out if we already have it*/
while (linkedList) {
@ -742,7 +742,7 @@ NSNavAI::GiveItem(string itemName)
/* TODO: Replace this with a 'SwitchBest' type function? */
/* we have no active weapon, and this is our pick */
if (!m_activeWeapon && linkedList.IsWeapon() == true) {
m_activeWeapon = linkedList;
m_activeWeapon = (NSWeapon)linkedList;
m_activeWeapon._SwitchedToCallback();
//m_activeWeapon.PrintDebugInfo();
}

3
src/shared/NSSoundScape.h
View file

@ -109,6 +109,9 @@ public:
nonvirtual void SetRoomRolloffFactor(float);
/** Decay HF Limit, integer value. Values are `0i` (false) and `1i` (true). Default is `1i` (true). */
nonvirtual void SetDecayHFLimit(int);
/** Sets the radius of the soundscape. When a client is outside the radius the effects are nil. */
nonvirtual void SetRadius(float);
#endif
#ifdef CLIENT

4
src/shared/NSSoundScape.qc
View file

@ -773,7 +773,7 @@ NSSoundScape::SetupEFXReverb(reverbinfo_t *info)
info->flDensity = m_density;
info->flDiffusion = m_diffusion;
info->flGain = m_gain;
info->flGainHF = m_gainHF;
info->flGainHF = m_gainHF;
info->flGainLF = m_gainLF;
info->flDecayTime = m_decayTime;
info->flDecayHFRatio = m_decayHFRatio;
@ -902,4 +902,4 @@ EFX_UpdateListener(NSView playerView)
EFX_UpdateSoundScape(bestScape);
lastScape = bestScape;
}
#endif
#endif

2
src/shared/NSSurfacePropEntity.h
View file

@ -87,7 +87,7 @@ public:
/** Called when the health is equal or below 0 */
virtual void Death(entity, entity, int, vector, int);
/** Called when the health is equal or below 0 */
virtual void BreakModel(int, vector, vector);
virtual void BreakModel(int, vector, int);
/** Returns whether or not the entity is alive. That is different from having health, as the entity may be a corpse that can be destroyed further.*/
virtual bool IsAlive(void);

4
src/shared/NSSurfacePropEntity.qc
View file

@ -243,7 +243,7 @@ NSSurfacePropEntity::ParentUpdate(void)
void
NSSurfacePropEntity::Damage(entity inflictor, entity attacker, string damageDef, float damageScale, vector dmgDir, vector hitLocation)
{
bool defBody = EntityDef_IDFromName(damageDef) == -1i : true : false;
bool defBody = EntityDef_IDFromName(damageDef) == -1i ? true : false;
string damageString;
if (defBody == true) {
@ -499,7 +499,7 @@ NSSurfacePropEntity::DamageFeedback(entity theVictim, entity theInflictor, int d
}
void
NSSurfacePropEntity::BreakModel(int damage, vector dir, vector location)
NSSurfacePropEntity::BreakModel(int damage, vector dir, int location)
{
m_flDeathTime = time;

29
src/shared/NSWeapon.qc
View file

@ -763,7 +763,6 @@ NSWeapon::Attack(string fireInfo)
vector traceStart = ourOwner.GetEyePos();
vector traceEnd = traceStart + (anglesToForward(eyeAngles) * meleeRange);
float meleeRate;
NSSurfacePropEntity targetEnt;
ourOwner.hitcontentsmaski = (CONTENTBITS_POINTSOLID | CONTENTBIT_CORPSE);
traceline(traceStart, traceEnd, MOVE_NORMAL, ourOwner);
@ -789,6 +788,7 @@ NSWeapon::Attack(string fireInfo)
/* don't bother with decals, we got squibs */
if (trace_ent.iBleeds) {
NSSurfacePropEntity targetEnt;
targetEnt = (NSSurfacePropEntity)trace_ent;
FX_Blood(trace_endpos, targetEnt.GetBloodColor());
}
@ -1362,12 +1362,13 @@ isWeaponDetonationTimed(string weaponDef)
.NSWeapon m_prevWeapon;
NSWeapon
NSWeapon_SortWeaponChain(NSClientPlayer targetPlayer)
NSWeapon_SortWeaponChain(NSNavAI targetPlayer)
{
NSWeapon itemChain = targetPlayer.m_itemList;
NSWeapon itemChain = (NSWeapon)targetPlayer.m_itemList;
int heighestSlot = -1i;
int heighestPos = -1i;
NSWeapon firstWeapon, lastWeapon;
int hudSlot, hudPos;
firstWeapon = lastWeapon = __NULL__;
@ -1378,8 +1379,8 @@ NSWeapon_SortWeaponChain(NSClientPlayer targetPlayer)
/* first we determine the range of our hud buckets. */
while (itemChain) {
if (itemChain.IsWeapon() == true) {
int hudSlot = itemChain.GetDefInt("hudSlot");
int hudPos = itemChain.GetDefInt("hudSlotPos");
hudSlot = itemChain.GetDefInt("hudSlot");
hudPos = itemChain.GetDefInt("hudSlotPos");
if (hudSlot > heighestSlot) {
heighestSlot = hudSlot;
@ -1389,17 +1390,17 @@ NSWeapon_SortWeaponChain(NSClientPlayer targetPlayer)
}
}
itemChain = itemChain.chain;
itemChain = (NSWeapon)itemChain.chain;
}
for (int hS = 0i; hS <= heighestSlot; hS++) {
for (int hP = 0i; hP <= heighestPos; hP++) {
itemChain = targetPlayer.m_itemList;
itemChain = (NSWeapon)targetPlayer.m_itemList;
while (itemChain) {
if (itemChain.IsWeapon() == true) {
int hudSlot = itemChain.GetDefInt("hudSlot");
int hudPos = itemChain.GetDefInt("hudSlotPos");
hudSlot = itemChain.GetDefInt("hudSlot");
hudPos = itemChain.GetDefInt("hudSlotPos");
if (hudSlot == hS && hudPos == hP) {
/* first weapon in the chain? */
@ -1415,7 +1416,7 @@ NSWeapon_SortWeaponChain(NSClientPlayer targetPlayer)
}
}
itemChain = itemChain.chain;
itemChain = (NSWeapon)itemChain.chain;
}
}
}
@ -1433,7 +1434,7 @@ NSWeapon_SortWeaponChain(NSClientPlayer targetPlayer)
#ifdef CLIENT
bool
NSWeapon_CanSwitch(NSClientPlayer pl)
NSWeapon_CanSwitch(NSNavAI pl)
{
if (!pl.m_activeWeapon)
return false;
@ -1460,7 +1461,7 @@ NSWeapon_NextWeapon(NSNavAI pl)
#ifdef CLIENT
NSWeapon firstWeapon;
if (NSWeapon_CanSwitch(pl) = false) {
if (NSWeapon_CanSwitch(pl) == false) {
return;
}
@ -1481,7 +1482,7 @@ NSWeapon_PrevWeapon(NSNavAI pl)
#ifdef CLIENT
NSWeapon firstWeapon;
if (NSWeapon_CanSwitch(pl) = false) {
if (NSWeapon_CanSwitch(pl) == false) {
return;
}
@ -1502,7 +1503,7 @@ NSWeapon_LastWeapon(NSNavAI pl)
#ifdef CLIENT
NSWeapon firstWeapon;
if (NSWeapon_CanSwitch(pl) = false) {
if (NSWeapon_CanSwitch(pl) == false) {
return;
}