zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-31 12:30:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix some interpolation harshness with p->kickback_pic.

Browse source
This commit is contained in:
Mitchell Richters 2020-08-03 15:02:30 +10:00
parent 531df48d38
commit 7efa905a01
2 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2115,7 +2115,7 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
p->hbomb_hold_delay++; p->hbomb_hold_delay++;
else if (p->kickback_pic > 19) else if (p->kickback_pic > 19)
{ {
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
if (isNam()) checkavailweapon(p); if (isNam()) checkavailweapon(p);
else else
@ -2140,7 +2140,7 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
if (p->kickback_pic == 10) if (p->kickback_pic == 10)
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
int weapon = isNam() ? TRIPBOMB_WEAPON : HANDBOMB_WEAPON; int weapon = isNam() ? TRIPBOMB_WEAPON : HANDBOMB_WEAPON;
if (p->ammo_amount[weapon] > 0) if (p->ammo_amount[weapon] > 0)
@ -2168,7 +2168,7 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
{ {
if (p->ammo_amount[PISTOL_WEAPON] <= 0 || (p->ammo_amount[PISTOL_WEAPON] % (isNam() ? 20 : 12))) if (p->ammo_amount[PISTOL_WEAPON] <= 0 || (p->ammo_amount[PISTOL_WEAPON] % (isNam() ? 20 : 12)))
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
checkavailweapon(p); checkavailweapon(p);
} }
else else
@ -2192,7 +2192,7 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
// 3 second re-load time // 3 second re-load time
if (p->kickback_pic == (isNam() ? 50 : 27)) if (p->kickback_pic == (isNam() ? 50 : 27))
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
checkavailweapon(p); checkavailweapon(p);
} }
break; break;
@ -2239,7 +2239,7 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
p->kickback_pic++; p->kickback_pic++;
break; break;
case 31: case 31:
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
return; return;
} }
break; break;
@ -2273,15 +2273,15 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
if ((sb_snum & SKB_FIRE) == 0) if ((sb_snum & SKB_FIRE) == 0)
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
break; break;
} }
} }
} }
else if (p->kickback_pic > 10) else if (p->kickback_pic > 10)
{ {
if (sb_snum & SKB_FIRE) p->kickback_pic = 1; if (sb_snum & SKB_FIRE) p->okickback_pic = p->kickback_pic = 1;
else p->kickback_pic = 0; else p->okickback_pic = p->kickback_pic = 0;
} }
break; break;
@ -2305,10 +2305,10 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
{ {
p->kickback_pic++; p->kickback_pic++;
if (p->ammo_amount[p->curr_weapon] <= 1) if (p->ammo_amount[p->curr_weapon] <= 1)
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
} }
else else
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
p->ammo_amount[p->curr_weapon]--; p->ammo_amount[p->curr_weapon]--;
fi.shoot(pi, GROWSPARK); fi.shoot(pi, GROWSPARK);
@ -2327,7 +2327,7 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
if (isNam() && p->kickback_pic > aplWeaponReload[p->curr_weapon][snum]) // 30) if (isNam() && p->kickback_pic > aplWeaponReload[p->curr_weapon][snum]) // 30)
{ {
// reload now... // reload now...
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
if (!(aplWeaponFlags[p->curr_weapon][snum] & WEAPON_FLAG_NOVISIBLE)) if (!(aplWeaponFlags[p->curr_weapon][snum] & WEAPON_FLAG_NOVISIBLE))
{ {
// make them visible if not set... // make them visible if not set...
@ -2342,7 +2342,7 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
if ((!isNam() && p->kickback_pic > 10) || (isNam() && p->kickback_pic == 10)) if ((!isNam() && p->kickback_pic > 10) || (isNam() && p->kickback_pic == 10))
{ {
if (isNam()) p->kickback_pic++; // fire now, but wait for reload... if (isNam()) p->kickback_pic++; // fire now, but wait for reload...
else p->kickback_pic = 0; else p->okickback_pic = p->kickback_pic = 0;
p->ammo_amount[SHRINKER_WEAPON]--; p->ammo_amount[SHRINKER_WEAPON]--;
fi.shoot(pi, SHRINKER); fi.shoot(pi, SHRINKER);
@ -2357,7 +2357,7 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
} }
else if (isNam() && p->kickback_pic > 30) else if (isNam() && p->kickback_pic > 30)
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
p->visibility = 0; p->visibility = 0;
lastvisinc = (int)totalclock + 32; lastvisinc = (int)totalclock + 32;
checkavailweapon(p); checkavailweapon(p);
@ -2386,7 +2386,7 @@ static void operateweapon(int snum, ESyncBits sb_snum, 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;
} }
break; break;
case FREEZE_WEAPON: case FREEZE_WEAPON:
@ -2406,14 +2406,14 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
} }
if (sprite[p->i].xrepeat < 32) if (sprite[p->i].xrepeat < 32)
{ {
p->kickback_pic = 0; break; p->okickback_pic = p->kickback_pic = 0; break;
} }
} }
else else
{ {
if (sb_snum & SKB_FIRE) if (sb_snum & SKB_FIRE)
{ {
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->kickback_pic = 0;
@ -2439,11 +2439,11 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
{ {
if ((sb_snum & SKB_FIRE) != 0) if ((sb_snum & SKB_FIRE) != 0)
{ {
p->kickback_pic = 1; p->okickback_pic = p->kickback_pic = 1;
S_PlayActorSound(FLAMETHROWER_INTRO, pi); S_PlayActorSound(FLAMETHROWER_INTRO, pi);
} }
else else
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
} }
break; break;
@ -2457,7 +2457,7 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
} }
if (p->kickback_pic == 16) if (p->kickback_pic == 16)
{ {
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
checkavailweapon(p); checkavailweapon(p);
p->weapon_pos = -9; p->weapon_pos = -9;
} }
@ -2470,8 +2470,8 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
else if (p->kickback_pic == 14) else if (p->kickback_pic == 14)
{ {
if (sb_snum & SKB_FIRE) if (sb_snum & SKB_FIRE)
p->kickback_pic = 1 + (krand() & 3); p->okickback_pic = p->kickback_pic = 1 + (krand() & 3);
else p->kickback_pic = 0; else p->okickback_pic = p->kickback_pic = 0;
} }
if (p->wantweaponfire >= 0) if (p->wantweaponfire >= 0)
@ -2489,7 +2489,7 @@ static void operateweapon(int snum, ESyncBits sb_snum, int psect)
checkavailweapon(p); checkavailweapon(p);
} }
else if (p->kickback_pic == 20) else if (p->kickback_pic == 20)
p->kickback_pic = 0; p->okickback_pic = p->kickback_pic = 0;
break; break;
} }
} }

10
source/games/duke/src/premap.cpp
View file

@ -158,8 +158,8 @@ void resetplayerstats(int snum)
p->on_crane = -1; p->on_crane = -1;
if(p->curr_weapon == PISTOL_WEAPON) if(p->curr_weapon == PISTOL_WEAPON)
p->kickback_pic = isRR()? 22 : 5; p->okickback_pic = p->kickback_pic = isRR()? 22 : 5;
else p->kickback_pic = 0; else p->okickback_pic = p->kickback_pic = 0;
p->weapon_pos = 6; p->weapon_pos = 6;
p->walking_snd_toggle= 0; p->walking_snd_toggle= 0;
@ -274,7 +274,7 @@ void resetweapons(int snum)
p->gotweapon.Zero(); p->gotweapon.Zero();
p->weapon_pos = 6; p->weapon_pos = 6;
p->kickback_pic = 5; p->okickback_pic = p->kickback_pic = 5;
p->curr_weapon = PISTOL_WEAPON; p->curr_weapon = PISTOL_WEAPON;
p->gotweapon.Set(PISTOL_WEAPON); p->gotweapon.Set(PISTOL_WEAPON);
p->gotweapon.Set(KNEE_WEAPON); p->gotweapon.Set(KNEE_WEAPON);
@ -401,7 +401,7 @@ void resetprestat(int snum,int g)
p->max_actors_killed = 0; p->max_actors_killed = 0;
p->lastrandomspot = 0; p->lastrandomspot = 0;
p->weapon_pos = 6; p->weapon_pos = 6;
p->kickback_pic = 5; p->okickback_pic = p->kickback_pic = 5;
p->last_weapon = -1; p->last_weapon = -1;
p->weapreccnt = 0; p->weapreccnt = 0;
p->show_empty_weapon= 0; p->show_empty_weapon= 0;
@ -1006,7 +1006,7 @@ int enterlevel(MapRecord *mi, int gamemode)
ps[i].gotweapon.Clear(PISTOL_WEAPON); ps[i].gotweapon.Clear(PISTOL_WEAPON);
ps[i].ammo_amount[PISTOL_WEAPON] = 0; ps[i].ammo_amount[PISTOL_WEAPON] = 0;
ps[i].curr_weapon = KNEE_WEAPON; ps[i].curr_weapon = KNEE_WEAPON;
ps[i].kickback_pic = 0; ps[i].okickback_pic = ps[i].kickback_pic = 0;
} }
} }
resetmys(); resetmys();