libretro/libretro-tyrquake
1
0
Fork 0
mirror of https://github.com/libretro/libretro-tyrquake.git synced 2025-04-01 10:11:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nq: Store item info within stats in client state

Browse Source 
Make NQ store the item status within the stats array in the client state,
consistent with QW.

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan 2012-10-21 15:22:32 +10:30
parent 7007067318
commit bea77b4b38
7 changed files with 41 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NQ/cl_parse.c
View File

@ -587,12 +587,12 @@ CL_ParseClientdata(int bits)
// [always sent] if (bits & SU_ITEMS)
i = MSG_ReadLong();
if (cl.items != i) { // set flash times
if (cl.stats[STAT_ITEMS] != i) { // set flash times
Sbar_Changed();
for (j = 0; j < 32; j++)
if ((i & (1 << j)) && !(cl.items & (1 << j)))
if ((i & (1 << j)) && !(cl.stats[STAT_ITEMS] & (1 << j)))
cl.item_gettime[j] = cl.time;
cl.items = i;
cl.stats[STAT_ITEMS] = i;
}
cl.onground = (bits & SU_ONGROUND) != 0;

1
NQ/client.h
View File

@ -147,7 +147,6 @@ typedef struct {
// information for local display
int stats[MAX_CL_STATS]; // health, etc
int items; // inventory bit flags
float item_gettime[32]; // cl.time of aquiring item, for blinking
float faceanimtime; // use anim frame if cl.time < this

1
NQ/quakedef.h
View File

@ -109,6 +109,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define STAT_TOTALMONSTERS 12
#define STAT_SECRETS 13 /* bumped client side by svc_foundsecret */
#define STAT_MONSTERS 14 /* bumped by svc_killedmonster */
#define STAT_ITEMS 15
// stock defines

2
NQ/r_main.c
View File

@ -636,7 +636,7 @@ R_DrawViewModel(void)
if (!r_drawviewmodel.value || r_fov_greater_than_90)
return;
if (cl.items & IT_INVISIBILITY)
if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY)
return;
if (cl.stats[STAT_HEALTH] <= 0)

64
NQ/sbar.c
View File

@ -594,7 +594,7 @@ Sbar_DrawInventory(void)
// weapons
for (i = 0; i < 7; i++) {
if (cl.items & (IT_SHOTGUN << i)) {
if (cl.stats[STAT_ITEMS] & (IT_SHOTGUN << i)) {
time = cl.item_gettime[i];
flashon = (int)((cl.time - time) * 10);
if (flashon >= 10) {
@ -618,7 +618,7 @@ Sbar_DrawInventory(void)
int grenadeflashing = 0;
for (i = 0; i < 4; i++) {
if (cl.items & (1 << hipweapons[i])) {
if (cl.stats[STAT_ITEMS] & (1 << hipweapons[i])) {
time = cl.item_gettime[hipweapons[i]];
flashon = (int)((cl.time - time) * 10);
if (flashon >= 10) {
@ -631,14 +631,14 @@ Sbar_DrawInventory(void)
// check grenade launcher
if (i == 2) {
if (cl.items & HIT_PROXIMITY_GUN) {
if (cl.stats[STAT_ITEMS] & HIT_PROXIMITY_GUN) {
if (flashon) {
grenadeflashing = 1;
Sbar_DrawPic(96, -16, hsb_weapons[flashon][2]);
}
}
} else if (i == 3) {
if (cl.items & (IT_SHOTGUN << 4)) {
if (cl.stats[STAT_ITEMS] & (IT_SHOTGUN << 4)) {
if (flashon && !grenadeflashing) {
Sbar_DrawPic(96, -16, hsb_weapons[flashon][3]);
} else if (!grenadeflashing) {
@ -679,7 +679,7 @@ Sbar_DrawInventory(void)
flashon = 0;
// items
for (i = 0; i < 6; i++)
if (cl.items & (1 << (17 + i))) {
if (cl.stats[STAT_ITEMS] & (1 << (17 + i))) {
time = cl.item_gettime[17 + i];
if (time && time > cl.time - 2 && flashon) { // flash frame
sb_updates = 0;
@ -696,7 +696,7 @@ Sbar_DrawInventory(void)
// hipnotic items
if (hipnotic) {
for (i = 0; i < 2; i++)
if (cl.items & (1 << (24 + i))) {
if (cl.stats[STAT_ITEMS] & (1 << (24 + i))) {
time = cl.item_gettime[24 + i];
if (time && time > cl.time - 2 && flashon) { // flash frame
sb_updates = 0;
@ -711,7 +711,7 @@ Sbar_DrawInventory(void)
if (rogue) {
// new rogue items
for (i = 0; i < 2; i++) {
if (cl.items & (1 << (29 + i))) {
if (cl.stats[STAT_ITEMS] & (1 << (29 + i))) {
time = cl.item_gettime[29 + i];
if (time && time > cl.time - 2 && flashon) { // flash frame
@ -727,7 +727,7 @@ Sbar_DrawInventory(void)
} else {
// sigils
for (i = 0; i < 4; i++) {
if (cl.items & (1 << (28 + i))) {
if (cl.stats[STAT_ITEMS] & (1 << (28 + i))) {
time = cl.item_gettime[28 + i];
if (time && time > cl.time - 2 && flashon) { // flash frame
sb_updates = 0;
@ -860,20 +860,20 @@ Sbar_DrawFace(void)
}
// PGM 01/19/97 - team color drawing
if ((cl.items & (IT_INVISIBILITY | IT_INVULNERABILITY))
if ((cl.stats[STAT_ITEMS] & (IT_INVISIBILITY | IT_INVULNERABILITY))
== (IT_INVISIBILITY | IT_INVULNERABILITY)) {
Sbar_DrawPic(112, 0, sb_face_invis_invuln);
return;
}
if (cl.items & IT_QUAD) {
if (cl.stats[STAT_ITEMS] & IT_QUAD) {
Sbar_DrawPic(112, 0, sb_face_quad);
return;
}
if (cl.items & IT_INVISIBILITY) {
if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY) {
Sbar_DrawPic(112, 0, sb_face_invis);
return;
}
if (cl.items & IT_INVULNERABILITY) {
if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) {
Sbar_DrawPic(112, 0, sb_face_invuln);
return;
}
@ -928,33 +928,33 @@ Sbar_Draw(void)
// keys (hipnotic only)
//MED 01/04/97 moved keys here so they would not be overwritten
if (hipnotic) {
if (cl.items & IT_KEY1)
if (cl.stats[STAT_ITEMS] & IT_KEY1)
Sbar_DrawPic(209, 3, sb_items[0]);
if (cl.items & IT_KEY2)
if (cl.stats[STAT_ITEMS] & IT_KEY2)
Sbar_DrawPic(209, 12, sb_items[1]);
}
// armor
if (cl.items & IT_INVULNERABILITY) {
if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) {
Sbar_DrawNum(24, 0, 666, 3, 1);
Sbar_DrawPic(0, 0, draw_disc);
} else {
if (rogue) {
Sbar_DrawNum(24, 0, cl.stats[STAT_ARMOR], 3,
cl.stats[STAT_ARMOR] <= 25);
if (cl.items & RIT_ARMOR3)
if (cl.stats[STAT_ITEMS] & RIT_ARMOR3)
Sbar_DrawPic(0, 0, sb_armor[2]);
else if (cl.items & RIT_ARMOR2)
else if (cl.stats[STAT_ITEMS] & RIT_ARMOR2)
Sbar_DrawPic(0, 0, sb_armor[1]);
else if (cl.items & RIT_ARMOR1)
else if (cl.stats[STAT_ITEMS] & RIT_ARMOR1)
Sbar_DrawPic(0, 0, sb_armor[0]);
} else {
Sbar_DrawNum(24, 0, cl.stats[STAT_ARMOR], 3,
cl.stats[STAT_ARMOR] <= 25);
if (cl.items & IT_ARMOR3)
if (cl.stats[STAT_ITEMS] & IT_ARMOR3)
Sbar_DrawPic(0, 0, sb_armor[2]);
else if (cl.items & IT_ARMOR2)
else if (cl.stats[STAT_ITEMS] & IT_ARMOR2)
Sbar_DrawPic(0, 0, sb_armor[1]);
else if (cl.items & IT_ARMOR1)
else if (cl.stats[STAT_ITEMS] & IT_ARMOR1)
Sbar_DrawPic(0, 0, sb_armor[0]);
}
}
@ -968,28 +968,28 @@ Sbar_Draw(void)
// ammo icon
if (rogue) {
if (cl.items & RIT_SHELLS)
if (cl.stats[STAT_ITEMS] & RIT_SHELLS)
Sbar_DrawPic(224, 0, sb_ammo[0]);
else if (cl.items & RIT_NAILS)
else if (cl.stats[STAT_ITEMS] & RIT_NAILS)
Sbar_DrawPic(224, 0, sb_ammo[1]);
else if (cl.items & RIT_ROCKETS)
else if (cl.stats[STAT_ITEMS] & RIT_ROCKETS)
Sbar_DrawPic(224, 0, sb_ammo[2]);
else if (cl.items & RIT_CELLS)
else if (cl.stats[STAT_ITEMS] & RIT_CELLS)
Sbar_DrawPic(224, 0, sb_ammo[3]);
else if (cl.items & RIT_LAVA_NAILS)
else if (cl.stats[STAT_ITEMS] & RIT_LAVA_NAILS)
Sbar_DrawPic(224, 0, rsb_ammo[0]);
else if (cl.items & RIT_PLASMA_AMMO)
else if (cl.stats[STAT_ITEMS] & RIT_PLASMA_AMMO)
Sbar_DrawPic(224, 0, rsb_ammo[1]);
else if (cl.items & RIT_MULTI_ROCKETS)
else if (cl.stats[STAT_ITEMS] & RIT_MULTI_ROCKETS)
Sbar_DrawPic(224, 0, rsb_ammo[2]);
} else {
if (cl.items & IT_SHELLS)
if (cl.stats[STAT_ITEMS] & IT_SHELLS)
Sbar_DrawPic(224, 0, sb_ammo[0]);
else if (cl.items & IT_NAILS)
else if (cl.stats[STAT_ITEMS] & IT_NAILS)
Sbar_DrawPic(224, 0, sb_ammo[1]);
else if (cl.items & IT_ROCKETS)
else if (cl.stats[STAT_ITEMS] & IT_ROCKETS)
Sbar_DrawPic(224, 0, sb_ammo[2]);
else if (cl.items & IT_CELLS)
else if (cl.stats[STAT_ITEMS] & IT_CELLS)
Sbar_DrawPic(224, 0, sb_ammo[3]);
}

8
NQ/view.c
View File

@ -441,22 +441,22 @@ V_CalcPowerupCshift
void
V_CalcPowerupCshift(void)
{
if (cl.items & IT_QUAD) {
if (cl.stats[STAT_ITEMS] & IT_QUAD) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 0;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 0;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 255;
cl.cshifts[CSHIFT_POWERUP].percent = 30;
} else if (cl.items & IT_SUIT) {
} else if (cl.stats[STAT_ITEMS] & IT_SUIT) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 0;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 255;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 0;
cl.cshifts[CSHIFT_POWERUP].percent = 20;
} else if (cl.items & IT_INVISIBILITY) {
} else if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 100;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 100;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 100;
cl.cshifts[CSHIFT_POWERUP].percent = 100;
} else if (cl.items & IT_INVULNERABILITY) {
} else if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) {
cl.cshifts[CSHIFT_POWERUP].destcolor[0] = 255;
cl.cshifts[CSHIFT_POWERUP].destcolor[1] = 255;
cl.cshifts[CSHIFT_POWERUP].destcolor[2] = 0;

6
common/gl_rmain.c
View File

@ -743,14 +743,8 @@ R_DrawViewModel(void)
if (!r_drawentities.value)
return;
#ifdef NQ_HACK
if (cl.items & IT_INVISIBILITY)
return;
#endif
#ifdef QW_HACK
if (cl.stats[STAT_ITEMS] & IT_INVISIBILITY)
return;
#endif
if (cl.stats[STAT_HEALTH] <= 0)
return;