aboutsummaryrefslogtreecommitdiff
path: root/engines/neverhood
diff options
context:
space:
mode:
Diffstat (limited to 'engines/neverhood')
-rw-r--r--engines/neverhood/module1000.cpp4
-rw-r--r--engines/neverhood/module1000.h2
-rw-r--r--engines/neverhood/module1900.cpp6
-rw-r--r--engines/neverhood/module1900.h4
4 files changed, 8 insertions, 8 deletions
diff --git a/engines/neverhood/module1000.cpp b/engines/neverhood/module1000.cpp
index 2ee98acbd2..2eb8a67176 100644
--- a/engines/neverhood/module1000.cpp
+++ b/engines/neverhood/module1000.cpp
@@ -741,8 +741,8 @@ uint32 AsScene1002BoxingGloveHitEffect::handleMessage(int messageNum, const Mess
return messageResult;
}
-AsScene1002DoorSpy::AsScene1002DoorSpy(NeverhoodEngine *vm, NRect &clipRect, Scene *parentScene, Sprite *asDoor, Sprite *AsScene1002BoxingGloveHitEffect)
- : AnimatedSprite(vm, 1300), _clipRect(clipRect), _parentScene(parentScene), _asDoor(asDoor), _asBoxingGloveHitEffect(AsScene1002BoxingGloveHitEffect),
+AsScene1002DoorSpy::AsScene1002DoorSpy(NeverhoodEngine *vm, NRect &clipRect, Scene *parentScene, Sprite *asDoor, Sprite *asScene1002BoxingGloveHitEffect)
+ : AnimatedSprite(vm, 1300), _clipRect(clipRect), _parentScene(parentScene), _asDoor(asDoor), _asBoxingGloveHitEffect(asScene1002BoxingGloveHitEffect),
_soundResource(vm) {
SetUpdateHandler(&AnimatedSprite::update);
diff --git a/engines/neverhood/module1000.h b/engines/neverhood/module1000.h
index 702f538dfd..b8fa6365a6 100644
--- a/engines/neverhood/module1000.h
+++ b/engines/neverhood/module1000.h
@@ -168,7 +168,7 @@ protected:
class AsScene1002DoorSpy : public AnimatedSprite {
public:
- AsScene1002DoorSpy(NeverhoodEngine *vm, NRect &clipRect, Scene *parentScene, Sprite *asDoor, Sprite *AsScene1002BoxingGloveHitEffect);
+ AsScene1002DoorSpy(NeverhoodEngine *vm, NRect &clipRect, Scene *parentScene, Sprite *asDoor, Sprite *asScene1002BoxingGloveHitEffect);
protected:
Scene *_parentScene;
Sprite *_asDoor;
diff --git a/engines/neverhood/module1900.cpp b/engines/neverhood/module1900.cpp
index e9be86a926..f91513fe57 100644
--- a/engines/neverhood/module1900.cpp
+++ b/engines/neverhood/module1900.cpp
@@ -448,8 +448,8 @@ void AsScene1907Symbol::moveDown() {
_isMoving = true;
}
-SsScene1907UpDownButton::SsScene1907UpDownButton(NeverhoodEngine *vm, Scene1907 *parentScene, AsScene1907Symbol *AsScene1907Symbol)
- : StaticSprite(vm, 1400), _soundResource(vm), _parentScene(parentScene), _AsScene1907Symbol(AsScene1907Symbol),
+SsScene1907UpDownButton::SsScene1907UpDownButton(NeverhoodEngine *vm, Scene1907 *parentScene, AsScene1907Symbol *asScene1907Symbol)
+ : StaticSprite(vm, 1400), _soundResource(vm), _parentScene(parentScene), _asScene1907Symbol(asScene1907Symbol),
_countdown1(0) {
_spriteResource.load2(0x64516424);
@@ -484,7 +484,7 @@ uint32 SsScene1907UpDownButton::handleMessage(int messageNum, const MessageParam
uint32 messageResult = Sprite::handleMessage(messageNum, param, sender);
switch (messageNum) {
case 0x1011:
- if (_countdown1 == 0 && !_AsScene1907Symbol->isMoving() && getGlobalVar(0xA9035F60)) {
+ if (_countdown1 == 0 && !_asScene1907Symbol->isMoving() && getGlobalVar(0xA9035F60)) {
setVisible(true);
_countdown1 = 4;
StaticSprite::update();
diff --git a/engines/neverhood/module1900.h b/engines/neverhood/module1900.h
index 7b41c5780b..2eadd06a95 100644
--- a/engines/neverhood/module1900.h
+++ b/engines/neverhood/module1900.h
@@ -107,13 +107,13 @@ protected:
class SsScene1907UpDownButton : public StaticSprite {
public:
- SsScene1907UpDownButton(NeverhoodEngine *vm, Scene1907 *parentScene, AsScene1907Symbol *AsScene1907Symbol);
+ SsScene1907UpDownButton(NeverhoodEngine *vm, Scene1907 *parentScene, AsScene1907Symbol *asScene1907Symbol);
void setToUpPosition();
void setToDownPosition();
protected:
SoundResource _soundResource;
Scene1907 *_parentScene;
- AsScene1907Symbol *_AsScene1907Symbol;
+ AsScene1907Symbol *_asScene1907Symbol;
int _countdown1;
void update();
uint32 handleMessage(int messageNum, const MessageParam &param, Entity *sender);