eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

ok so the 4 event is never called...

Browse source 
fixed flashes


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1609 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2005-11-27 20:59:51 +00:00
parent 395286b2cd
commit 280ab8f6aa
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
plugins/hud/ui_sbar.c
View file

@ -663,7 +663,11 @@ void Hud_Weapon(void)
{ {
int flash; int flash;
if (!(stats[STAT_ITEMS] & (IT_GUN1 << sbartype)) && !hudedit) if (!(stats[STAT_ITEMS] & (IT_GUN1 << sbartype)) && !hudedit)
{
gotweapontime[sbartype] = 0;
return; return;
}
if (!gotweapontime[sbartype]) if (!gotweapontime[sbartype])
gotweapontime[sbartype] = currenttime; gotweapontime[sbartype] = currenttime;
flash = (currenttime - gotweapontime[sbartype])/100; flash = (currenttime - gotweapontime[sbartype])/100;
@ -689,7 +693,10 @@ void Hud_W_HalfLightning(void) //left half only (needed due to LG icon being twi
int wnum = 6; int wnum = 6;
if (!(stats[STAT_ITEMS] & (IT_GUN1 << wnum)) && !hudedit) if (!(stats[STAT_ITEMS] & (IT_GUN1 << wnum)) && !hudedit)
{
gotweapontime[wnum] = 0;
return; return;
}
if (!gotweapontime[wnum]) if (!gotweapontime[wnum])
gotweapontime[wnum] = currenttime; gotweapontime[wnum] = currenttime;
@ -699,7 +706,7 @@ void Hud_W_HalfLightning(void) //left half only (needed due to LG icon being twi
if (flash > 10) if (flash > 10)
{ {
if (stats[STAT_WEAPON] & (IT_GUN1 << wnum)) if (stats[STAT_ACTIVEWEAPON] & (IT_GUN1 << wnum))
flash = 1; //selected. flash = 1; //selected.
else else
flash = 0; flash = 0;
@ -715,7 +722,10 @@ void Hud_W_Lightning(void)
int wnum = 6; int wnum = 6;
if (!(stats[STAT_ITEMS] & (IT_GUN1 << wnum)) && !hudedit) if (!(stats[STAT_ITEMS] & (IT_GUN1 << wnum)) && !hudedit)
{
gotweapontime[wnum] = 0;
return; return;
}
if (!gotweapontime[wnum]) if (!gotweapontime[wnum])
gotweapontime[wnum] = currenttime; gotweapontime[wnum] = currenttime;
@ -725,7 +735,7 @@ void Hud_W_Lightning(void)
if (flash > 10) if (flash > 10)
{ {
if (stats[STAT_WEAPON] & (IT_GUN1 << wnum)) if (stats[STAT_ACTIVEWEAPON] & (IT_GUN1 << wnum))
flash = 1; //selected. flash = 1; //selected.
else else
flash = 0; flash = 0;
@ -1187,6 +1197,8 @@ int Plug_MenuEvent(int *args)
element[currentitem].y -= (int)element[currentitem].y & 7; element[currentitem].y -= (int)element[currentitem].y & 7;
} }
} }
else
hoveritem = FindItemUnderMouse(args[2], args[3]); // this could possibly slow some things down...
altargs[0] = 0; altargs[0] = 0;
altargs[1] = 0; altargs[1] = 0;
@ -1211,7 +1223,6 @@ int Plug_MenuEvent(int *args)
hudedit = false; hudedit = false;
break; break;
case 4: //mousemove case 4: //mousemove
hoveritem = FindItemUnderMouse(args[2], args[3]); // this could possibly slow some things down...
break; break;
} }