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

Simplified the client progs.src file for each game massively.

Browse source
This commit is contained in:
Marco Cawthorne 2020-05-02 23:57:25 +02:00
parent d4c97c639b
commit a025a41e73
34 changed files with 513 additions and 681 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
src/client/cstrike/progs.src
View file

@ -9,101 +9,31 @@
#includelist
../../shared/fteextensions.qc
../../shared/defs.h
../../shared/cstrike/defs.h
../../shared/sound.c
../../shared/defs.h
../cstrike/defs.h
../valve/particles.h
../defs.h
../../vgui/include.src
../util.c
../fade.c
../titles.c
../text.c
../../gs-entbase/client.src
../../gs-entbase/shared.src
../../shared/cstrike/include.src
../sky.c
../sound.c
../music.c
../sentences.c
../prints.c
../voice.c
../../shared/cstrike/animations.c
../../shared/cstrike/player.h
../player.c
../../shared/cstrike/pmove.c
../../shared/pmove.c
../cstrike/predict.c
../predict.c
../../shared/valve/fx_blood.c
../../shared/valve/fx_breakmodel.c
../../shared/valve/fx_explosion.c
../../shared/valve/fx_gibhuman.c
../../shared/valve/fx_spark.c
../../shared/cstrike/fx_impact.c
../../shared/cstrike/fx_flashbang.c
../../shared/cstrike/fx_smokenade.c
../npc.c
../../shared/cstrike/radio.c
../../shared/cstrike/weapons_cstrike.c
../../shared/valve/weapon_common.h
../../shared/cstrike/w_ak47.c
../../shared/cstrike/w_deagle.c
../../shared/cstrike/w_knife.c
../../shared/cstrike/w_usp45.c
../../shared/cstrike/w_glock18.c
../../shared/cstrike/w_p228.c
../../shared/cstrike/w_elites.c
../../shared/cstrike/w_fiveseven.c
../../shared/cstrike/w_m3.c
../../shared/cstrike/w_xm1014.c
../../shared/cstrike/w_mp5.c
../../shared/cstrike/w_p90.c
../../shared/cstrike/w_ump45.c
../../shared/cstrike/w_mac10.c
../../shared/cstrike/w_tmp.c
../../shared/cstrike/w_sg552.c
../../shared/cstrike/w_m4a1.c
../../shared/cstrike/w_aug.c
../../shared/cstrike/w_scout.c
../../shared/cstrike/w_awp.c
../../shared/cstrike/w_g3sg1.c
../../shared/cstrike/w_sg550.c
../../shared/cstrike/w_para.c
../../shared/cstrike/w_c4bomb.c
../../shared/cstrike/w_flashbang.c
../../shared/cstrike/w_hegrenade.c
../../shared/cstrike/w_smokegrenade.c
../../shared/cstrike/weapons.c
../../shared/valve/weapon_common.c
../cstrike/player.c
../cstrike/entities.c
../entities.c
../cstrike/cmds.c
../cstrike/game_event.c
../events.c
../valve/view.c
../view.c
../damage.c
../chat.c
../textmenu.c
../vgui.cpp
../cstrike/vgui_chooseteam.cpp
../cstrike/textmenu.c
../cstrike/init.c
../cstrike/player.c
../cstrike/entities.c
../cstrike/cmds.c
../cstrike/game_event.c
../valve/view.c
../cstrike/crosshair.c
../valve/obituary.c
../cstrike/hud.c
../cstrike/hud_weaponselect.c
../valve/scoreboard.c
../valve/input.c
../entry.c
../include.src
#endlist

19
src/client/defs.h
View file

@ -14,6 +14,8 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include "textmenu.h"
/* flags for 2d drawing */
#define DRAWFLAG_NORMAL 0
#define DRAWFLAG_ADDITIVE 1
@ -71,7 +73,18 @@ int g_iWorldInitialized;
float clframetime;
/* prototypes */
void View_SetMuzzleflash(int);
void View_UpdateWeapon(entity, entity);
void View_PlayAnimation(int);
void Damage_Draw(void);
void
drawstring_r(vector p, string t, vector s, vector c, float a, float f)
{
p[0] -= stringwidth(t, TRUE, s);
drawstring(p, t, s, c, a, f);
}
void GameMessage_Setup(string);
void Game_Input(void);
void View_SetMuzzleflash(int);
void View_PlayAnimation(int);
void View_PlayAnimation(int);
void Sound_PlayVOX(string);

3
src/client/entry.c
View file

@ -101,15 +101,16 @@ CSQC_RendererRestarted(string rstr)
precache_pic("gfx/vgui/icntlk_pl");
/* View */
Weapons_Init();
Scores_Init();
View_Init();
Game_RendererRestarted(rstr);
HUD_Init();
/* GS-Entbase */
Fade_Init();
Sky_Update();
Decal_Reload();
Game_RendererRestarted(rstr);
FX_Init();
}

69
src/client/gearbox/progs.src
View file

@ -9,88 +9,27 @@
#includelist
../../shared/fteextensions.qc
../../shared/defs.h
../../shared/sound.c
../valve/defs.h
../valve/particles.h
../defs.h
../../vgui/include.src
../util.c
../fade.c
../titles.c
../text.c
../sentences.c
../../gs-entbase/client.src
../../gs-entbase/shared.src
../../shared/gearbox/include.src
../sky.c
../sound.c
../music.c
../prints.c
../voice.c
../../shared/valve/animations.h
../../shared/valve/animations.c
../../shared/gearbox/player.cpp
../player.c
../../shared/valve/pmove.c
../../shared/pmove.c
../valve/predict.c
../predict.c
../../shared/valve/fx_blood.c
../../shared/valve/fx_breakmodel.c
../../shared/valve/fx_explosion.c
../../shared/valve/fx_gibhuman.c
../../shared/valve/fx_spark.c
../../shared/valve/fx_impact.c
../npc.c
../gearbox/init.c
../../shared/gearbox/items.h
../../shared/valve/weapon_common.h
../../shared/gearbox/weapons.h
../../shared/valve/w_crossbow.c
../../shared/valve/w_crowbar.c
../../shared/valve/w_egon.c
../../shared/valve/w_gauss.c
../../shared/valve/w_glock.c
../../shared/valve/w_handgrenade.c
../../shared/valve/w_hornetgun.c
../../shared/valve/w_mp5.c
../../shared/valve/w_python.c
../../shared/valve/w_rpg.c
../../shared/valve/w_satchel.c
../../shared/valve/w_shotgun.c
../../shared/valve/w_snark.c
../../shared/valve/w_tripmine.c
../../shared/gearbox/w_pipewrench.c
../../shared/gearbox/w_knife.c
../../shared/gearbox/w_grapple.c
../../shared/gearbox/w_eagle.c
../../shared/gearbox/w_m249.c
../../shared/gearbox/w_displacer.c
../../shared/gearbox/w_sniperrifle.c
../../shared/gearbox/w_sporelauncher.c
../../shared/gearbox/w_penguin.c
../../shared/gearbox/w_shockrifle.c
../../shared/gearbox/weapons.c
../../shared/valve/weapon_common.c
../valve/player.c
../valve/entities.c
../entities.c
../valve/cmds.c
../valve/game_event.c
../events.c
../valve/view.c
../view.c
../damage.c
../chat.c
../textmenu.c
../vgui.cpp
../valve/obituary.c
../valve/hud.c
../gearbox/hud_weaponselect.c
../valve/scoreboard.c
../valve/input.c
../entry.c
../include.src
#endlist

72
src/client/hunger/progs.src
View file

@ -10,89 +10,29 @@
#includelist
../../shared/fteextensions.qc
../../shared/defs.h
../../shared/sound.c
../valve/defs.h
../valve/particles.h
../defs.h
../../vgui/include.src
../util.c
../fade.c
../titles.c
../text.c
../sentences.c
../../gs-entbase/client.src
../../gs-entbase/shared.src
../../shared/hunger/include.src
../sky.c
../sound.c
../music.c
../prints.c
../voice.c
../../shared/valve/animations.h
../../shared/valve/animations.c
../../shared/hunger/player.cpp
../player.c
../../shared/valve/pmove.c
../../shared/pmove.c
../valve/predict.c
../predict.c
../../shared/valve/fx_blood.c
../../shared/valve/fx_breakmodel.c
../../shared/valve/fx_explosion.c
../../shared/valve/fx_gibhuman.c
../../shared/valve/fx_spark.c
../../shared/valve/fx_impact.c
../npc.c
init.c
../../shared/hunger/items.h
../../shared/valve/weapon_common.h
../../shared/hunger/weapons.h
../../shared/valve/w_crossbow.c
../../shared/valve/w_crowbar.c
../../shared/valve/w_egon.c
../../shared/valve/w_gauss.c
../../shared/valve/w_glock.c
../../shared/valve/w_handgrenade.c
../../shared/valve/w_mp5.c
../../shared/valve/w_python.c
../../shared/valve/w_rpg.c
../../shared/valve/w_satchel.c
../../shared/valve/w_shotgun.c
../../shared/valve/w_snark.c
../../shared/valve/w_tripmine.c
../../shared/hunger/w_ap9.c
../../shared/hunger/w_chaingun.c
../../shared/hunger/w_flame.c
../../shared/hunger/w_silencer.c
../../shared/hunger/w_medkit.c
../../shared/hunger/w_shovel.c
../../shared/hunger/w_sniper.c
../../shared/hunger/w_sniper2.c
../../shared/hunger/w_spanner.c
../../shared/hunger/w_taurus.c
../../shared/hunger/w_tnt.c
../../shared/hunger/weapons.c
../../shared/valve/weapon_common.c
../hunger/init.c
../valve/player.c
../valve/entities.c
../entities.c
../valve/cmds.c
../valve/game_event.c
../events.c
../valve/view.c
../view.c
../damage.c
../chat.c
../textmenu.c
../vgui.cpp
../valve/obituary.c
../valve/hud.c
../valve/hud_weaponselect.c
../valve/scoreboard.c
../valve/input.c
../entry.c
../include.src
#endlist

22
src/client/include.src Normal file
View file

@ -0,0 +1,22 @@
#includelist
sky.c
music.c
sound.c
sentences.c
prints.c
voice.c
fade.c
titles.c
text.c
player.c
predict.c
npc.c
entities.c
events.c
view.c
damage.c
chat.c
textmenu.c
vgui.cpp
entry.c
#endlist

59
src/client/poke646/progs.src
View file

@ -10,72 +10,29 @@
#includelist
../../shared/fteextensions.qc
../../shared/defs.h
../../shared/sound.c
../valve/defs.h
../valve/particles.h
../defs.h
../../vgui/include.src
../util.c
../fade.c
../titles.c
../text.c
../sentences.c
../../gs-entbase/client.src
../../gs-entbase/shared.src
../../shared/poke646/include.src
../sky.c
../sound.c
../music.c
../prints.c
../voice.c
../../shared/valve/animations.h
../../shared/valve/animations.c
../../shared/valve/player.cpp
../player.c
../../shared/valve/pmove.c
../../shared/pmove.c
../valve/predict.c
../predict.c
../../shared/valve/fx_blood.c
../../shared/valve/fx_breakmodel.c
../../shared/valve/fx_explosion.c
../../shared/valve/fx_gibhuman.c
../../shared/valve/fx_spark.c
../../shared/valve/fx_impact.c
../npc.c
init.c
../../shared/poke646/items.h
../../shared/valve/weapon_common.h
../../shared/valve/w_satchel.c
../../shared/poke646/weapons.h
../../shared/poke646/w_bradnailer.c
../../shared/poke646/w_cmlwbr.c
../../shared/poke646/w_heaterpipe.c
../../shared/poke646/w_nailgun.c
../../shared/poke646/w_pipebomb.c
../../shared/poke646/w_shotgun.c
../../shared/poke646/w_xs.c
../../shared/poke646/weapons.c
../../shared/valve/weapon_common.c
../poke646/init.c
../valve/player.c
entities.c
../entities.c
../poke646/entities.c
../valve/cmds.c
../valve/game_event.c
../events.c
../valve/view.c
../view.c
../damage.c
../chat.c
../textmenu.c
../vgui.cpp
../valve/obituary.c
../valve/hud.c
../valve/hud_weaponselect.c
../valve/scoreboard.c
../valve/input.c
../entry.c
../include.src
#endlist

63
src/client/rewolf/progs.src
View file

@ -4,87 +4,34 @@
#define CSQC
#define CLIENT
#define VALVE
#define REWOLF
#define CLASSIC_VGUI
#includelist
../../shared/fteextensions.qc
../../shared/defs.h
../../shared/sound.c
../valve/defs.h
../valve/particles.h
../defs.h
../../vgui/include.src
../util.c
../fade.c
../titles.c
../text.c
../sentences.c
../../gs-entbase/client.src
../../gs-entbase/shared.src
../../shared/rewolf/include.src
../rewolf/decore.cpp
../sky.c
../music.c
../sound.c
../prints.c
../voice.c
../../shared/valve/animations.h
../../shared/valve/animations.c
../../shared/rewolf/player.cpp
../player.c
../../shared/valve/pmove.c
../../shared/pmove.c
../valve/predict.c
../predict.c
../../shared/valve/fx_blood.c
../../shared/valve/fx_breakmodel.c
../../shared/valve/fx_explosion.c
../../shared/valve/fx_gibhuman.c
../../shared/valve/fx_spark.c
../../shared/valve/fx_impact.c
../npc.c
../rewolf/init.c
../../shared/rewolf/items.h
../../shared/valve/weapon_common.h
../../shared/rewolf/weapons.h
../../shared/rewolf/w_fists.c
../../shared/rewolf/w_gausspistol.c
../../shared/rewolf/w_grenade.c
../../shared/rewolf/w_shotgun.c
../../shared/rewolf/w_beamgun.c
../../shared/rewolf/w_chemicalgun.c
../../shared/rewolf/w_dml.c
../../shared/rewolf/w_minigun.c
../../shared/rewolf/w_aicore.c
../../shared/rewolf/weapons.c
../../shared/valve/weapon_common.c
../valve/player.c
../rewolf/entities.c
../entities.c
../valve/cmds.c
../valve/game_event.c
../events.c
../valve/view.c
../view.c
../damage.c
../chat.c
../textmenu.c
../vgui.cpp
../valve/obituary.c
../rewolf/hud.c
../rewolf/hud_weaponselect.c
../valve/scoreboard.c
../valve/input.c
../entry.c
../include.src
#endlist

52
src/client/scihunt/init.c
View file

@ -1,52 +0,0 @@
/*
* Copyright (c) 2016-2020 Marco Hladik <marco@icculus.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*
=================
Client_Init
Comparable to worldspawn in SSQC in that it's mostly used for precaches
=================
*/
void
Client_Init(float apilevel, string enginename, float engineversion)
{
Obituary_Init();
}
void
Client_InitDone(void)
{
}
void
Game_RendererRestarted(string rstr)
{
Obituary_Precache();
FX_Blood_Init();
FX_BreakModel_Init();
FX_Explosion_Init();
FX_GibHuman_Init();
FX_Spark_Init();
FX_Impact_Init();
precache_model("sprites/chainsaw.spr");
precache_model("sprites/hammer.spr");
precache_model("sprites/w_cannon.spr");
BEAM_TRIPMINE = particleeffectnum("weapon_tripmine.beam");
}

75
src/client/scihunt/progs.src
View file

@ -6,91 +6,36 @@
#define VALVE
#define CLASSIC_VGUI
#define CSQC
#define CLIENT
#define VALVE
#define CLASSIC_VGUI
#includelist
../../shared/fteextensions.qc
../../shared/defs.h
../../shared/sound.c
../valve/defs.h
../valve/particles.h
../defs.h
../../vgui/include.src
../util.c
../fade.c
../titles.c
../text.c
../sentences.c
../../gs-entbase/client.src
../../gs-entbase/shared.src
../../shared/scihunt/include.src
../sky.c
../music.c
../sound.c
../prints.c
../voice.c
../../shared/valve/animations.h
../../shared/valve/animations.c
../../shared/scihunt/player.cpp
../player.c
../../shared/scihunt/pmove.c
../../shared/pmove.c
../valve/predict.c
../predict.c
../../shared/valve/fx_blood.c
../../shared/valve/fx_breakmodel.c
../../shared/valve/fx_explosion.c
../../shared/valve/fx_gibhuman.c
../../shared/valve/fx_spark.c
../../shared/valve/fx_impact.c
../npc.c
init.c
../../shared/scihunt/items.h
../../shared/valve/weapon_common.h
../../shared/scihunt/weapons.h
../../shared/valve/w_crossbow.c
../../shared/valve/w_crowbar.c
../../shared/valve/w_egon.c
../../shared/valve/w_gauss.c
../../shared/valve/w_glock.c
../../shared/valve/w_handgrenade.c
../../shared/valve/w_hornetgun.c
../../shared/valve/w_mp5.c
../../shared/valve/w_python.c
../../shared/valve/w_rpg.c
../../shared/valve/w_satchel.c
../../shared/valve/w_shotgun.c
../../shared/valve/w_snark.c
../../shared/valve/w_tripmine.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/init.c
../valve/player.c
../valve/entities.c
../entities.c
../valve/cmds.c
../valve/game_event.c
../events.c
../valve/view.c
../view.c
../damage.c
../chat.c
../textmenu.c
../vgui.cpp
../valve/obituary.c
../valve/hud.c
../valve/hud_weaponselect.c
../valve/scoreboard.c
../valve/input.c
../entry.c
../include.src
#endlist

3
src/client/textmenu.c
View file

@ -16,9 +16,6 @@
/* Old style Counter-Strike/TFC menus */
var string g_textmenu = "";
var float g_textmenucheck = 0.0f;
void
Textmenu_Call(string menu)
{

12
src/client/util.c → src/client/textmenu.h
View file

@ -14,10 +14,8 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* Wrapper that right-aligns the text */
void
drawstring_r(vector p, string t, vector s, vector c, float a, float f)
{
p[0] -= stringwidth(t, TRUE, s);
drawstring(p, t, s, c, a, f);
}
var string g_textmenu = "";
var float g_textmenucheck = 0.0f;
void Textmenu_Input(int);
void Textmenu_Draw(void);

2
src/client/tfc/init.c
View file

@ -30,7 +30,7 @@ Client_Init(float apilevel, string enginename, float engineversion)
void
Client_InitDone(void)
{
VGUI_ChooseTeam();
// VGUI_ChooseTeam();
}
void

75
src/client/tfc/progs.src
View file

@ -9,92 +9,27 @@
#includelist
../../shared/fteextensions.qc
../../shared/defs.h
../../shared/sound.c
../valve/defs.h
../valve/particles.h
../defs.h
../../vgui/include.src
../vgui.cpp
vgui_chooseteam.cpp
../util.c
../fade.c
../titles.c
../text.c
../sentences.c
../../gs-entbase/client.src
../../gs-entbase/shared.src
../../shared/valve/include.src
../sky.c
../music.c
../sound.c
../prints.c
../voice.c
../../shared/valve/animations.h
../../shared/valve/animations.c
../../shared/valve/player.cpp
../player.c
../../shared/valve/pmove.c
../../shared/pmove.c
../valve/predict.c
../predict.c
../../shared/valve/fx_blood.c
../../shared/valve/fx_breakmodel.c
../../shared/valve/fx_explosion.c
../../shared/valve/fx_gibhuman.c
../../shared/valve/fx_spark.c
../../shared/valve/fx_impact.c
init.c
../npc.c
../../shared/tfc/items.h
../../shared/valve/weapon_common.h
../../shared/tfc/weapons.h
../../shared/tfc/w_asscan.c
../../shared/tfc/w_autorifle.c
../../shared/tfc/w_crowbar.c
../../shared/tfc/w_dbs.c
../../shared/tfc/w_flamer.c
../../shared/tfc/w_glauncher.c
../../shared/tfc/w_grapple.c
../../shared/tfc/w_incendiary.c
../../shared/tfc/w_knife.c
../../shared/tfc/w_medkit.c
../../shared/tfc/w_nailgun.c
../../shared/tfc/w_pipebomb.c
../../shared/tfc/w_railgun.c
../../shared/tfc/w_rpg.c
../../shared/tfc/w_sbs.c
../../shared/tfc/w_sniper.c
../../shared/tfc/w_supernail.c
../../shared/tfc/w_tranquil.c
../../shared/tfc/w_umbrella.c
../../shared/tfc/w_wrench.c
../../shared/tfc/weapons.c
../../shared/valve/weapon_common.c
../tfc/init.c
../valve/player.c
entities.c
../entities.c
../tfc/entities.c
../valve/cmds.c
../valve/game_event.c
../events.c
../valve/view.c
../view.c
../damage.c
../chat.c
../textmenu.c
../valve/obituary.c
../valve/hud.c
../valve/hud_weaponselect.c
../valve/scoreboard.c
../valve/input.c
../entry.c
../include.src
#endlist

1
src/client/valve/defs.h
View file

@ -15,6 +15,7 @@
*/
#include "obituary.h"
#include "particles.h"
var int autocvar_cl_autoweaponswitch = TRUE;

51
src/client/valve/hud.h
View file

@ -1,51 +0,0 @@
/*
* Copyright (c) 2016-2020 Marco Hladik <marco@icculus.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* pre-calculated sprite definitions */
float spr_health[4] = {
80 / 256, // pos x
24 / 128, // pos u
32 / 256, // size x
32 / 128 // size y
};
float spr_suit1[4] = {
0 / 256, // pos x
24 / 128, // pos u
40 / 256, // size x
40 / 128 // size y
};
float spr_suit2[4] = {
40 / 256, // pos x
24 / 128, // pos u
40 / 256, // size x
40 / 128 // size y
};
float spr_flash1[4] = {
160 / 256, // pos x
24 / 128, // pos u
32 / 256, // size x
32 / 128 // size y
};
float spr_flash2[4] = {
112 / 256, // pos x
24 / 128, // pos u
48 / 256, // size x
32 / 128 // size y
};

1
src/client/valve/init.c
View file

@ -43,5 +43,6 @@ Game_RendererRestarted(string rstr)
FX_GibHuman_Init();
FX_Spark_Init();
FX_Impact_Init();
BEAM_TRIPMINE = particleeffectnum("weapon_tripmine.beam");
}

13
src/client/valve/obituary.c
View file

@ -27,7 +27,6 @@ Obituary_Init(void)
return;
}
print("Init Obituaries\n");
g_obtype_count = 0;
i = 0;
@ -80,8 +79,6 @@ Obituary_Init(void)
void
Obituary_Precache(void)
{
print("Precache Obituaries\n");
for (int i = 0; i < g_obtype_count; i++)
precache_model(g_obtypes[i].src_sprite);
}
@ -132,6 +129,13 @@ Obituary_Add(string attacker, string victim, float weapon, float flags)
}
g_obituary_time = OBITUARY_TIME;
string conprint = g_weapons[weapon].deathmsg();
if (conprint != "") {
print(sprintf(conprint, attacker, victim));
print("\n");
}
}
void
@ -168,8 +172,7 @@ Obituary_Draw(void)
}
item[0] = pos[0];
v = g_obituary[i].victim;
drawstring_r(item + [0,2], v, [12,12], [1,1,1], 1.0f, 0);
item[0] -= stringwidth(v, TRUE, [12,12]) + 4;

64
src/client/valve/progs.src
View file

@ -9,85 +9,27 @@
#includelist
../../shared/fteextensions.qc
../../shared/defs.h
../../shared/sound.c
../valve/defs.h
../valve/particles.h
../defs.h
../../vgui/include.src
../util.c
../fade.c
../titles.c
../text.c
../../gs-entbase/client.src
../../gs-entbase/shared.src
../../shared/valve/include.src
../sky.c
../music.c
../sound.c
../sentences.c
../prints.c
../voice.c
../../shared/valve/animations.h
../../shared/valve/animations.c
../../shared/valve/player.cpp
../player.c
../../shared/valve/pmove.c
../../shared/pmove.c
../valve/predict.c
../predict.c
../../shared/valve/fx_blood.c
../../shared/valve/fx_breakmodel.c
../../shared/valve/fx_explosion.c
../../shared/valve/fx_gibhuman.c
../../shared/valve/fx_spark.c
../../shared/valve/fx_impact.c
../valve/init.c
../npc.c
../../shared/valve/items.h
../../shared/valve/weapon_common.h
../../shared/valve/weapons.h
../../shared/valve/w_crossbow.c
../../shared/valve/w_crowbar.c
../../shared/valve/w_egon.c
../../shared/valve/w_gauss.c
../../shared/valve/w_glock.c
../../shared/valve/w_handgrenade.c
../../shared/valve/w_hornetgun.c
../../shared/valve/w_mp5.c
../../shared/valve/w_python.c
../../shared/valve/w_rpg.c
../../shared/valve/w_satchel.c
../../shared/valve/w_shotgun.c
../../shared/valve/w_snark.c
../../shared/valve/w_tripmine.c
../../shared/valve/weapons.c
../../shared/valve/weapon_common.c
../valve/player.c
../valve/entities.c
../entities.c
../valve/cmds.c
../valve/game_event.c
../events.c
../valve/view.c
../view.c
../damage.c
../chat.c
../textmenu.c
../vgui.cpp
../valve/obituary.c
../valve/hud.c
../valve/hud_weaponselect.c
../valve/scoreboard.c
../valve/input.c
../entry.c
../include.src
#endlist

1
src/server/scihunt/gamerules.cpp
View file

@ -17,7 +17,6 @@
var int autocvar_sh_insanity = 10;
var int autocvar_sv_playerkeepalive = TRUE;
void
SHMultiplayerRules::PlayerDeath(player pl)
{

50
src/shared/cstrike/include.src Normal file
View file

@ -0,0 +1,50 @@
#includelist
../../shared/sound.c
../../shared/cstrike/animations.h
../../shared/cstrike/animations.c
../../shared/cstrike/player.h
../../shared/cstrike/pmove.c
../../shared/pmove.c
../../shared/valve/fx_blood.c
../../shared/valve/fx_breakmodel.c
../../shared/valve/fx_explosion.c
../../shared/valve/fx_gibhuman.c
../../shared/valve/fx_spark.c
../../shared/cstrike/fx_impact.c
../../shared/cstrike/fx_flashbang.c
../../shared/cstrike/fx_smokenade.c
../../shared/cstrike/radio.c
../../shared/cstrike/weapons_cstrike.c
../../shared/valve/weapon_common.h
../../shared/cstrike/w_ak47.c
../../shared/cstrike/w_deagle.c
../../shared/cstrike/w_knife.c
../../shared/cstrike/w_usp45.c
../../shared/cstrike/w_glock18.c
../../shared/cstrike/w_p228.c
../../shared/cstrike/w_elites.c
../../shared/cstrike/w_fiveseven.c
../../shared/cstrike/w_m3.c
../../shared/cstrike/w_xm1014.c
../../shared/cstrike/w_mp5.c
../../shared/cstrike/w_p90.c
../../shared/cstrike/w_ump45.c
../../shared/cstrike/w_mac10.c
../../shared/cstrike/w_tmp.c
../../shared/cstrike/w_sg552.c
../../shared/cstrike/w_m4a1.c
../../shared/cstrike/w_aug.c
../../shared/cstrike/w_scout.c
../../shared/cstrike/w_awp.c
../../shared/cstrike/w_g3sg1.c
../../shared/cstrike/w_sg550.c
../../shared/cstrike/w_para.c
../../shared/cstrike/w_c4bomb.c
../../shared/cstrike/w_flashbang.c
../../shared/cstrike/w_hegrenade.c
../../shared/cstrike/w_smokegrenade.c
../../shared/cstrike/weapons.c
../../shared/valve/weapon_common.c
#endlist

12
src/shared/defs.h
View file

@ -23,6 +23,7 @@
#include "hitmesh.h"
#include "materials.h"
#include "math.h"
#include "sound.h"
/* Those are constant for HL BSP and CANNOT be changed.
* Blame Valve for purchasing a Quake II license but not
@ -94,6 +95,17 @@ dprint(string m)
return prior(m);
}
__wrap string
precache_model(string m)
{
#ifdef CLIENT
dprint(sprintf("^3Client precaching model ^7%s\n", m));
#else
dprint(sprintf("^3Server precaching model ^7%s\n", m));
#endif
return prior(m);
}
/* info print */
void
iprint(string m)

45
src/shared/gearbox/include.src Normal file
View file

@ -0,0 +1,45 @@
#includelist
../../shared/sound.c
../../shared/valve/animations.h
../../shared/valve/animations.c
../../shared/valve/player.cpp
../../shared/valve/pmove.c
../../shared/pmove.c
../../shared/valve/fx_blood.c
../../shared/valve/fx_breakmodel.c
../../shared/valve/fx_explosion.c
../../shared/valve/fx_gibhuman.c
../../shared/valve/fx_spark.c
../../shared/valve/fx_impact.c
../../shared/gearbox/items.h
../../shared/valve/weapon_common.h
../../shared/gearbox/weapons.h
../../shared/valve/w_crossbow.c
../../shared/valve/w_crowbar.c
../../shared/valve/w_egon.c
../../shared/valve/w_gauss.c
../../shared/valve/w_glock.c
../../shared/valve/w_handgrenade.c
../../shared/valve/w_hornetgun.c
../../shared/valve/w_mp5.c
../../shared/valve/w_python.c
../../shared/valve/w_rpg.c
../../shared/valve/w_satchel.c
../../shared/valve/w_shotgun.c
../../shared/valve/w_snark.c
../../shared/valve/w_tripmine.c
../../shared/gearbox/w_pipewrench.c
../../shared/gearbox/w_knife.c
../../shared/gearbox/w_grapple.c
../../shared/gearbox/w_eagle.c
../../shared/gearbox/w_m249.c
../../shared/gearbox/w_displacer.c
../../shared/gearbox/w_sniperrifle.c
../../shared/gearbox/w_sporelauncher.c
../../shared/gearbox/w_penguin.c
../../shared/gearbox/w_shockrifle.c
../../shared/gearbox/weapons.c
../../shared/valve/weapon_common.c
#endlist

45
src/shared/hunger/include.src Normal file
View file

@ -0,0 +1,45 @@
#includelist
../../shared/sound.c
../../shared/valve/animations.h
../../shared/valve/animations.c
../../shared/valve/player.cpp
../../shared/valve/pmove.c
../../shared/pmove.c
../../shared/valve/fx_blood.c
../../shared/valve/fx_breakmodel.c
../../shared/valve/fx_explosion.c
../../shared/valve/fx_gibhuman.c
../../shared/valve/fx_spark.c
../../shared/valve/fx_impact.c
../../shared/hunger/items.h
../../shared/valve/weapon_common.h
../../shared/hunger/weapons.h
../../shared/valve/w_crossbow.c
../../shared/valve/w_crowbar.c
../../shared/valve/w_egon.c
../../shared/valve/w_gauss.c
../../shared/valve/w_glock.c
../../shared/valve/w_handgrenade.c
../../shared/valve/w_mp5.c
../../shared/valve/w_python.c
../../shared/valve/w_rpg.c
../../shared/valve/w_satchel.c
../../shared/valve/w_shotgun.c
../../shared/valve/w_snark.c
../../shared/valve/w_tripmine.c
../../shared/hunger/w_ap9.c
../../shared/hunger/w_chaingun.c
../../shared/hunger/w_flame.c
../../shared/hunger/w_silencer.c
../../shared/hunger/w_medkit.c
../../shared/hunger/w_shovel.c
../../shared/hunger/w_sniper.c
../../shared/hunger/w_sniper2.c
../../shared/hunger/w_spanner.c
../../shared/hunger/w_taurus.c
../../shared/hunger/w_tnt.c
../../shared/hunger/weapons.c
../../shared/valve/weapon_common.c
#endlist

29
src/shared/poke646/include.src Normal file
View file

@ -0,0 +1,29 @@
#includelist
../../shared/sound.c
../../shared/valve/animations.h
../../shared/valve/animations.c
../../shared/valve/player.cpp
../../shared/valve/pmove.c
../../shared/pmove.c
../../shared/valve/fx_blood.c
../../shared/valve/fx_breakmodel.c
../../shared/valve/fx_explosion.c
../../shared/valve/fx_gibhuman.c
../../shared/valve/fx_spark.c
../../shared/valve/fx_impact.c
../../shared/poke646/items.h
../../shared/valve/weapon_common.h
../../shared/valve/w_satchel.c
../../shared/poke646/weapons.h
../../shared/poke646/w_bradnailer.c
../../shared/poke646/w_cmlwbr.c
../../shared/poke646/w_heaterpipe.c
../../shared/poke646/w_nailgun.c
../../shared/poke646/w_pipebomb.c
../../shared/poke646/w_shotgun.c
../../shared/poke646/w_xs.c
../../shared/poke646/weapons.c
../../shared/valve/weapon_common.c
#endlist

30
src/shared/rewolf/include.src Normal file
View file

@ -0,0 +1,30 @@
#includelist
../../shared/sound.c
../../shared/valve/animations.h
../../shared/valve/animations.c
../../shared/rewolf/player.cpp
../../shared/valve/pmove.c
../../shared/pmove.c
../../shared/valve/fx_blood.c
../../shared/valve/fx_breakmodel.c
../../shared/valve/fx_explosion.c
../../shared/valve/fx_gibhuman.c
../../shared/valve/fx_spark.c
../../shared/valve/fx_impact.c
../../shared/rewolf/items.h
../../shared/valve/weapon_common.h
../../shared/rewolf/weapons.h
../../shared/rewolf/w_fists.c
../../shared/rewolf/w_gausspistol.c
../../shared/rewolf/w_grenade.c
../../shared/rewolf/w_shotgun.c
../../shared/rewolf/w_beamgun.c
../../shared/rewolf/w_chemicalgun.c
../../shared/rewolf/w_dml.c
../../shared/rewolf/w_minigun.c
../../shared/rewolf/w_aicore.c
../../shared/rewolf/weapons.c
../../shared/valve/weapon_common.c
#endlist

38
src/shared/scihunt/include.src Normal file
View file

@ -0,0 +1,38 @@
#includelist
../../shared/sound.c
../../shared/valve/animations.h
../../shared/valve/animations.c
../../shared/valve/player.cpp
../../shared/scihunt/pmove.c
../../shared/pmove.c
../../shared/valve/fx_blood.c
../../shared/valve/fx_breakmodel.c
../../shared/valve/fx_explosion.c
../../shared/valve/fx_gibhuman.c
../../shared/valve/fx_spark.c
../../shared/valve/fx_impact.c
../../shared/scihunt/items.h
../../shared/valve/weapon_common.h
../../shared/scihunt/weapons.h
../../shared/valve/w_crossbow.c
../../shared/valve/w_crowbar.c
../../shared/valve/w_egon.c
../../shared/valve/w_gauss.c
../../shared/valve/w_glock.c
../../shared/valve/w_handgrenade.c
../../shared/valve/w_hornetgun.c
../../shared/valve/w_mp5.c
../../shared/valve/w_python.c
../../shared/valve/w_rpg.c
../../shared/valve/w_satchel.c
../../shared/valve/w_shotgun.c
../../shared/valve/w_snark.c
../../shared/valve/w_tripmine.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
#endlist

8
src/shared/scihunt/w_cannon.c
View file

@ -28,13 +28,17 @@ enum
void w_cannon_precache(void)
{
precache_model("models/v_cannon.mdl");
precache_model("models/p_cannon.mdl");
#ifdef SERVER
precache_sound("cannon/cin.wav");
precache_sound("cannon/close.wav");
precache_sound("cannon/cout.wav");
precache_sound("cannon/fire.wav");
precache_sound("cannon/open.wav");
#else
precache_model("models/v_cannon.mdl");
precache_model("models/p_cannon.mdl");
precache_model("sprites/w_cannon.spr");
#endif
}
void w_cannon_updateammo(player pl)
{

4
src/shared/scihunt/w_chainsaw.c
View file

@ -27,14 +27,18 @@ enum
void w_chainsaw_precache(void)
{
#ifdef SERVER
precache_sound("sh/chainsaw_cutinto.wav");
precache_sound("sh/chainsaw_cutintoflesh.wav");
precache_sound("sh/chainsaw_idle.wav");
precache_sound("sh/chainsaw_idle2.wav");
precache_sound("sh/chainsaw_pullout.wav");
precache_sound("sh/chainsaw_startup.wav");
#else
precache_model("models/v_chainsaw.mdl");
precache_model("models/p_saw.mdl");
precache_model("sprites/chainsaw.spr");
#endif
}
void w_chainsaw_updateammo(player pl)

4
src/shared/scihunt/w_hammer.c
View file

@ -29,13 +29,17 @@ enum
void w_hammer_precache(void)
{
#ifdef SERVER
precache_sound("sh/ham_hitbod1.wav");
precache_sound("sh/ham_hitbod2.wav");
precache_sound("sh/ham_hitbod3.wav");
precache_sound("sh/ham_hitw.wav");
precache_sound("sh/ham_swing.wav");
#else
precache_model("models/p_hammer.mdl");
precache_model("models/v_hammer.mdl");
precache_model("sprites/hammer.spr");
#endif
}
void w_hammer_updateammo(player pl)

40
src/shared/sound.c
View file

@ -17,46 +17,6 @@
.float maxspeed;
.float flags;
var hashtable g_hashsounds;
enumflags
{
SNDFL_LOOPING, /* forceloop */
SNDFL_NODUPS, /* don't random the samples */
SNDFL_GLOBAL, /* no attenuation */
SNDFL_NOREVERB, /* skip reverb */
SNDFL_OMNI, /* volume on all channels is equal */
SNDFL_PRIVATE, /* only play on target */
SNDFL_STEP, /* volume is calculated from entity speed */
SNDFL_FOLLOW
};
typedef struct
{
float dist_min;
float dist_max;
float offset;
float pitch_min;
float pitch_max;
float shake;
float volume;
int flags;
int playc;
int sample_count;
string samples;
string name;
} snd_t;
typedef struct
{
string m_strSnd;
float m_flLength;
float m_flPitch;
} sound_t;
snd_t *g_sounds;
static int g_sounds_count;
/* make sure it's all reset */
void Sound_Init(void)
{

68
src/shared/sound.h Normal file
View file

@ -0,0 +1,68 @@
/*
* Copyright (c) 2016-2020 Marco Hladik <marco@icculus.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
* IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
var hashtable g_hashsounds;
enumflags
{
SNDFL_LOOPING, /* forceloop */
SNDFL_NODUPS, /* don't random the samples */
SNDFL_GLOBAL, /* no attenuation */
SNDFL_NOREVERB, /* skip reverb */
SNDFL_OMNI, /* volume on all channels is equal */
SNDFL_PRIVATE, /* only play on target */
SNDFL_STEP, /* volume is calculated from entity speed */
SNDFL_FOLLOW
};
typedef struct
{
float dist_min;
float dist_max;
float offset;
float pitch_min;
float pitch_max;
float shake;
float volume;
int flags;
int playc;
int sample_count;
string samples;
string name;
} snd_t;
typedef struct
{
string m_strSnd;
float m_flLength;
float m_flPitch;
} sound_t;
snd_t *g_sounds;
int g_sounds_count;
void Sound_Init(void);
void Sound_ParseField(int i, int a);
int Sound_Parse(int i, string line, string shader);
int Sound_Precache(string shader);
void Sound_Play(entity target, int chan, string shader);
void Sound_PlayAt(vector pos, string shader);
#ifdef CLIENT
void Sound_Update(entity target, int channel, int sample, float volume);
#else
void Sound_Speak(entity target, string shader);
#endif

41
src/shared/tfc/include.src Normal file
View file

@ -0,0 +1,41 @@
#includelist
../../shared/sound.c
../../shared/valve/animations.h
../../shared/valve/animations.c
../../shared/valve/player.cpp
../../shared/valve/pmove.c
../../shared/pmove.c
../../shared/valve/fx_blood.c
../../shared/valve/fx_breakmodel.c
../../shared/valve/fx_explosion.c
../../shared/valve/fx_gibhuman.c
../../shared/valve/fx_spark.c
../../shared/valve/fx_impact.c
../../shared/tfc/items.h
../../shared/valve/weapon_common.h
../../shared/tfc/weapons.h
../../shared/tfc/w_asscan.c
../../shared/tfc/w_autorifle.c
../../shared/tfc/w_crowbar.c
../../shared/tfc/w_dbs.c
../../shared/tfc/w_flamer.c
../../shared/tfc/w_glauncher.c
../../shared/tfc/w_grapple.c
../../shared/tfc/w_incendiary.c
../../shared/tfc/w_knife.c
../../shared/tfc/w_medkit.c
../../shared/tfc/w_nailgun.c
../../shared/tfc/w_pipebomb.c
../../shared/tfc/w_railgun.c
../../shared/tfc/w_rpg.c
../../shared/tfc/w_sbs.c
../../shared/tfc/w_sniper.c
../../shared/tfc/w_supernail.c
../../shared/tfc/w_tranquil.c
../../shared/tfc/w_umbrella.c
../../shared/tfc/w_wrench.c
../../shared/tfc/weapons.c
../../shared/valve/weapon_common.c
#endlist

35
src/shared/valve/include.src Normal file
View file

@ -0,0 +1,35 @@
#includelist
../../shared/sound.c
../../shared/valve/animations.h
../../shared/valve/animations.c
../../shared/valve/player.cpp
../../shared/valve/pmove.c
../../shared/pmove.c
../../shared/valve/fx_blood.c
../../shared/valve/fx_breakmodel.c
../../shared/valve/fx_explosion.c
../../shared/valve/fx_gibhuman.c
../../shared/valve/fx_spark.c
../../shared/valve/fx_impact.c
../../shared/valve/items.h
../../shared/valve/weapon_common.h
../../shared/valve/weapons.h
../../shared/valve/w_crossbow.c
../../shared/valve/w_crowbar.c
../../shared/valve/w_egon.c
../../shared/valve/w_gauss.c
../../shared/valve/w_glock.c
../../shared/valve/w_handgrenade.c
../../shared/valve/w_hornetgun.c
../../shared/valve/w_mp5.c
../../shared/valve/w_python.c
../../shared/valve/w_rpg.c
../../shared/valve/w_satchel.c
../../shared/valve/w_shotgun.c
../../shared/valve/w_snark.c
../../shared/valve/w_tripmine.c
../../shared/valve/weapons.c
../../shared/valve/weapon_common.c
#endlist