nuclide-ports
/
hhdeath
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: nuclide-ports:887c8284398f942eed3ad220153a5418f6f16155
Branches Tags
nuclide-ports:master
...
compare: nuclide-ports:c03b3fc5dcf6fb52762a4972b895ed9dda172f8b
Branches Tags
nuclide-ports:master

2 Commits
887c828439 ... c03b3fc5dc

Author SHA1 Message Date
Marco Cawthorne c03b3fc5dc
items: Implement ::PickupRespawn 2023-02-12 13:03:49 -08:00
Marco Cawthorne f7a1910541
Remove base/src dependency.Remove base/src dependency and use valve/src's versions instead. 2023-02-12 12:55:42 -08:00
4 changed files with 16 additions and 17 deletions
Show Stats Expand all files Collapse all files

4
src/client/progs.src
View File

@ -20,7 +20,7 @@
../shared/include.src
../../../valve/src/client/damage.qc
../../../base/src/client/draw.qc
../../../valve/src/client/draw.qc
init.qc
../../../valve/src/client/flashlight.qc
entities.qc
@ -35,7 +35,7 @@ hud.qc
../../../valve/src/client/hud_weaponselect.qc
../../../valve/src/client/scoreboard.qc
../../../base/src/client/modelevent.qc
../../../valve/src/client/modelevent.qc
../../../src/client/include.src
../../../src/shared/include.src
#endlist

17
src/server/items.qc
View File

@ -40,11 +40,17 @@ item_pickup::Touch(entity eToucher)
Destroy();
} else {
Disappear();
think = Respawn;
nextthink = time + 30.0f;
ScheduleThink(PickupRespawn, 30.0f);
}
}
void
item_pickup::PickupRespawn(void)
{
Respawn();
Sound_Play(this, CHAN_ITEM, "item.respawn");
}
void
item_pickup::SetItem(int i)
{
@ -75,13 +81,6 @@ item_pickup::Respawn(void)
think = __NULL__;
nextthink = -1;
if (!m_iWasDropped && cvar("sv_playerslots") > 1) {
if (!real_owner)
Sound_Play(this, CHAN_ITEM, "item.respawn");
m_iClip = -1;
}
if (!m_bFloating) {
droptofloor();
SetMovetype(MOVETYPE_TOSS);

4
src/server/progs.src
View File

@ -35,12 +35,12 @@ ammo_hd.qc
gamerules.qc
server.qc
../../../base/src/server/damage.qc
../../../valve/src/server/damage.qc
../../../src/botlib/include.src
../../../valve/src/server/flashlight.qc
../../../base/src/server/modelevent.qc
../../../valve/src/server/modelevent.qc
../../../valve/src/server/spawn.qc
../../../src/server/include.src

8
src/shared/include.src
View File

@ -3,7 +3,7 @@
flags.h
events.h
player.qc
../../../base/src/shared/weapon_common.h
../../../valve/src/shared/weapon_common.h
../../../valve/src/shared/animations.h
../../../valve/src/shared/animations.qc
pmove.qc
@ -12,9 +12,9 @@ pmove.qc
../../../valve/src/shared/fx_breakmodel.qc
../../../valve/src/shared/fx_explosion.qc
../../../valve/src/shared/fx_gibhuman.qc
../../../base/src/shared/fx_spark.qc
../../../valve/src/shared/fx_spark.qc
../../../valve/src/shared/fx_impact.qc
../../../base/src/shared/fx_corpse.qc
../../../valve/src/shared/fx_corpse.qc
fx_lego.qc
fx_legopiece.qc
fx_soda.qc
@ -32,5 +32,5 @@ w_legolauncher.qc
w_machette.qc
w_sodalauncher.qc
weapons.qc
../../../base/src/shared/weapon_common.qc
../../../valve/src/shared/weapon_common.qc
#endlist