[nexuiz-commits] r6452 - in trunk/data/qcsrc: client server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Apr 7 03:08:21 EDT 2009
Author: div0
Date: 2009-04-07 03:08:19 -0400 (Tue, 07 Apr 2009)
New Revision: 6452
Modified:
trunk/data/qcsrc/client/sbar.qc
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/miscfunctions.qc
trunk/data/qcsrc/server/t_items.qc
Log:
better indicqation of strength running out
Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc 2009-04-07 06:38:47 UTC (rev 6451)
+++ trunk/data/qcsrc/client/sbar.qc 2009-04-07 07:08:19 UTC (rev 6452)
@@ -1436,9 +1436,11 @@
void CSQC_Strength_Timer() {
float stat_items, dt;
stat_items = getstati(STAT_ITEMS);
+ /*
if not(stat_items & IT_STRENGTH)
if not(stat_items & IT_INVINCIBLE)
return;
+ */
if (getstati(STAT_HEALTH) <= 0)
return;
@@ -1482,6 +1484,11 @@
}
Sbar_DrawXNum(number_position, ceil(dt), 2, countdown_fontsize, '1 1 1', 1, DRAWFLAG_NORMAL);
}
+ else if(dt > -1)
+ {
+ drawpic_expanding(pos, "gfx/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
+ bound(0, -dt / 0.5, 1));
+ }
}
//add some margin to the invincibility icon
@@ -1504,6 +1511,11 @@
}
Sbar_DrawXNum(number_position, ceil(dt), 2, countdown_fontsize, '1 1 1', 1, DRAWFLAG_NORMAL);
}
+ else if(dt > -1)
+ {
+ drawpic_expanding(pos, "gfx/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
+ bound(0, -dt / 0.5, 1));
+ }
}
}
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2009-04-07 06:38:47 UTC (rev 6451)
+++ trunk/data/qcsrc/server/cl_client.qc 2009-04-07 07:08:19 UTC (rev 6452)
@@ -1538,6 +1538,14 @@
PutClientInServer();
}
+void play_countdown(float finished, string samp)
+{
+ if(clienttype(self) == CLIENTTYPE_REAL)
+ if(floor(finished - time - frametime) != floor(finished - time))
+ if(self.strength_finished - time < 6)
+ sound (self, CHAN_AUTO, samp, VOL_BASE, ATTN_NORM);
+}
+
/**
* When sv_timeout is used this function returs strings like
* "Timeout begins in 2 seconds!\n" or "Timeout ends in 23 seconds!\n".
@@ -1601,6 +1609,7 @@
{
if (self.items & IT_STRENGTH)
{
+ play_countdown(self.strength_finished, "misc/poweroff.wav");
if (time > self.strength_finished)
{
self.alpha = default_player_alpha;
@@ -1622,6 +1631,7 @@
if (self.items & IT_INVINCIBLE)
{
+ play_countdown(self.invincible_finished, "misc/poweroff.wav");
if (time > self.invincible_finished)
{
self.items = self.items - (self.items & IT_INVINCIBLE);
@@ -1641,6 +1651,7 @@
if (self.items & IT_STRENGTH)
{
+ play_countdown(self.strength_finished, "misc/poweroff.wav");
self.effects = self.effects | (EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT);
if (time > self.strength_finished)
{
@@ -1658,6 +1669,7 @@
}
if (self.items & IT_INVINCIBLE)
{
+ play_countdown(self.invincible_finished, "misc/poweroff.wav");
self.effects = self.effects | (EF_RED | EF_ADDITIVE | EF_FULLBRIGHT);
if (time > self.invincible_finished)
{
@@ -2241,7 +2253,8 @@
self.fixangle = TRUE;
}
- player_powerups();
+ if(frametime)
+ player_powerups();
if (self.deadflag != DEAD_NO)
{
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2009-04-07 06:38:47 UTC (rev 6451)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2009-04-07 07:08:19 UTC (rev 6452)
@@ -1397,6 +1397,7 @@
precache_sound ("misc/spawn.wav");
precache_sound ("misc/talk.wav");
precache_sound ("misc/teleport.wav");
+ precache_sound ("misc/poweroff.wav");
precache_sound ("player/lava.wav");
precache_sound ("player/slime.wav");
Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc 2009-04-07 06:38:47 UTC (rev 6451)
+++ trunk/data/qcsrc/server/t_items.qc 2009-04-07 07:08:19 UTC (rev 6452)
@@ -1189,7 +1189,7 @@
target_item_change(0, ammo_fuel, target_item_func_set, "misc/itempickup.wav", "");
target_item_change(0, health, target_item_func_set, "misc/megahealth.wav", "");
target_item_change(0, armorvalue, target_item_func_set, "misc/armor25.wav", "");
- target_item_change(1, items, target_item_func_itembitset, "misc/powerup.wav", "");
+ target_item_change(1, items, target_item_func_itembitset, "misc/powerup.wav", "misc/poweroff.wav");
target_item_change(1, weapons, target_item_func_bitset, "weapons/weaponpickup.wav", "");
if((self.items & activator.items) & IT_STRENGTH)
@@ -1206,7 +1206,7 @@
target_item_change(0, ammo_fuel, target_item_func_min, "misc/itempickup.wav", "");
target_item_change(0, health, target_item_func_min, "misc/megahealth.wav", "");
target_item_change(0, armorvalue, target_item_func_min, "misc/armor25.wav", "");
- target_item_change(1, items, target_item_func_itemand, "misc/powerup.wav", "");
+ target_item_change(1, items, target_item_func_itemand, "misc/powerup.wav", "misc/poweroff.wav");
target_item_change(1, weapons, target_item_func_and, "weapons/weaponpickup.wav", "");
if((self.items & activator.items) & IT_STRENGTH)
@@ -1223,7 +1223,7 @@
target_item_change(0, ammo_fuel, target_item_func_max, "misc/itempickup.wav", "");
target_item_change(0, health, target_item_func_max, "misc/megahealth.wav", "");
target_item_change(0, armorvalue, target_item_func_max, "misc/armor25.wav", "");
- target_item_change(1, items, target_item_func_or, "misc/powerup.wav", "");
+ target_item_change(1, items, target_item_func_or, "misc/powerup.wav", "misc/poweroff.wav");
target_item_change(1, weapons, target_item_func_or, "weapons/weaponpickup.wav", "");
if((self.items & activator.items) & IT_STRENGTH)
@@ -1240,7 +1240,7 @@
target_item_change(0, ammo_fuel, target_item_func_min, "misc/itempickup.wav", "");
target_item_change(0, health, target_item_func_min, "misc/megahealth.wav", "");
target_item_change(0, armorvalue, target_item_func_min, "misc/armor25.wav", "");
- target_item_change(1, items, target_item_func_andnot, "misc/powerup.wav", "");
+ target_item_change(1, items, target_item_func_andnot, "misc/powerup.wav", "misc/poweroff.wav");
target_item_change(1, weapons, target_item_func_andnot, "weapons/weaponpickup.wav", "");
if((self.items & activator.items) & IT_STRENGTH)
@@ -1288,6 +1288,7 @@
precache_sound("misc/megahealth.wav");
precache_sound("misc/armor25.wav");
precache_sound("misc/powerup.wav");
+ precache_sound("misc/poweroff.wav");
precache_sound("weapons/weaponpickup.wav");
n = tokenize_sane(self.netname);
More information about the nexuiz-commits
mailing list