zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- renamed a few things.

This commit is contained in:
Christoph Oelckers 2020-07-06 21:16:59 +02:00
parent 1644c1d33a
commit 631398a35a
4 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/games/duke/src/hudweapon_r.cpp
View File

@ -760,7 +760,7 @@ void displayweapon_r(int snum)
if ((*kb) < 5)
{
rdmyospal(weapon_xoffset + x + 190 - (p->look_ang >> 1) - dx,
looking_arc + 258 - gun_pos - 64 + p->at57e - dy, RRTILE1752, 0, o | pin, pal);
looking_arc + 258 - gun_pos - 64 + p->detonate_count - dy, RRTILE1752, 0, o | pin, pal);
}
rdmyospal(weapon_xoffset + x + 190 - (p->look_ang >> 1),
looking_arc + 258 - gun_pos - dy, HANDTHROW + remote_frames[*kb], gs, o | pin, pal);
@ -770,7 +770,7 @@ void displayweapon_r(int snum)
if ((*kb) < 5)
{
rdmyospal(weapon_xoffset + x + 190 - (p->look_ang >> 1) - dx,
looking_arc + 258 - gun_pos - 64 + p->at57e - dy, RRTILE1752, 0, o | pin, pal);
looking_arc + 258 - gun_pos - 64 + p->detonate_count - dy, RRTILE1752, 0, o | pin, pal);
}
rdmyospal(weapon_xoffset + x + 190 - (p->look_ang >> 1),
looking_arc + 258 - gun_pos - dy, HANDTHROW + 1, gs, o | pin, pal);

4
source/games/duke/src/noise.cpp
View File

@ -33,7 +33,7 @@ int madenoise(int snum)
{
player_struct *p;
p = &ps[snum];
p->make_noise = 1;
p->donoise = 1;
p->noise_x = p->posx;
p->noise_y = p->posy;
return 1;
@ -44,7 +44,7 @@ int wakeup(int i, int snum)
player_struct *p;
int radius;
p = &ps[snum];
if (!p->make_noise)
if (!p->donoise)
return 0;
if (sprite[i].pal == 30 || sprite[i].pal == 32 || sprite[i].pal == 33 || (isRRRA() && sprite[i].pal == 8))
return 0;

32
source/games/duke/src/player.h
View File

@ -86,7 +86,16 @@ typedef struct {
} playerspawn_t;
typedef struct STATUSBARTYPE {
int16_t got_access, last_extra, inv_amount[GET_MAX], curr_weapon, holoduke_on;
int16_t firstaid_amount;
int16_t steroids_amount;
int16_t holoduke_amount;
int16_t jetpack_amount;
int16_t heat_amount;
int16_t scuba_amount;
int16_t boot_amount;
int16_t shield_amount;
int16_t got_access, last_extra, curr_weapon, holoduke_on;
int16_t last_weapon, weapon_pos, kickback_pic;
int16_t ammo_amount[MAX_WEAPONS], frag[MAXPLAYERS];
FixedBitArray<MAX_WEAPONS> gotweapon;
@ -169,7 +178,16 @@ typedef struct player_struct {
int16_t loogiex[64], loogiey[64], sbs, sound_pitch;
int16_t cursectnum, last_extra, subweapon;
int16_t ammo_amount[MAX_WEAPONS], inv_amount[GET_MAX];
int16_t ammo_amount[MAX_WEAPONS];
int16_t firstaid_amount;
int16_t steroids_amount;
int16_t holoduke_amount;
int16_t jetpack_amount;
int16_t heat_amount;
int16_t scuba_amount;
int16_t boot_amount;
int16_t shield_amount;
int16_t wackedbyactor, pyoff, opyoff;
int16_t newowner, jumping_counter, airleft;
@ -219,7 +237,7 @@ typedef struct player_struct {
int32_t detonate_count;
int16_t detonate_time;
uint8_t shotgun_state[2];
uint8_t make_noise; // at28e
uint8_t donoise; // at28e
int32_t noise_x, noise_y, noise_radius; // at286, at28a, at290
uint8_t keys[5];
int16_t yehaa_timer;
@ -246,14 +264,6 @@ typedef struct player_struct {
// transition helpers
#define SeaSick sea_sick
#define firstaid_amount inv_amount[GET_FIRSTAID]
#define steroids_amount inv_amount[GET_STEROIDS]
#define holoduke_amount inv_amount[GET_HOLODUKE]
#define jetpack_amount inv_amount[GET_JETPACK]
#define heat_amount inv_amount[GET_HEATS]
#define scuba_amount inv_amount[GET_SCUBA]
#define boot_amount inv_amount[GET_BOOTS]
#define shield_amount inv_amount[GET_SHIELD]
#define raat609 MamaEnd
#define raat5dd sea_sick_stat
#define at57e detonate_count

4
source/games/duke/src/premap.cpp
View File

@ -167,7 +167,7 @@ void resetplayerstats(int snum)
p->stairs = 0;
p->noise_x = 0;
p->noise_y = 0;
p->make_noise = 0;
p->donoise = 0;
p->noise_radius = 0;
if (isRR() && ud.multimode > 1 && ud.coop != 1)
{
@ -447,7 +447,7 @@ void resetprestat(int snum,int g)
//if (!isRRRA()) p->fogtype = 0;
p->noise_x = 131072;
p->noise_y = 131072;
p->make_noise = 0;
p->donoise = 0;
p->noise_radius = 0;
if (isRR() && ud.multimode > 1 && ud.coop != 1)