Experimental Corpse stuff, will be ripped out tomorrow or so.

This commit is contained in:
Marco Cawthorne 2019-08-19 03:27:24 -07:00
parent b5ce9a57bc
commit f9bfc2ffe8
10 changed files with 343 additions and 337 deletions

View file

@ -1,95 +1,95 @@
#pragma target fte
#pragma progs_dat "../../cstrike/data.pk3dir/csprogs.dat"
#define CSQC
#define CSTRIKE
#includelist
../builtins.h
../defs.h
../shared/cstrike/defs.h
../math.h
../materials.h
../events.h
../entities.h
cstrike/defs.h
defs.h
../vgui/include.src
voice.c
sound.c
text.c
../shared/cstrike/weaponak47.c
../shared/cstrike/weaponaug.c
../shared/cstrike/weaponawp.c
../shared/cstrike/weaponc4bomb.c
../shared/cstrike/weapondeagle.c
../shared/cstrike/weaponelites.c
../shared/cstrike/weaponfiveseven.c
../shared/cstrike/weaponflashbang.c
../shared/cstrike/weapong3sg1.c
../shared/cstrike/weaponglock18.c
../shared/cstrike/weaponhegrenade.c
../shared/cstrike/weaponknife.c
../shared/cstrike/weaponm3.c
../shared/cstrike/weaponm4a1.c
../shared/cstrike/weaponmac10.c
../shared/cstrike/weaponmp5.c
../shared/cstrike/weaponp228.c
../shared/cstrike/weaponp90.c
../shared/cstrike/weaponpara.c
../shared/cstrike/weaponscout.c
../shared/cstrike/weaponsg550.c
../shared/cstrike/weaponsg552.c
../shared/cstrike/weaponsmokegrenade.c
../shared/cstrike/weapontmp.c
../shared/cstrike/weaponump45.c
../shared/cstrike/weaponusp45.c
../shared/cstrike/weaponxm1014.c
../shared/cstrike/basegun.c
../shared/cstrike/weapons.c
../shared/cstrike/radio.c
../shared/cstrike/equipment.c
../shared/cstrike/animations.c
../shared/pmove.c
../gs-entbase/client.src
../shared/decals.c
../shared/effects.c
../shared/spraylogo.cpp
cstrike/overview.c
../shared/valve/player.cpp
player.c
predict.c
events.c
cstrike/view.c
view.c
damage.c
chat.c
cstrike/nightvision.c
cstrike/hudcrosshair.c
cstrike/hudscope.c
cstrike/hudweaponselect.c
cstrike/hudorbituaries.c
cstrike/hud.c
vgui.cpp
cstrike/vgui_buymenu.cpp
cstrike/vgui_chooseteam.cpp
cstrike/vgui_motd.cpp
valve/scoreboard.c
cstrike/draw.c
cstrike/entities.c
cstrike/event.c
cstrike/init.c
cstrike/player.c
entities.c
cstrike/input.c
entry.c
#endlist
#pragma target fte
#pragma progs_dat "../../cstrike/data.pk3dir/csprogs.dat"
#define CSQC
#define CSTRIKE
#includelist
../builtins.h
../defs.h
../shared/cstrike/defs.h
../math.h
../materials.h
../events.h
../entities.h
cstrike/defs.h
defs.h
../vgui/include.src
voice.c
sound.c
text.c
../shared/cstrike/weaponak47.c
../shared/cstrike/weaponaug.c
../shared/cstrike/weaponawp.c
../shared/cstrike/weaponc4bomb.c
../shared/cstrike/weapondeagle.c
../shared/cstrike/weaponelites.c
../shared/cstrike/weaponfiveseven.c
../shared/cstrike/weaponflashbang.c
../shared/cstrike/weapong3sg1.c
../shared/cstrike/weaponglock18.c
../shared/cstrike/weaponhegrenade.c
../shared/cstrike/weaponknife.c
../shared/cstrike/weaponm3.c
../shared/cstrike/weaponm4a1.c
../shared/cstrike/weaponmac10.c
../shared/cstrike/weaponmp5.c
../shared/cstrike/weaponp228.c
../shared/cstrike/weaponp90.c
../shared/cstrike/weaponpara.c
../shared/cstrike/weaponscout.c
../shared/cstrike/weaponsg550.c
../shared/cstrike/weaponsg552.c
../shared/cstrike/weaponsmokegrenade.c
../shared/cstrike/weapontmp.c
../shared/cstrike/weaponump45.c
../shared/cstrike/weaponusp45.c
../shared/cstrike/weaponxm1014.c
../shared/cstrike/basegun.c
../shared/cstrike/weapons.c
../shared/cstrike/radio.c
../shared/cstrike/equipment.c
../shared/cstrike/animations.c
../shared/pmove.c
../gs-entbase/client.src
../shared/decals.c
../shared/effects.c
../shared/spraylogo.cpp
cstrike/overview.c
../shared/valve/player.cpp
player.c
predict.c
events.c
cstrike/view.c
view.c
damage.c
chat.c
cstrike/nightvision.c
cstrike/hudcrosshair.c
cstrike/hudscope.c
cstrike/hudweaponselect.c
cstrike/hudorbituaries.c
cstrike/hud.c
corpse.c
vgui.cpp
cstrike/vgui_buymenu.cpp
cstrike/vgui_chooseteam.cpp
cstrike/vgui_motd.cpp
valve/scoreboard.c
cstrike/draw.c
cstrike/entities.c
cstrike/event.c
cstrike/init.c
cstrike/player.c
entities.c
cstrike/input.c
entry.c
#endlist

View file

@ -438,6 +438,9 @@ void CSQC_Parse_Event(void)
float fHeader = readbyte();
switch (fHeader) {
case EV_CORPSE:
Corpse_Parse();
break;
case EV_SPEAK:
string msg;
float pit;

View file

@ -263,7 +263,7 @@ void player::postdraw(void)
#endif
}
void player::set_model(void)
void player::set_model(string mpath)
{
#ifdef VALVE
string modelout;
@ -271,7 +271,7 @@ void player::set_model(void)
string skinout = "";
int i;
i = tokenizebyseparator(getplayerkeyvalue(entnum-1, "model"), "/");
i = tokenizebyseparator(mpath, "/");
if (i == 1) {
playertype = PLAYERTYPE_HL;
modelout = sprintf("models/player/%s/%s.mdl", argv(0), argv(0));

View file

@ -1,81 +1,81 @@
#pragma target fte
#pragma progs_dat "../../rewolf/data.pk3dir/csprogs.dat"
#define CSQC
#define VALVE
#define REWOLF
#includelist
../builtins.h
../defs.h
../math.h
../materials.h
../events.h
../entities.h
valve/defs.h
valve/particles.h
defs.h
../vgui/include.src
util.c
rewolf/init.c
../gs-entbase/client.src
rewolf/decore.cpp
sound.c
text.c
voice.c
#pragma target fte
#pragma progs_dat "../../rewolf/data.pk3dir/csprogs.dat"
#define CSQC
#define VALVE
#define REWOLF
#includelist
../builtins.h
../defs.h
../math.h
../materials.h
../events.h
../entities.h
valve/defs.h
valve/particles.h
defs.h
../vgui/include.src
util.c
rewolf/init.c
../gs-entbase/client.src
rewolf/decore.cpp
sound.c
text.c
voice.c
../shared/valve/animations.h
../shared/valve/animations.c
../shared/valve/player.cpp
player.c
../shared/pmove.c
predict.c
../shared/decals.c
../shared/effects.c
../shared/spraylogo.cpp
../shared/valve/items.h
../shared/valve/crosshair.h
../shared/valve/weapons.h
../shared/valve/w_crowbar.c
../shared/valve/w_glock.c
../shared/valve/w_python.c
../shared/valve/w_mp5.c
../shared/valve/w_crossbow.c
../shared/valve/w_shotgun.c
../shared/valve/w_rpg.c
../shared/valve/w_gauss.c
../shared/valve/w_egon.c
../shared/valve/w_hornetgun.c
../shared/valve/w_handgrenade.c
../shared/valve/w_tripmine.c
../shared/valve/w_satchel.c
../shared/valve/w_snark.c
../shared/valve/weapons.c
../shared/valve/weapon_common.c
valve/player.c
entities.c
valve/cmds.c
valve/game_event.c
events.c
valve/view.c
view.c
damage.c
chat.c
vgui.cpp
rewolf/hud.c
valve/hud_weaponselect.c
valve/scoreboard.c
valve/input.c
entry.c
#endlist
../shared/valve/animations.c
../shared/valve/player.cpp
player.c
../shared/pmove.c
predict.c
../shared/decals.c
../shared/effects.c
../shared/spraylogo.cpp
../shared/valve/items.h
../shared/valve/crosshair.h
../shared/valve/weapons.h
../shared/valve/w_crowbar.c
../shared/valve/w_glock.c
../shared/valve/w_python.c
../shared/valve/w_mp5.c
../shared/valve/w_crossbow.c
../shared/valve/w_shotgun.c
../shared/valve/w_rpg.c
../shared/valve/w_gauss.c
../shared/valve/w_egon.c
../shared/valve/w_hornetgun.c
../shared/valve/w_handgrenade.c
../shared/valve/w_tripmine.c
../shared/valve/w_satchel.c
../shared/valve/w_snark.c
../shared/valve/weapons.c
../shared/valve/weapon_common.c
valve/player.c
entities.c
valve/cmds.c
valve/game_event.c
events.c
valve/view.c
view.c
damage.c
chat.c
corpse.c
vgui.cpp
rewolf/hud.c
valve/hud_weaponselect.c
valve/scoreboard.c
valve/input.c
entry.c
#endlist

View file

@ -1,82 +1,82 @@
#pragma target fte
#pragma progs_dat "../../scihunt/data.pk3dir/csprogs.dat"
#define CSQC
#define VALVE
#includelist
../builtins.h
../defs.h
../math.h
../materials.h
../events.h
../entities.h
valve/defs.h
valve/particles.h
defs.h
../vgui/include.src
util.c
scihunt/init.c
../gs-entbase/client.src
sound.c
text.c
voice.c
#pragma target fte
#pragma progs_dat "../../scihunt/data.pk3dir/csprogs.dat"
#define CSQC
#define VALVE
#includelist
../builtins.h
../defs.h
../math.h
../materials.h
../events.h
../entities.h
valve/defs.h
valve/particles.h
defs.h
../vgui/include.src
util.c
scihunt/init.c
../gs-entbase/client.src
sound.c
text.c
voice.c
../shared/valve/animations.h
../shared/valve/animations.c
../shared/scihunt/player.cpp
player.c
../shared/pmove.c
predict.c
../shared/decals.c
../shared/effects.c
../shared/spraylogo.cpp
../shared/scihunt/items.h
../shared/valve/crosshair.h
../shared/scihunt/weapons.h
../shared/valve/w_crowbar.c
../shared/valve/w_glock.c
../shared/valve/w_python.c
../shared/valve/w_mp5.c
../shared/valve/w_crossbow.c
../shared/valve/w_shotgun.c
../shared/valve/w_rpg.c
../shared/valve/w_gauss.c
../shared/valve/w_egon.c
../shared/valve/w_hornetgun.c
../shared/valve/w_handgrenade.c
../shared/valve/w_tripmine.c
../shared/valve/w_satchel.c
../shared/valve/w_snark.c
../shared/scihunt/w_cannon.c
../shared/scihunt/w_chainsaw.c
../shared/scihunt/w_hammer.c
../shared/scihunt/weapons.c
../shared/valve/weapon_common.c
valve/player.c
entities.c
valve/cmds.c
valve/game_event.c
events.c
valve/view.c
view.c
damage.c
chat.c
vgui.cpp
valve/hud.c
valve/hud_weaponselect.c
valve/scoreboard.c
valve/input.c
entry.c
#endlist
../shared/valve/animations.c
../shared/scihunt/player.cpp
player.c
../shared/pmove.c
predict.c
../shared/decals.c
../shared/effects.c
../shared/spraylogo.cpp
../shared/scihunt/items.h
../shared/valve/crosshair.h
../shared/scihunt/weapons.h
../shared/valve/w_crowbar.c
../shared/valve/w_glock.c
../shared/valve/w_python.c
../shared/valve/w_mp5.c
../shared/valve/w_crossbow.c
../shared/valve/w_shotgun.c
../shared/valve/w_rpg.c
../shared/valve/w_gauss.c
../shared/valve/w_egon.c
../shared/valve/w_hornetgun.c
../shared/valve/w_handgrenade.c
../shared/valve/w_tripmine.c
../shared/valve/w_satchel.c
../shared/valve/w_snark.c
../shared/scihunt/w_cannon.c
../shared/scihunt/w_chainsaw.c
../shared/scihunt/w_hammer.c
../shared/scihunt/weapons.c
../shared/valve/weapon_common.c
valve/player.c
entities.c
valve/cmds.c
valve/game_event.c
events.c
valve/view.c
view.c
damage.c
chat.c
corpse.c
vgui.cpp
valve/hud.c
valve/hud_weaponselect.c
valve/scoreboard.c
valve/input.c
entry.c
#endlist

View file

@ -1,78 +1,78 @@
#pragma target fte
#pragma progs_dat "../../valve/data.pk3dir/csprogs.dat"
#define CSQC
#define VALVE
#includelist
../builtins.h
../defs.h
../math.h
../materials.h
../events.h
../entities.h
valve/defs.h
valve/particles.h
defs.h
../vgui/include.src
util.c
valve/init.c
../gs-entbase/client.src
sound.c
text.c
voice.c
#pragma target fte
#pragma progs_dat "../../valve/data.pk3dir/csprogs.dat"
#define CSQC
#define VALVE
#includelist
../builtins.h
../defs.h
../math.h
../materials.h
../events.h
../entities.h
valve/defs.h
valve/particles.h
defs.h
../vgui/include.src
util.c
valve/init.c
../gs-entbase/client.src
sound.c
text.c
voice.c
../shared/valve/animations.h
../shared/valve/animations.c
../shared/valve/player.cpp
player.c
../shared/pmove.c
predict.c
../shared/decals.c
../shared/effects.c
../shared/spraylogo.cpp
../shared/valve/items.h
../shared/valve/crosshair.h
../shared/valve/weapons.h
../shared/valve/w_crowbar.c
../shared/valve/w_glock.c
../shared/valve/w_python.c
../shared/valve/w_mp5.c
../shared/valve/w_crossbow.c
../shared/valve/w_shotgun.c
../shared/valve/w_rpg.c
../shared/valve/w_gauss.c
../shared/valve/w_egon.c
../shared/valve/w_hornetgun.c
../shared/valve/w_handgrenade.c
../shared/valve/w_tripmine.c
../shared/valve/w_satchel.c
../shared/valve/w_snark.c
../shared/valve/weapons.c
../shared/valve/weapon_common.c
valve/player.c
entities.c
valve/cmds.c
valve/game_event.c
events.c
valve/view.c
view.c
damage.c
chat.c
vgui.cpp
valve/hud.c
valve/hud_weaponselect.c
valve/scoreboard.c
valve/input.c
entry.c
#endlist
../shared/valve/animations.c
../shared/valve/player.cpp
player.c
../shared/pmove.c
predict.c
../shared/decals.c
../shared/effects.c
../shared/spraylogo.cpp
../shared/valve/items.h
../shared/valve/crosshair.h
../shared/valve/weapons.h
../shared/valve/w_crowbar.c
../shared/valve/w_glock.c
../shared/valve/w_python.c
../shared/valve/w_mp5.c
../shared/valve/w_crossbow.c
../shared/valve/w_shotgun.c
../shared/valve/w_rpg.c
../shared/valve/w_gauss.c
../shared/valve/w_egon.c
../shared/valve/w_hornetgun.c
../shared/valve/w_handgrenade.c
../shared/valve/w_tripmine.c
../shared/valve/w_satchel.c
../shared/valve/w_snark.c
../shared/valve/weapons.c
../shared/valve/weapon_common.c
valve/player.c
entities.c
valve/cmds.c
valve/game_event.c
events.c
valve/view.c
view.c
damage.c
chat.c
corpse.c
vgui.cpp
valve/hud.c
valve/hud_weaponselect.c
valve/scoreboard.c
valve/input.c
entry.c
#endlist

View file

@ -27,6 +27,7 @@ enum {
EV_ORBITUARY,
EV_SPEAK,
EV_TAUNT,
EV_CORPSE,
EV_CHAT,
EV_CHAT_TEAM,
EV_CHAT_VOX,

View file

@ -55,6 +55,7 @@
../gs-entbase/server/multi_manager.cpp
../gs-entbase/server/monster_furniture.cpp
../gs-entbase/server/monster_generic.cpp
../gs-entbase/server/monstermaker.cpp
../gs-entbase/server/multisource.cpp
../gs-entbase/server/scripted_sequence.cpp
#endlist

View file

@ -87,6 +87,7 @@ void SHData_GetItems(void)
pl.ammo_357 = 36;
pl.ammo_m203_grenade = 3;
pl.ammo_rocket = 5;
pl.ammo_snark = 10;
Weapons_AddItem(pl, WEAPON_CROWBAR);
Weapons_AddItem(pl, WEAPON_GLOCK);
Weapons_AddItem(pl, WEAPON_PYTHON);

View file

@ -107,7 +107,7 @@ q2_anim_t q2_anims[] = {
{ "cr_death", 173, 177 },
{ "death1", 178, 183 },
{ "death2", 184, 189 },
{ "death2", 190, 197 }
{ "death3", 190, 197 }
};
enum {
@ -138,4 +138,4 @@ enum {
};
void Animation_PlayerTop(float);
void Animation_PlayerTopTemp(float, float);
void Animation_PlayerTopTemp(float, float);