zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 12:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke/RR: Address weapon drawer interpolation concerns raised in #403.

Browse source
This commit is contained in:
Mitchell Richters 2020-09-16 21:01:09 +10:00
parent 3188ff4a79
commit ce82eaf899
6 changed files with 53 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/duke/src/actors.cpp
View file

@ -182,7 +182,7 @@ void checkavailweapon(struct player_struct* p)
OnEvent(EVENT_CHANGEWEAPON, p->i, snum, -1); OnEvent(EVENT_CHANGEWEAPON, p->i, snum, -1);
} }
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
if (p->holster_weapon == 1) if (p->holster_weapon == 1)
{ {
p->holster_weapon = 0; p->holster_weapon = 0;

2
source/games/duke/src/actors_d.cpp
View file

@ -238,7 +238,7 @@ void addweapon_d(struct player_struct *p, int weapon)
p->last_weapon = -1; p->last_weapon = -1;
} }
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
#ifdef EDUKE #ifdef EDUKE
if(p->curr_weapon != weapon) if(p->curr_weapon != weapon)
{ {

2
source/games/duke/src/actors_r.cpp
View file

@ -178,7 +178,7 @@ void addweapon_r(struct player_struct* p, int weapon)
p->last_weapon = -1; p->last_weapon = -1;
} }
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
p->curr_weapon = cw; p->curr_weapon = cw;
switch (weapon) switch (weapon)

24
source/games/duke/src/player_d.cpp
View file

@ -1299,7 +1299,7 @@ void selectweapon_d(int snum, int weap) // playernum, weaponnum
if (p->holster_weapon) if (p->holster_weapon)
{ {
PlayerSetInput(snum, SB_HOLSTER); PlayerSetInput(snum, SB_HOLSTER);
p->weapon_pos = -9; p->oweapon_pos = p->weapon_pos = -9;
} }
else if (j >= MIN_WEAPON && p->gotweapon[j] && (unsigned int)p->curr_weapon != j) switch (j) else if (j >= MIN_WEAPON && p->gotweapon[j] && (unsigned int)p->curr_weapon != j) switch (j)
{ {
@ -1329,7 +1329,7 @@ void selectweapon_d(int snum, int weap) // playernum, weaponnum
{ {
p->curr_weapon = HANDREMOTE_WEAPON; p->curr_weapon = HANDREMOTE_WEAPON;
p->last_weapon = -1; p->last_weapon = -1;
p->weapon_pos = 10; p->oweapon_pos = p->weapon_pos = 10;
} }
break; break;
case HANDBOMB_WEAPON: case HANDBOMB_WEAPON:
@ -1378,7 +1378,7 @@ int doincrements_d(struct player_struct* p)
if (p->last_pissed_time == (26 * 218)) if (p->last_pissed_time == (26 * 218))
{ {
p->holster_weapon = 0; p->holster_weapon = 0;
p->weapon_pos = 10; p->oweapon_pos = p->weapon_pos = 10;
} }
} }
@ -1481,8 +1481,8 @@ int doincrements_d(struct player_struct* p)
if (p->access_incs > 20) if (p->access_incs > 20)
{ {
p->access_incs = 0; p->access_incs = 0;
p->weapon_pos = 10; p->oweapon_pos = p->weapon_pos = 10;
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
} }
} }
@ -1988,7 +1988,7 @@ static void fireweapon(int snum)
if (p->last_pissed_time <= (26 * 218) && p->weapon_pos == -9) if (p->last_pissed_time <= (26 * 218) && p->weapon_pos == -9)
{ {
p->holster_weapon = 0; p->holster_weapon = 0;
p->weapon_pos = 10; p->oweapon_pos = p->weapon_pos = 10;
FTA(74, p); FTA(74, p);
} }
} }
@ -2425,7 +2425,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
p->ammo_amount[DEVISTATOR_WEAPON]--; p->ammo_amount[DEVISTATOR_WEAPON]--;
checkavailweapon(p); checkavailweapon(p);
} }
if (p->kickback_pic > 5) p->kickback_pic = 0; if (p->kickback_pic > 5) p->okickback_pic = p->kickback_pic = 0;
} }
else if (p->kickback_pic & 1) else if (p->kickback_pic & 1)
{ {
@ -2434,9 +2434,9 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
fi.shoot(pi, RPG); fi.shoot(pi, RPG);
p->ammo_amount[DEVISTATOR_WEAPON]--; p->ammo_amount[DEVISTATOR_WEAPON]--;
checkavailweapon(p); checkavailweapon(p);
if (p->ammo_amount[DEVISTATOR_WEAPON] <= 0) p->kickback_pic = 0; if (p->ammo_amount[DEVISTATOR_WEAPON] <= 0) p->okickback_pic = p->kickback_pic = 0;
} }
if (p->kickback_pic > 5) p->kickback_pic = 0; if (p->kickback_pic > 5) p->okickback_pic = p->kickback_pic = 0;
} }
break; break;
case FREEZE_WEAPON: case FREEZE_WEAPON:
@ -2466,7 +2466,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
p->okickback_pic = p->kickback_pic = 1; p->okickback_pic = p->kickback_pic = 1;
S_PlayActorSound(CAT_FIRE, pi); S_PlayActorSound(CAT_FIRE, pi);
} }
else p->kickback_pic = 0; else p->okickback_pic = p->kickback_pic = 0;
} }
break; break;
@ -3106,12 +3106,12 @@ HORIZONLY:
{ {
if (p->last_weapon >= 0) if (p->last_weapon >= 0)
{ {
p->weapon_pos = 10; p->oweapon_pos = p->weapon_pos = 10;
// if(p->curr_weapon == KNEE_WEAPON) p->kickback_pic = 1; // if(p->curr_weapon == KNEE_WEAPON) p->kickback_pic = 1;
p->last_weapon = -1; p->last_weapon = -1;
} }
else if (p->holster_weapon == 0) else if (p->holster_weapon == 0)
p->weapon_pos = 10; p->oweapon_pos = p->weapon_pos = 10;
} }
else p->weapon_pos--; else p->weapon_pos--;
} }

64
source/games/duke/src/player_r.cpp
View file

@ -1097,7 +1097,7 @@ void selectweapon_r(int snum, int weap)
if (p->holster_weapon) if (p->holster_weapon)
{ {
PlayerSetInput(snum, SB_HOLSTER); PlayerSetInput(snum, SB_HOLSTER);
p->weapon_pos = -9; p->oweapon_pos = p->weapon_pos = -9;
} }
else if (j >= MIN_WEAPON && p->gotweapon[j] && p->curr_weapon != j) switch (j) else if (j >= MIN_WEAPON && p->gotweapon[j] && p->curr_weapon != j) switch (j)
{ {
@ -1158,7 +1158,7 @@ void selectweapon_r(int snum, int weap)
{ {
p->curr_weapon = THROWINGDYNAMITE_WEAPON; p->curr_weapon = THROWINGDYNAMITE_WEAPON;
p->last_weapon = -1; p->last_weapon = -1;
p->weapon_pos = 10; p->oweapon_pos = p->weapon_pos = 10;
} }
break; break;
case DYNAMITE_WEAPON: case DYNAMITE_WEAPON:
@ -1305,7 +1305,7 @@ int doincrements_r(struct player_struct* p)
if (p->last_pissed_time == 5668) if (p->last_pissed_time == 5668)
{ {
p->holster_weapon = 0; p->holster_weapon = 0;
p->weapon_pos = 10; p->oweapon_pos = p->weapon_pos = 10;
} }
} }
@ -1366,8 +1366,8 @@ int doincrements_r(struct player_struct* p)
if (p->access_incs > 20) if (p->access_incs > 20)
{ {
p->access_incs = 0; p->access_incs = 0;
p->weapon_pos = 10; p->oweapon_pos = p->weapon_pos = 10;
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
} }
} }
@ -2650,7 +2650,7 @@ static void fireweapon(int snum)
if (p->last_pissed_time <= (26 * 218) && p->weapon_pos == -9) if (p->last_pissed_time <= (26 * 218) && p->weapon_pos == -9)
{ {
p->holster_weapon = 0; p->holster_weapon = 0;
p->weapon_pos = 10; p->oweapon_pos = p->weapon_pos = 10;
FTA(74, p); FTA(74, p);
} }
} }
@ -2790,10 +2790,10 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
p->kickback_pic++; p->kickback_pic++;
if (p->kickback_pic > 19) if (p->kickback_pic > 19)
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
p->curr_weapon = THROWINGDYNAMITE_WEAPON; p->curr_weapon = THROWINGDYNAMITE_WEAPON;
p->last_weapon = -1; p->last_weapon = -1;
p->weapon_pos = 10; p->oweapon_pos = p->weapon_pos = 10;
p->detonate_time = 45; p->detonate_time = 45;
p->detonate_count = 1; p->detonate_count = 1;
S_PlaySound(402); S_PlaySound(402);
@ -2860,7 +2860,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
if (p->kickback_pic == 40) if (p->kickback_pic == 40)
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
p->curr_weapon = DYNAMITE_WEAPON; p->curr_weapon = DYNAMITE_WEAPON;
p->last_weapon = -1; p->last_weapon = -1;
p->detonate_count = 0; p->detonate_count = 0;
@ -2868,7 +2868,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
if (p->ammo_amount[DYNAMITE_WEAPON] > 0) if (p->ammo_amount[DYNAMITE_WEAPON] > 0)
{ {
fi.addweapon(p, DYNAMITE_WEAPON); fi.addweapon(p, DYNAMITE_WEAPON);
p->weapon_pos = -9; p->oweapon_pos = p->weapon_pos = -9;
} }
else checkavailweapon(p); else checkavailweapon(p);
} }
@ -2893,7 +2893,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
else if (p->kickback_pic == 2) else if (p->kickback_pic == 2)
if (p->ammo_amount[PISTOL_WEAPON] <= 0) if (p->ammo_amount[PISTOL_WEAPON] <= 0)
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
checkavailweapon(p); checkavailweapon(p);
} }
@ -2903,7 +2903,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
{ {
if (p->ammo_amount[PISTOL_WEAPON] <= 0) if (p->ammo_amount[PISTOL_WEAPON] <= 0)
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
checkavailweapon(p); checkavailweapon(p);
break; break;
} }
@ -2925,7 +2925,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
if (p->kickback_pic == 38) if (p->kickback_pic == 38)
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
checkavailweapon(p); checkavailweapon(p);
} }
@ -3008,7 +3008,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
S_PlayActorSound(SHOTGUN_COCK, pi); S_PlayActorSound(SHOTGUN_COCK, pi);
break; break;
case 28: case 28:
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
p->shotgun_state[0] = 0; p->shotgun_state[0] = 0;
p->shotgun_state[1] = 0; p->shotgun_state[1] = 0;
return; return;
@ -3084,7 +3084,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
if ((actions & SB_FIRE) == 0) if ((actions & SB_FIRE) == 0)
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
break; break;
} }
} }
@ -3092,7 +3092,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
else if (p->kickback_pic > 10) else if (p->kickback_pic > 10)
{ {
if (actions & SB_FIRE) p->kickback_pic = 1; if (actions & SB_FIRE) p->kickback_pic = 1;
else p->kickback_pic = 0; else p->okickback_pic = p->kickback_pic = 0;
} }
break; break;
@ -3101,7 +3101,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
if (p->kickback_pic > 3) if (p->kickback_pic > 3)
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
fi.shoot(pi, GROWSPARK); fi.shoot(pi, GROWSPARK);
p->noise_radius = 1024; p->noise_radius = 1024;
madenoise(snum); madenoise(snum);
@ -3120,7 +3120,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
} }
p->kickback_pic++; p->kickback_pic++;
if (p->kickback_pic > 20) if (p->kickback_pic > 20)
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
break; break;
case TIT_WEAPON: case TIT_WEAPON:
@ -3147,7 +3147,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
if (p->kickback_pic > 4) if (p->kickback_pic > 4)
p->kickback_pic = 1; p->kickback_pic = 1;
if (!(actions & SB_FIRE)) if (!(actions & SB_FIRE))
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
break; break;
case MOTORCYCLE_WEAPON: case MOTORCYCLE_WEAPON:
@ -3162,7 +3162,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
madenoise(snum); madenoise(snum);
p->ammo_amount[MOTORCYCLE_WEAPON]--; p->ammo_amount[MOTORCYCLE_WEAPON]--;
if (p->ammo_amount[MOTORCYCLE_WEAPON] <= 0) if (p->ammo_amount[MOTORCYCLE_WEAPON] <= 0)
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
else else
checkavailweapon(p); checkavailweapon(p);
} }
@ -3177,7 +3177,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
if (p->kickback_pic > 4) if (p->kickback_pic > 4)
p->kickback_pic = 1; p->kickback_pic = 1;
if (!(actions & SB_FIRE)) if (!(actions & SB_FIRE))
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
break; break;
case BOAT_WEAPON: case BOAT_WEAPON:
if (p->kickback_pic == 3) if (p->kickback_pic == 3)
@ -3189,11 +3189,11 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
p->kickback_pic++; p->kickback_pic++;
if (p->kickback_pic > 20) if (p->kickback_pic > 20)
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
checkavailweapon(p); checkavailweapon(p);
} }
if (p->ammo_amount[BOAT_WEAPON] <= 0) if (p->ammo_amount[BOAT_WEAPON] <= 0)
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
else else
checkavailweapon(p); checkavailweapon(p);
break; break;
@ -3224,7 +3224,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
p->recoil += 20; p->recoil += 20;
} }
if (p->kickback_pic > 20) if (p->kickback_pic > 20)
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
break; break;
case POWDERKEG_WEAPON: case POWDERKEG_WEAPON:
@ -3252,7 +3252,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
p->kickback_pic++; p->kickback_pic++;
if (p->kickback_pic > 20) if (p->kickback_pic > 20)
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
checkavailweapon(p); checkavailweapon(p);
} }
break; break;
@ -3274,7 +3274,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
p->kickback_pic++; p->kickback_pic++;
if (p->kickback_pic > 40) if (p->kickback_pic > 40)
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
p->gotweapon.Clear(BOWLING_WEAPON); p->gotweapon.Clear(BOWLING_WEAPON);
checkavailweapon(p); checkavailweapon(p);
} }
@ -3291,7 +3291,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
madenoise(snum); madenoise(snum);
} }
else if (p->kickback_pic == 16) else if (p->kickback_pic == 16)
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
if (p->wantweaponfire >= 0) if (p->wantweaponfire >= 0)
checkavailweapon(p); checkavailweapon(p);
@ -3309,7 +3309,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
madenoise(snum); madenoise(snum);
} }
else if (p->kickback_pic == 16) else if (p->kickback_pic == 16)
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
if (p->wantweaponfire >= 0) if (p->wantweaponfire >= 0)
checkavailweapon(p); checkavailweapon(p);
@ -3332,7 +3332,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
else if (p->kickback_pic == 16) else if (p->kickback_pic == 16)
S_PlayActorSound(450, pi); S_PlayActorSound(450, pi);
else if (p->kickback_pic == 34) else if (p->kickback_pic == 34)
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
break; break;
case CHICKEN_WEAPON: case CHICKEN_WEAPON:
@ -3350,7 +3350,7 @@ static void operateweapon(int snum, ESyncBits actions, int psect)
else if (p->kickback_pic == 16) else if (p->kickback_pic == 16)
S_PlayActorSound(450, pi); S_PlayActorSound(450, pi);
else if (p->kickback_pic == 34) else if (p->kickback_pic == 34)
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
break; break;
} }
@ -4109,12 +4109,12 @@ HORIZONLY:
{ {
if (p->last_weapon >= 0) if (p->last_weapon >= 0)
{ {
p->weapon_pos = 10; p->oweapon_pos = p->weapon_pos = 10;
// if(p->curr_weapon == KNEE_WEAPON) p->kickback_pic = 1; // if(p->curr_weapon == KNEE_WEAPON) p->kickback_pic = 1;
p->last_weapon = -1; p->last_weapon = -1;
} }
else if (p->holster_weapon == 0) else if (p->holster_weapon == 0)
p->weapon_pos = 10; p->oweapon_pos = p->weapon_pos = 10;
} }
else p->weapon_pos--; else p->weapon_pos--;
} }

12
source/games/duke/src/player_w.cpp
View file

@ -151,7 +151,7 @@ void fireweapon_ww(int snum)
if (p->last_pissed_time <= (26 * 218) && p->weapon_pos == -9) if (p->last_pissed_time <= (26 * 218) && p->weapon_pos == -9)
{ {
p->holster_weapon = 0; p->holster_weapon = 0;
p->weapon_pos = 10; p->oweapon_pos = p->weapon_pos = 10;
FTA(74, p); FTA(74, p);
} }
} }
@ -380,7 +380,7 @@ void operateweapon_ww(int snum, ESyncBits actions, int psect)
} }
else if (p->kickback_pic > aplWeaponTotalTime[p->curr_weapon][snum]) else if (p->kickback_pic > aplWeaponTotalTime[p->curr_weapon][snum])
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
// don't change to remote when in NAM: grenades are timed // don't change to remote when in NAM: grenades are timed
checkavailweapon(p); checkavailweapon(p);
} }
@ -411,7 +411,7 @@ void operateweapon_ww(int snum, ESyncBits actions, int psect)
if (p->kickback_pic >= aplWeaponTotalTime[p->curr_weapon][snum]) if (p->kickback_pic >= aplWeaponTotalTime[p->curr_weapon][snum])
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
/// WHAT THE HELL DOES THIS DO....????????????? /// WHAT THE HELL DOES THIS DO....?????????????
if (p->ammo_amount[TRIPBOMB_WEAPON] > 0) if (p->ammo_amount[TRIPBOMB_WEAPON] > 0)
fi.addweapon(p, TRIPBOMB_WEAPON); fi.addweapon(p, TRIPBOMB_WEAPON);
@ -510,7 +510,7 @@ void operateweapon_ww(int snum, ESyncBits actions, int psect)
if (p->kickback_pic >= (aplWeaponReload[p->curr_weapon][snum])) if (p->kickback_pic >= (aplWeaponReload[p->curr_weapon][snum]))
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
} }
} }
@ -532,12 +532,12 @@ void operateweapon_ww(int snum, ESyncBits actions, int psect)
} }
else else
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
} }
} }
else else
{ // not 'automatic' and >totaltime { // not 'automatic' and >totaltime
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
} }
} }
} }