fn/cstrike
fn/cstrike
3
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Clean up 'self' references in the weapon code that needed purging and set some sensible defaults for accurate lightmap settings.

Browse source
This commit is contained in:
Marco Cawthorne 2022-04-26 13:04:20 -07:00
parent 1dc0e57415
commit 8a15293808
Signed by: eukara
GPG key ID: C196CD8BA993248A
25 changed files with 62 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/server/info_map_parameters.qc
View file

@ -40,24 +40,32 @@ enum
BUY_NEITHER
};
class info_map_parameters
class info_map_parameters:NSEntity
{
void(void) info_map_parameters;
virtual void(string, string) SpawnKey;
};
void
info_map_parameters::info_map_parameters(void)
info_map_parameters::SpawnKey(string strKey, string strValue)
{
for (int i = 1; i < (tokenize(__fullspawndata) - 1); i += 2) {
switch (argv(i)) {
case "buying":
g_cstrike_buying = stoi(argv(i+1));
break;
case "bombradius":
g_cstrike_bombradius = stof(argv(i+1));
break;
default:
break;
}
switch (strKey) {
case "buying":
g_cstrike_buying = stoi(strValue);
breakpoint();
break;
case "bombradius":
g_cstrike_bombradius = stof(strValue);
break;
default:
super::SpawnKey(strKey, strValue);
break;
}
}
void
info_map_parameters:: info_map_parameters(void)
{
super::NSEntity();
}

4
src/shared/animations.qc
View file

@ -42,7 +42,7 @@ void Animation_Print(string sWow) {
void
Animation_TimerUpdate(player pl, float ftime)
{
makevectors([0, pl.angles[1], 0]);
makevectors([0, pl.v_angle[1], 0]);
/* top animation is always just being incremented */
pl.anim_top_time += ftime;
@ -67,7 +67,7 @@ depending on what the player is doing
void
Animation_PlayerUpdate(player pl)
{
pl.basebone = gettagindex(self, "-- R shoulder outside");
pl.basebone = gettagindex(pl, "-- R shoulder outside");
if (pl.anim_top_delay <= 0.0f) {
pl.anim_top = Weapons_GetAim(pl, pl.activeweapon);

2
src/shared/w_ak47.qc
View file

@ -234,7 +234,7 @@ w_ak47_release(player pl)
float
w_ak47_aimanim(player pl)
{
return self.flags & FL_CROUCHING ? ANIM_CROUCH_AIM_AK47 : ANIM_AIM_AK47;
return pl.flags & FL_CROUCHING ? ANIM_CROUCH_AIM_AK47 : ANIM_AIM_AK47;
}
void

4
src/shared/w_aug.qc
View file

@ -11,7 +11,7 @@
* 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.
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWAR. .E.
*/
/*QUAKED weapon_aug (0 0 1) (-16 -16 0) (16 16 32)
@ -134,7 +134,7 @@ w_aug_primary(player pl)
break;
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_RIFLE, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_RIFLE, 0.45f);

2
src/shared/w_awp.qc
View file

@ -225,7 +225,7 @@ w_awp_primary(player pl)
break;
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_RIFLE, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_RIFLE, 0.45f);

4
src/shared/w_deagle.qc
View file

@ -167,7 +167,7 @@ w_deagle_primary(player pl)
}
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_ONEHAND, 0.45f);
else
Animation_PlayerTop(pl, ANIM_SHOOT_ONEHAND, 0.45f);
@ -233,7 +233,7 @@ w_deagle_release(player pl)
float
w_deagle_aimanim(player pl)
{
return self.flags & FL_CROUCHING ? ANIM_CROUCH_AIM_ONEHAND : ANIM_AIM_ONEHAND;
return pl.flags & FL_CROUCHING ? ANIM_CROUCH_AIM_ONEHAND : ANIM_AIM_ONEHAND;
}
void

8
src/shared/w_elites.qc
View file

@ -112,13 +112,13 @@ w_elites_updateammo(player pl)
string
w_elites_wmodel(void)
{
return "models/w_elites.mdl";
return "models/w_elite.mdl";
}
string
w_elites_pmodel(player pl)
{
return "models/p_elites.mdl";
return "models/p_elite.mdl";
}
string
@ -228,7 +228,7 @@ w_elites_primary(player pl)
}
}
if (self.flags & FL_CROUCHING) {
if (pl.flags & FL_CROUCHING) {
if (pl.mode_temp)
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT2_DUALPISTOLS, 0.45f);
else
@ -303,7 +303,7 @@ w_elites_release(player pl)
float
w_elites_aimanim(player pl)
{
return self.flags & FL_CROUCHING ? ANIM_CROUCH_AIM_DUALPISTOLS : ANIM_AIM_DUALPISTOLS;
return pl.flags & FL_CROUCHING ? ANIM_CROUCH_AIM_DUALPISTOLS : ANIM_AIM_DUALPISTOLS;
}
void

4
src/shared/w_fiveseven.qc
View file

@ -138,7 +138,7 @@ w_fiveseven_primary(player pl)
}
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_ONEHAND, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_ONEHAND, 0.45f);
@ -202,7 +202,7 @@ w_fiveseven_release(player pl)
float
w_fiveseven_aimanim(player pl)
{
return self.flags & FL_CROUCHING ? ANIM_CROUCH_AIM_ONEHAND : ANIM_AIM_ONEHAND;
return pl.flags & FL_CROUCHING ? ANIM_CROUCH_AIM_ONEHAND : ANIM_AIM_ONEHAND;
}
void

2
src/shared/w_g3sg1.qc
View file

@ -129,7 +129,7 @@ w_g3sg1_primary(player pl)
break;
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_RIFLE, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_RIFLE, 0.45f);

6
src/shared/w_knife.qc
View file

@ -102,7 +102,7 @@ w_knife_primary(player pl)
break;
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_KNIFE, 1.33f);
else
Animation_PlayerTop(pl, ANIM_SHOOT_KNIFE, 1.33f);
@ -144,7 +144,7 @@ w_knife_secondary(player pl)
Weapons_ViewAnimation(pl, KNIFE_STAB);
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_KNIFE, 1.33f);
else
Animation_PlayerTop(pl, ANIM_SHOOT_KNIFE, 1.33f);
@ -178,7 +178,7 @@ w_knife_secondary(player pl)
float
w_knife_aimanim(player pl)
{
return self.flags & FL_CROUCHING ? ANIM_CROUCH_AIM_KNIFE : ANIM_AIM_KNIFE;
return pl.flags & FL_CROUCHING ? ANIM_CROUCH_AIM_KNIFE : ANIM_AIM_KNIFE;
}
int

2
src/shared/w_m3.qc
View file

@ -195,7 +195,7 @@ w_m3_primary(player pl)
#else
TraceAttack_SetPenetrationPower(0); /* shotties can't wallbang?! */
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_SHOTGUN, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_SHOTGUN, 0.45f);

4
src/shared/w_m4a1.qc
View file

@ -163,7 +163,7 @@ w_m4a1_primary(player pl)
}
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_RIFLE, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_RIFLE, 0.45f);
@ -248,7 +248,7 @@ w_m4a1_reload(player pl)
float
w_m4a1_aimanim(player pl)
{
return w_ak47_aimanim(pl);
return pl.flags & FL_CROUCHING ? ANIM_CROUCH_AIM_RIFLE : ANIM_AIM_RIFLE;
}
void

2
src/shared/w_mac10.qc
View file

@ -133,7 +133,7 @@ w_mac10_primary(player pl)
break;
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_MP5, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_MP5, 0.45f);

2
src/shared/w_mp5.qc
View file

@ -131,7 +131,7 @@ w_mp5_primary(player pl)
break;
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_MP5, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_MP5, 0.45f);

2
src/shared/w_p228.qc
View file

@ -138,7 +138,7 @@ w_p228_primary(player pl)
}
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_ONEHAND, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_ONEHAND, 0.45f);

2
src/shared/w_p90.qc
View file

@ -131,7 +131,7 @@ w_p90_primary(player pl)
break;
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_MP5, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_MP5, 0.45f);

2
src/shared/w_para.qc
View file

@ -127,7 +127,7 @@ w_para_primary(player pl)
break;
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_PARA, 0.45f);
else
Animation_PlayerTop(pl, ANIM_SHOOT_PARA, 0.45f);

2
src/shared/w_scout.qc
View file

@ -187,7 +187,7 @@ w_scout_primary(player pl)
break;
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_RIFLE, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_RIFLE, 0.45f);

2
src/shared/w_sg550.qc
View file

@ -127,7 +127,7 @@ w_sg550_primary(player pl)
break;
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_RIFLE, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_RIFLE, 0.45f);

2
src/shared/w_sg552.qc
View file

@ -131,7 +131,7 @@ w_sg552_primary(player pl)
break;
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_RIFLE, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_RIFLE, 0.45f);

2
src/shared/w_tmp.qc
View file

@ -131,7 +131,7 @@ w_tmp_primary(player pl)
break;
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_MP5, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_MP5, 0.45f);

2
src/shared/w_ump45.qc
View file

@ -131,7 +131,7 @@ w_ump45_primary(player pl)
break;
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_MP5, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_MP5, 0.45f);

2
src/shared/w_usp45.qc
View file

@ -174,7 +174,7 @@ w_usp45_primary(player pl)
}
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_ONEHAND, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_ONEHAND, 0.45f);

2
src/shared/w_xm1014.qc
View file

@ -189,7 +189,7 @@ w_xm1014_primary(player pl)
break;
}
if (self.flags & FL_CROUCHING)
if (pl.flags & FL_CROUCHING)
Animation_PlayerTop(pl, ANIM_SHOOT_SHOTGUN, 0.45f);
else
Animation_PlayerTop(pl, ANIM_CROUCH_SHOOT_SHOTGUN, 0.45f);

11
zpak001.pk3dir/default.cfg
View file

@ -75,10 +75,15 @@ seta sv_airaccelerate 10
seta sv_wateraccelerate 8
seta sv_accelerate 4
seta sv_maxspeed 250
// disable some nuclide niceties
seta v_muzzledlight 0
// disable some nuclide niceties
seta v_muzzledlight 0
// config compat
alias mp_timelimit timelimit
alias mp_fraglimit fraglimit
// video settings
seta gl_overbright 0
seta gl_ldr 1
seta r_lightmap_format rgb8