diff --git a/source/games/duke/src/actors_d.cpp b/source/games/duke/src/actors_d.cpp index e1485c8a8..95bc0b065 100644 --- a/source/games/duke/src/actors_d.cpp +++ b/source/games/duke/src/actors_d.cpp @@ -141,27 +141,6 @@ int ifsquished(DDukeActor* actor, int p) return false; } -//--------------------------------------------------------------------------- -// -// -// -//--------------------------------------------------------------------------- - -void lotsofmoney_d(DDukeActor *actor, int n) -{ - lotsofstuff(actor, n, DukeMoneyClass); -} - -void lotsofmail_d(DDukeActor *actor, int n) -{ - lotsofstuff(actor, n, DukeMailClass); -} - -void lotsofpaper_d(DDukeActor *actor, int n) -{ - lotsofstuff(actor, n, DukePaperClass); -} - //--------------------------------------------------------------------------- // // diff --git a/source/games/duke/src/dispatch.cpp b/source/games/duke/src/dispatch.cpp index 160b72fd1..b4d589cc0 100644 --- a/source/games/duke/src/dispatch.cpp +++ b/source/games/duke/src/dispatch.cpp @@ -46,10 +46,6 @@ void checksectors_r(int snum); void addweapon_d(player_struct* p, int weapon, bool wswitch); void addweapon_r(player_struct* p, int weapon, bool wswitch); -void lotsofmoney_d(DDukeActor* s, int n); -void lotsofmail_d(DDukeActor* s, int n); -void lotsofpaper_d(DDukeActor* s, int n); -void lotsoffeathers_r(DDukeActor* s, int n); int ifhitbyweapon_r(DDukeActor* sn); int ifhitbyweapon_d(DDukeActor* sn); void fall_d(DDukeActor* i, int g_p); @@ -95,9 +91,6 @@ void SetDispatcher() checksectors_d, addweapon_d, - lotsofmoney_d, - lotsofmail_d, - lotsofpaper_d, ifhitbyweapon_d, fall_d, spawnweapondebris_d, @@ -125,9 +118,6 @@ void SetDispatcher() checksectors_r, addweapon_r, - lotsoffeathers_r, - lotsoffeathers_r, - lotsoffeathers_r, ifhitbyweapon_r, fall_r, spawnweapondebris_r, diff --git a/source/games/duke/src/duke3d.h b/source/games/duke/src/duke3d.h index 0a41abec9..d3c88410e 100644 --- a/source/games/duke/src/duke3d.h +++ b/source/games/duke/src/duke3d.h @@ -81,9 +81,6 @@ struct Dispatcher void (*checksectors)(int low); void (*addweapon)(player_struct *p, int weapon, bool wswitch); - void (*lotsofmoney)(DDukeActor *s, int n); - void (*lotsofmail)(DDukeActor *s, int n); - void (*lotsofpaper)(DDukeActor *s, int n); int (*ifhitbyweapon)(DDukeActor* sectnum); void (*fall)(DDukeActor* actor, int g_p); bool (*spawnweapondebris)(int picnum); diff --git a/source/games/duke/src/gameexec.cpp b/source/games/duke/src/gameexec.cpp index 10d708f4d..a3dbfe08f 100644 --- a/source/games/duke/src/gameexec.cpp +++ b/source/games/duke/src/gameexec.cpp @@ -1809,12 +1809,12 @@ int ParseState::parse(void) break; case concmd_money: insptr++; - fi.lotsofmoney(g_ac,*insptr); + lotsofstuff(g_ac,*insptr, DukeMoneyClass); insptr++; break; case concmd_mail: insptr++; - fi.lotsofmail(g_ac,*insptr); + lotsofstuff(g_ac,*insptr, DukeMailClass); insptr++; break; case concmd_sleeptime: @@ -1824,7 +1824,7 @@ int ParseState::parse(void) break; case concmd_paper: insptr++; - fi.lotsofpaper(g_ac,*insptr); + lotsofstuff(g_ac,*insptr, DukePaperClass); insptr++; break; case concmd_addkills: diff --git a/source/games/duke/src/global.cpp b/source/games/duke/src/global.cpp index 796da2088..db35e49c7 100644 --- a/source/games/duke/src/global.cpp +++ b/source/games/duke/src/global.cpp @@ -141,6 +141,11 @@ void RegisterClasses() { I_FatalError("Unable to register %d actor classes", error); } + + if (isRR()) // save some mess elsewhere + { + DukeMoneyClass = DukeMailClass = DukePaperClass = RedneckFeatherClass; + } } END_DUKE_NS diff --git a/source/games/duke/src/sectors_d.cpp b/source/games/duke/src/sectors_d.cpp index ea2c181ac..9b38b5c66 100644 --- a/source/games/duke/src/sectors_d.cpp +++ b/source/games/duke/src/sectors_d.cpp @@ -344,7 +344,7 @@ void checksectors_d(int snum) if (chatmodeon || p->GetActor()->spr.extra <= 0) return; if (ud.cashman && PlayerInput(snum, SB_OPEN)) - fi.lotsofmoney(p->GetActor(), 2); + lotsofstuff(p->GetActor(), 2, DukeMailClass); if (p->newOwner != nullptr) { diff --git a/source/games/duke/src/sectors_r.cpp b/source/games/duke/src/sectors_r.cpp index 36b327c9b..d9afc8b4d 100644 --- a/source/games/duke/src/sectors_r.cpp +++ b/source/games/duke/src/sectors_r.cpp @@ -297,7 +297,7 @@ void checksectors_r(int snum) if (chatmodeon || p->GetActor()->spr.extra <= 0) return; if (ud.cashman && PlayerInput(snum, SB_OPEN)) - fi.lotsofmoney(p->GetActor(), 2); + lotsofstuff(p->GetActor(), 2, DukeMailClass); if (!(PlayerInput(snum, SB_OPEN)))