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

Compare commits

base: nuclide-ports:ffce52aa2c85f9126ee51d19379a9097ad307aa7
Branches Tags
nuclide-ports:master
...
compare: nuclide-ports:75e1228f6014110b9ae315d857869fc2f92a2e50
Branches Tags
nuclide-ports:master

3 Commits
ffce52aa2c ... 75e1228f60

Author SHA1 Message Date
Marco Cawthorne 75e1228f60
Client: Remove duplicate g_specmodes[] definition 2024-01-08 15:28:07 -08:00
Marco Cawthorne 3e479db7dc
WEAPON_GRAPPLE: use the sprites Serecky has made for the extras package 2024-01-05 13:39:01 -08:00
Marco Cawthorne a901c060cb
Gamerules: DamageRadius check argument is of type bool now 2024-01-05 13:38:17 -08:00
5 changed files with 8 additions and 10 deletions
Show Stats Expand all files Collapse all files

6
src/client/hud.qc
View File

@ -572,12 +572,6 @@ HUD_Draw(void)
Damage_Draw(); Damage_Draw();
} }
string g_specmodes[] = {
"Free Camera",
"Third Person",
"First Person"
};
/* specatator main entry */ /* specatator main entry */
void void
HUD_DrawSpectator(void) HUD_DrawSpectator(void)

2
src/server/gamerules.h
View File

@ -17,7 +17,7 @@
class HLGameRules:NSGameRules class HLGameRules:NSGameRules
{ {
virtual void DamageApply(entity, entity, float, int, damageType_t); virtual void DamageApply(entity, entity, float, int, damageType_t);
virtual void DamageRadius(vector, entity, float, float, int, int); virtual void DamageRadius(vector, entity, float, float, bool, int);
virtual void PlayerConnect(NSClientPlayer); virtual void PlayerConnect(NSClientPlayer);
virtual void PlayerDisconnect(NSClientPlayer); virtual void PlayerDisconnect(NSClientPlayer);
virtual void PlayerKill(NSClientPlayer); virtual void PlayerKill(NSClientPlayer);

2
src/server/gamerules.qc
View File

@ -56,7 +56,7 @@ HLGameRules::DamageApply(entity t, entity c, float dmg, int w, damageType_t type
} }
void void
HLGameRules::DamageRadius(vector org, entity attacker, float dmg, float r, int check, int w) HLGameRules::DamageRadius(vector org, entity attacker, float dmg, float r, bool check, int w)
{ {
float new_dmg; float new_dmg;
float dist; float dist;

4
src/server/item_backpack.qc
View File

@ -86,6 +86,10 @@ void
item_backpack::item_backpack(void) item_backpack::item_backpack(void)
{ {
botinfo = BOTINFO_AMMO; botinfo = BOTINFO_AMMO;
ammo_shells = 0;
ammo_nails = 0;
ammo_rockets = 0;
ammo_cells = 0;
} }
void void

4
src/shared/w_grapple.qc
View File

@ -198,7 +198,7 @@ w_grapple_hudpic(player pl, int selected, vector pos, float a)
drawsubpic( drawsubpic(
pos, pos,
[170,45], [170,45],
g_hudcb_spr, "sprites/hud10.png",
[0,0], [0,0],
[1,0.625], [1,0.625],
g_hud_color, g_hud_color,
@ -209,7 +209,7 @@ w_grapple_hudpic(player pl, int selected, vector pos, float a)
drawsubpic( drawsubpic(
pos, pos,
[170,45], [170,45],
g_hudcb_spr, "sprites/hud10.png",
[0,0], [0,0],
[1,0.625], [1,0.625],
g_hud_color, g_hud_color,