From 6d67733d7e099158e83c70d03fba7128713bc30a Mon Sep 17 00:00:00 2001 From: Night Owl Date: Sun, 18 Sep 2016 19:06:07 +0500 Subject: [PATCH] Merge @malortie's patches for Big Lolly. --- cl_dll/health.cpp | 3 ++- cl_dll/hud.h | 2 +- dlls/items.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cl_dll/health.cpp b/cl_dll/health.cpp index d4979c35..eebf0eb0 100644 --- a/cl_dll/health.cpp +++ b/cl_dll/health.cpp @@ -231,7 +231,8 @@ int CHudHealth::Draw( float flTime ) int iHeight = gHUD.m_iFontHeight; int iWidth = HealthWidth / 10; - FillRGBA( x, y, iWidth, iHeight, 255, 160, 0, a ); + UnpackRGB( r, g, b, RGB_YELLOWISH ); + FillRGBA( x, y, iWidth, iHeight, r, g, b, a ); } DrawDamage( flTime ); diff --git a/cl_dll/hud.h b/cl_dll/hud.h index ec236003..36c478cd 100644 --- a/cl_dll/hud.h +++ b/cl_dll/hud.h @@ -20,7 +20,7 @@ // CHud handles the message, calculation, and drawing the HUD // -#define RGB_YELLOWISH 0x00FFA000 //255,160,0 +#define RGB_YELLOWISH 0x00FF80C0 //255,128,192 #define RGB_REDISH 0x00FF1010 //255,160,0 #define RGB_GREENISH 0x0000A000 //0,160,0 diff --git a/dlls/items.cpp b/dlls/items.cpp index d9cc7871..a281226b 100644 --- a/dlls/items.cpp +++ b/dlls/items.cpp @@ -210,7 +210,7 @@ class CItemBattery : public CItem void Precache( void ) { PRECACHE_MODEL( "models/w_battery.mdl" ); - PRECACHE_SOUND( "items/gunpickup2.wav" ); + PRECACHE_SOUND( "items/smallmedkit1.wav" ); } BOOL MyTouch( CBasePlayer *pPlayer ) { @@ -228,7 +228,7 @@ class CItemBattery : public CItem pPlayer->pev->armorvalue += gSkillData.batteryCapacity; pPlayer->pev->armorvalue = min( pPlayer->pev->armorvalue, MAX_NORMAL_BATTERY ); - EMIT_SOUND( pPlayer->edict(), CHAN_ITEM, "items/gunpickup2.wav", 1, ATTN_NORM ); + EMIT_SOUND( pPlayer->edict(), CHAN_ITEM, "items/smallmedkit1.wav", 1, ATTN_NORM ); MESSAGE_BEGIN( MSG_ONE, gmsgItemPickup, NULL, pPlayer->pev ); WRITE_STRING( STRING( pev->classname ) );