zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-25 05:31:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: When the SectorAction's TriggerAction method was renamed, the inherited one in the MusicChanger was overlooked. (Bit thanks to the C++ specs for allowing to override a non-virtual method with a virtual one without even showing a warning...)

Browse source
This commit is contained in:
Christoph Oelckers 2014-09-21 09:11:33 +02:00
parent cbf72fe992
commit f92cdb0ce7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/s_advsound.cpp
View file

@ -2347,14 +2347,14 @@ class AMusicChanger : public ASectorAction
{ {
DECLARE_CLASS (AMusicChanger, ASectorAction) DECLARE_CLASS (AMusicChanger, ASectorAction)
public: public:
virtual bool TriggerAction (AActor *triggerer, int activationType); virtual bool DoTriggerAction (AActor *triggerer, int activationType);
virtual void Tick(); virtual void Tick();
virtual void PostBeginPlay(); virtual void PostBeginPlay();
}; };
IMPLEMENT_CLASS(AMusicChanger) IMPLEMENT_CLASS(AMusicChanger)
bool AMusicChanger::TriggerAction (AActor *triggerer, int activationType) bool AMusicChanger::DoTriggerAction (AActor *triggerer, int activationType)
{ {
if (activationType & SECSPAC_Enter) if (activationType & SECSPAC_Enter)
{ {
@ -2364,7 +2364,7 @@ bool AMusicChanger::TriggerAction (AActor *triggerer, int activationType)
reactiontime = 30; reactiontime = 30;
} }
} }
return Super::TriggerAction (triggerer, activationType); return Super::DoTriggerAction (triggerer, activationType);
} }
void AMusicChanger::Tick() void AMusicChanger::Tick()