nzp-team/quakec
0
0
Fork 0
mirror of https://github.com/nzp-team/quakec.git synced 2024-11-29 15:22:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

DEFINES: Merge conflict fixed..?

Browse source
This commit is contained in:
Steam Deck User 2023-03-22 10:21:35 -04:00
commit 2da62518c0
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/server/entities/lights.qc
View file

@ -87,15 +87,15 @@ void() light_environment = // Sun cast from Sky
void() light_fluorospark = // Light with buzz ambient
{ L_Setup(); }
void() light_globe = // Light with visible globe
{ Precache_Set("progs/s_light.spr"); makestatic(self); }
{ L_Setup(); makestatic(self); }
void() light_torch_small_walltorch = // Light with visible wall torch
{ Precache_Set("progs/flame.mdl"); makestatic(self); }
{ L_Setup(); makestatic(self); }
void() light_torch_small_yellow = // Light with small flame & fire sound
{ Precache_Set("progs/flame2.mdl"); makestatic(self); }
{ L_Setup(); makestatic(self); }
void() light_torch_large_yellow = // Light with larger flame & fire sound
{ Precache_Set("progs/flame2.mdl"); self.frame = 1; makestatic(self); }
{ L_Setup(); self.frame = 1; makestatic(self); }
void() light_flame_small_white = // Light with small flame & fire sound
{ Precache_Set("progs/flame2.mdl"); makestatic(self); }
{ L_Setup(); makestatic(self); }
//
// --------------------

25
source/shared/weapon_defines.qc
View file

@ -1443,7 +1443,7 @@ vector GetWeaponADSPos(float wep) {
return [0, 2.80, 1.1];
case W_M2:
case W_FIW:
return [0, 0.89, 0.82];
return [6.0, 4.3, 1.02];
case W_RAY:
case W_PORTER:
return [-1.50, 6.25, 0.87];
@ -1484,6 +1484,9 @@ vector GetWeaponADSOfs_PSP(float wep) =
case W_TRENCH:
case W_GUT:
return [-5527.1, 2880.3, 0];
case W_M2:
case W_FIW:
return [-9006.5, 2779.2, 9900];
case W_357:
case W_KILLU:
return [-8306.5, 879.2, 0];
@ -2054,29 +2057,29 @@ float(float wep, float frametype, optional float z) GetFrame =
switch (frametype)
{
case FIRE_START:
return 0;
return 1;
case FIRE_END:
return 0;
return 3;
case SPRINT_IN_START:
return 0;
return 17;
case SPRINT_IN_END:
return 0;
return 18;
case SPRINT_OUT_START:
return 8;
return 18;
case SPRINT_OUT_END:
return 0;
return 19;
case FIRST_TAKE_START:
return 6;
case FIRST_TAKE_END:
return 17;
case TAKE_OUT_START:
return 2;
return 22;
case TAKE_OUT_END:
return 1;
return 24;
case PUT_OUT_START:
return 1;
return 20;
case PUT_OUT_END:
return 2;
return 22;
case RELOAD_CANCEL:
return 0;
}