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

Merge branch 'master' of ssh://git.code.sf.net/p/freecs-1-5/code

Browse source
This commit is contained in:
Marco Cawthorne 2021-04-04 23:18:44 +02:00
commit 94762dfa89
2 changed files with 41 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/client/damage.qc
View file

@ -14,6 +14,20 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
var string g_damage_spr_t;
var string g_damage_spr_b;
var string g_damage_spr_l;
var string g_damage_spr_r;
void
Damage_Precache(void)
{
g_damage_spr_t = spriteframe("sprites/640_pain.spr", 0, 0.0f);
g_damage_spr_r = spriteframe("sprites/640_pain.spr", 1, 0.0f);
g_damage_spr_b = spriteframe("sprites/640_pain.spr", 2, 0.0f);
g_damage_spr_l = spriteframe("sprites/640_pain.spr", 3, 0.0f);
}
void
Damage_Draw(void)
{
@ -41,19 +55,19 @@ Damage_Draw(void)
fw_alpha = fabs(fw) * pSeat->m_flDamageAlpha;
if (fw > 0.25f) {
drawpic(center + [-64,-102], "sprites/640_pain.spr_0.tga",
drawpic(center + [-64,-102], g_damage_spr_t,
[128,48], [1,1,1], fw_alpha, DRAWFLAG_ADDITIVE);
} else if (fw < -0.25f) {
drawpic(center + [-64,70], "sprites/640_pain.spr_2.tga",
drawpic(center + [-64,70], g_damage_spr_b,
[128,48], [1,1,1], fw_alpha, DRAWFLAG_ADDITIVE);
}
rt_alpha = fabs(rt) * pSeat->m_flDamageAlpha;
if (rt > 0.25f) {
drawpic(center + [70,-64], "sprites/640_pain.spr_1.tga",
drawpic(center + [70,-64], g_damage_spr_r,
[48,128], [1,1,1], rt_alpha, DRAWFLAG_ADDITIVE);
} else if (rt < -0.25f) {
drawpic(center + [-102,-64], "sprites/640_pain.spr_3.tga",
drawpic(center + [-102,-64], g_damage_spr_l,
[48,128], [1,1,1], rt_alpha, DRAWFLAG_ADDITIVE);
}

40
src/client/entry.qc
View file

@ -24,11 +24,20 @@ CSQC_Init(float apilevel, string enginename, float engineversion)
pSeat = &g_seats[0];
pSeatLocal = &g_seatslocal[0];
/* developer/debug commands */
registercommand("getpos");
registercommand("callvote");
registercommand("dev_sentence");
registercommand("titles_test");
registercommand("vox_test");
registercommand("buildcubemaps");
registercommand("dev_sunpos");
registercommand("dev_measure");
registercommand("view_geomtest");
registercommand("way_menu");
/* basic actions */
registercommand("+attack");
registercommand("-attack");
registercommand("+attack2");
registercommand("-attack2");
registercommand("+reload");
@ -37,15 +46,15 @@ CSQC_Init(float apilevel, string enginename, float engineversion)
registercommand("-use");
registercommand("+duck");
registercommand("-duck");
/* voting */
registercommand("vote");
registercommand("callvote");
registercommand("+saturn_menu");
registercommand("-saturn_menu");
/* Requested by Slacer */
registercommand("+zoomin");
registercommand("-zoomin");
/* hud weapon selection system */
registercommand("slot1");
registercommand("slot2");
registercommand("slot3");
@ -59,17 +68,17 @@ CSQC_Init(float apilevel, string enginename, float engineversion)
registercommand("lastinv");
registercommand("invnext");
registercommand("invprev");
/* scoreboard */
registercommand("+showscores");
registercommand("-showscores");
registercommand("buildcubemaps");
registercommand("_fnchat_msg");
registercommand("dev_sunpos");
registercommand("dev_measure");
registercommand("way_menu");
registercommand("view_geomtest");
precache_model("sprites/640_pain.spr");
precache_model("sprites/crosshairs.spr");
/* meant to be hidden */
registercommand("_fnchat_msg");
/* Requested by Slacer */
registercommand("+zoomin");
registercommand("-zoomin");
/* VOX */
Vox_Init();
@ -121,6 +130,7 @@ CSQC_RendererRestarted(string rstr)
View_Init();
ClientGame_RendererRestart(rstr);
HUD_Init();
Damage_Precache();
/* GS-Entbase */
Fade_Init();
@ -1031,10 +1041,6 @@ CSQC_WorldLoaded(void)
return;
}
}
/* we've gone through all ent-lumps, so we can read sky-overrides from
worldspawn now. */
Sky_Update(TRUE);
}
/*