alias cl_hook_gamestart_ft
alias cl_hook_gamestart_inv
alias cl_hook_gamestart_duel
-alias cl_hook_gameend "rpn /cl_matchcount dup load 1 + =" // increase match count every time a game ends
+alias cl_hook_gameend
alias cl_hook_shutdown
alias cl_hook_activeweapon
-erebus,erebus
+erebus,erebusfullbright
erebus.001,shadowhead
-erebus,erebusfullbright
+erebus,erebus
erebus.001,shadowhead
-erebus,erebus
+erebus,erebusfullbright
erebus.001,shadowhead
-erebus,erebusfullbright
+erebus,erebus
erebus.001,shadowhead
-erebus,erebus
+erebus,erebusfullbright
erebus.001,shadowhead
-erebus,erebusfullbright
+erebus,erebus
erebus.001,shadowhead
-gak2.001,gakarmor
-gak2,gak
+gak2.001,gakarmorfb
+gak2,gakfullbright
-gak2.001,gakarmorfb
-gak2,gakfullbright
+gak2.001,gakarmor
+gak2,gak
-gak2.001,gakarmor
-gak2,gak
+gak2.001,gakarmorfb
+gak2,gakfullbright
-gak2.001,gakarmorfb
-gak2,gakfullbright
+gak2.001,gakarmor
+gak2,gak
-gak2.001,gakarmor
-gak2,gak
+gak2.001,gakarmorfb
+gak2,gakfullbright
-gak2.001,gakarmorfb
-gak2,gakfullbright
+gak2.001,gakarmor
+gak2,gak
-gak3,gak
-gak3.001,gakarmor
+gak3,gakfullbright
+gak3.001,gakarmorfb
-gak3,gakfullbright
-gak3.001,gakarmorfb
+gak3,gak
+gak3.001,gakarmor
-gak3,gak
-gak3.001,gakarmor
+gak3,gakfullbright
+gak3.001,gakarmorfb
-gak3,gakfullbright
-gak3.001,gakarmorfb
+gak3,gak
+gak3.001,gakarmor
-gak3,gak
-gak3.001,gakarmor
+gak3,gakfullbright
+gak3.001,gakarmorfb
-gak3,gakfullbright
-gak3.001,gakarmorfb
+gak3,gak
+gak3.001,gakarmor
-ignis1,ignis
+ignis1,ignisfullbright
ignis1.001,ignishead
-ignis1,ignisfullbright
+ignis1,ignis
ignis1.001,ignishead
-ignis1,ignis
+ignis1,ignisfullbright
ignis1.001,ignishead
-ignis1,ignisfullbright
+ignis1,ignis
ignis1.001,ignishead
-ignis1,ignis
+ignis1,ignisfullbright
ignis1.001,ignishead
-ignis1,ignisfullbright
+ignis1,ignis
ignis1.001,ignishead
-ignis1,ignis
+ignis1,ignisfullbright
ignis3,ignishead
-ignis1,ignisfullbright
+ignis1,ignis
ignis3,ignishead
-ignis1,ignis
+ignis1,ignisfullbright
ignis3,ignishead
-ignis1,ignisfullbright
+ignis1,ignis
ignis3,ignishead
-ignis1,ignis
+ignis1,ignisfullbright
ignis3,ignishead
-ignis1,ignisfullbright
+ignis1,ignis
ignis3,ignishead
-nyx,nyx
+nyx,nyxfullbright
nyx.001,shadowhead
-nyx,nyxfullbright
+nyx,nyx
nyx.001,shadowhead
-nyx,nyx
+nyx,nyxfullbright
nyx.001,shadowhead
-nyx,nyxfullbright
+nyx,nyx
nyx.001,shadowhead
-nyx,nyx
+nyx,nyxfullbright
nyx.001,shadowhead
-nyx,nyxfullbright
+nyx,nyx
nyx.001,shadowhead
pyria_obj.001,pyriahair
-pyria_obj,pyria
+pyria_obj,pyriafullbright
pyria_obj.001,pyriahair
-pyria_obj,pyriafullbright
+pyria_obj,pyria
pyria_obj.001,pyriahair
-pyria_obj,pyria
+pyria_obj,pyriafullbright
pyria_obj.001,pyriahair
-pyria_obj,pyriafullbright
+pyria_obj,pyria
pyria_obj.001,pyriahair
-pyria_obj,pyria
+pyria_obj,pyriafullbright
pyria_obj.001,pyriahair
-pyria_obj,pyriafullbright
+pyria_obj,pyria
ignis42.001,seraphina
-ignis42,ignis
+ignis42,ignisfullbright
ignis42.001,seraphina
-ignis42,ignisfullbright
+ignis42,ignis
ignis42.001,seraphina
-ignis42,ignis
+ignis42,ignisfullbright
ignis42.001,seraphina
-ignis42,ignisfullbright
+ignis42,ignis
ignis42.001,seraphina
-ignis42,ignis
+ignis42,ignisfullbright
ignis42.001,seraphina
-ignis42,ignisfullbright
+ignis42,ignis
-ignis42,ignis
+ignis42,ignisfullbright
ignis42.002,ignishead
-ignis42,ignisfullbright
+ignis42,ignis
ignis42.002,ignishead
-ignis42,ignis
+ignis42,ignisfullbright
ignis42.002,ignishead
-ignis42,ignisfullbright
+ignis42,ignis
ignis42.002,ignishead
-ignis42,ignis
+ignis42,ignisfullbright
ignis42.002,ignishead
-ignis42,ignisfullbright
+ignis42,ignis
ignis42.002,ignishead
-umbra,umbra
+umbra,umbrafullbright
-umbra,umbrafullbright
+umbra,umbra
-umbra,umbra
+umbra,umbrafullbright
-umbra,umbrafullbright
+umbra,umbra
-umbra,umbra
+umbra,umbrafullbright
-umbra,umbrafullbright
+umbra,umbra
// GLOWMOD AND DEATH FADING
if(this.colormap > 0)
- this.glowmod = colormapPaletteColor(((this.colormap >= 1024) ? this.colormap : entcs_GetClientColors(this.colormap - 1)) & 0x0F, true) * 2;
+ this.glowmod = colormapPaletteColor(((this.colormap >= 1024) ? this.colormap : entcs_GetClientColors(this.colormap - 1)) & 0x0F, true);
else
this.glowmod = '1 1 1';
}
}
+ // don't let the engine increase player's glowmod
+ if (autocvar_r_hdr_glowintensity > 1)
+ this.glowmod /= autocvar_r_hdr_glowintensity;
+
//printf("CSQCPlayer_ModelAppearance_Apply(): state = %s, colormap = %f, glowmod = %s\n", (this.csqcmodel_isdead ? "DEAD" : "ALIVE"), this.colormap, vtos(this.glowmod));
}
float autocvar_cl_deathglow;
float autocvar_cl_deathglow_min = 0.5;
float autocvar_cl_jetpack_attenuation = 2;
+float autocvar_r_hdr_glowintensity;
// FEATURE: EF_NODRAW workalike
const int EF_BRIGHTFIELD = BIT(0);
if (!(calledhooks & HOOK_START))
localcmd("\n_cl_hook_gamestart nop\n");
if (!(calledhooks & HOOK_END))
+ {
+ int gamecount = cvar("cl_matchcount");
localcmd("\ncl_hook_gameend\n");
+ // NOTE: using localcmd here to ensure it's executed AFTER cl_hook_gameend
+ // earlier versions of the game abuse the hook to set this cvar
+ localcmd(strcat("cl_matchcount ", itos(gamecount + 1), "\n"));
+ //cvar_set("cl_matchcount", itos(gamecount + 1));
+ }
}
localcmd("\ncl_hook_shutdown\n");
{
if(calledhooks & HOOK_START)
{
+ int gamecount = cvar("cl_matchcount");
localcmd("\ncl_hook_gameend\n");
+ // NOTE: using localcmd here to ensure it's executed AFTER cl_hook_gameend
+ // earlier versions of the game abuse the hook to set this cvar
+ localcmd(strcat("cl_matchcount ", itos(gamecount + 1), "\n"));
+ //cvar_set("cl_matchcount", itos(gamecount + 1));
calledhooks |= HOOK_END;
}
}
// TODO: projectiles use glowmaps for their color, not teams
#if 0
if(this.colormap > 0)
- this.glowmod = colormapPaletteColor(this.colormap & 0x0F, true) * 2;
+ this.glowmod = colormapPaletteColor(this.colormap & 0x0F, true);
else
this.glowmod = '1 1 1';
#endif
.vector glowmod;
void turret_changeteam(entity this)
{
- this.glowmod = Team_ColorRGB(this.team - 1) * 2;
+ this.glowmod = Team_ColorRGB(this.team - 1);
this.teamradar_color = Team_ColorRGB(this.team - 1);
if(this.team)
#include "all.inc"
-// TODO: remove after 0.8.2. Retains impulse number compatibility because 0.8.1 clients don't reload the weapons.cfg
-#define WEP_HARDCODED_IMPULSES 20
-
// TODO: invert after 0.8.2. Will require moving 'best weapon' impulses
#define WEP_IMPULSE_BEGIN 230
#define WEP_IMPULSE_END bound(WEP_IMPULSE_BEGIN, WEP_IMPULSE_BEGIN + (REGISTRY_COUNT(Weapons) - 1) - 1, 253)
-REGISTRY_SORT(Weapons, WEP_HARDCODED_IMPULSES + 1)
+REGISTRY_SORT(Weapons, 1)
REGISTRY_CHECK(Weapons)
STATIC_INIT(register_weapons_done)
vector weaponentity_glowmod(Weapon wep, entity actor, int c, entity wepent)
{
vector g;
- if (!(g = wep.wr_glow(wep, actor, wepent))) g = colormapPaletteColor(c & 0x0F, true) * 2;
+ if (!(g = wep.wr_glow(wep, actor, wepent))) g = colormapPaletteColor(c & 0x0F, true);
return g;
}
+++ /dev/null
-// TODO: remove after 0.8.2. Default impulse commands for 0.8.1 servers
-alias weapon_blaster "impulse 230"
-alias weapon_shotgun "impulse 231"
-alias weapon_machinegun "impulse 232"
-alias weapon_mortar "impulse 233"
-alias weapon_minelayer "impulse 234"
-alias weapon_electro "impulse 235"
-alias weapon_crylink "impulse 236"
-alias weapon_vortex "impulse 237"
-alias weapon_hagar "impulse 238"
-alias weapon_devastator "impulse 239"
-alias weapon_porto "impulse 240"
-alias weapon_vaporizer "impulse 241"
-alias weapon_hook "impulse 242"
-alias weapon_hlac "impulse 243"
-alias weapon_tuba "impulse 244"
-alias weapon_rifle "impulse 245"
-alias weapon_fireball "impulse 246"
-alias weapon_seeker "impulse 247"
-alias weapon_shockwave "impulse 248"
-alias weapon_arc "impulse 249"
+++ /dev/null
-#!/bin/sh
-<qcsrc/server/w_all.qc perl -ne 'BEGIN{$i=230}/w_(.*?)\./ or+next;printf qq{alias weapon_%s "impulse %d"\n},$1,$i++;'
alias weapon_group_8 "impulse 8"
alias weapon_group_9 "impulse 9"
alias weapon_group_0 "impulse 14" // cycles the superweapons
-// TODO: remove after 0.8.2. Default impulse commands for 0.8.1 servers
-exec weapons.cfg
cl_curl_enabled 1
cl_curl_maxdownloads 3