NEVERHOOD: Rename Class426 to SsCommonPressButton

4 files changed, 15 insertions, 15 deletions

diff --git a/engines/neverhood/module1000.cpp b/engines/neverhood/module1000.cpp
index 4fdb3db523..dce4b8cfac 100644
--- a/engines/neverhood/module1000.cpp
+++ b/engines/neverhood/module1000.cpp
@@ -763,7 +763,7 @@ void AsScene1002DoorSpy::stDoorSpyBoxingGlove() {
 	NextState(&AsScene1002DoorSpy::stDoorSpyIdle);
 }
 
-Class426::Class426(NeverhoodEngine *vm, Scene *parentScene, uint32 fileHash1, uint32 fileHash2, int surfacePriority, uint32 soundFileHash) 
+SsCommonPressButton::SsCommonPressButton(NeverhoodEngine *vm, Scene *parentScene, uint32 fileHash1, uint32 fileHash2, int surfacePriority, uint32 soundFileHash) 
 	: StaticSprite(vm, 1100), _parentScene(parentScene), _status(0) {
 
 	_soundFileHash = soundFileHash != 0 ? soundFileHash : 0x44141000;
@@ -784,12 +784,12 @@ Class426::Class426(NeverhoodEngine *vm, Scene *parentScene, uint32 fileHash1, ui
 	setVisible(false);
 	_needRefresh = true;
 	
-	SetUpdateHandler(&Class426::update);
-	SetMessageHandler(&Class426::handleMessage);
+	SetUpdateHandler(&SsCommonPressButton::update);
+	SetMessageHandler(&SsCommonPressButton::handleMessage);
 
 }
 
-void Class426::setFileHashes(uint32 fileHash1, uint32 fileHash2) {
+void SsCommonPressButton::setFileHashes(uint32 fileHash1, uint32 fileHash2) {
 	_fileHashes[0] = fileHash1;
 	_fileHashes[1] = fileHash2;
 	if (_status == 2) {
@@ -815,7 +815,7 @@ void Class426::setFileHashes(uint32 fileHash1, uint32 fileHash2) {
 	}
 }
 
-void Class426::update() {
+void SsCommonPressButton::update() {
 	if (_countdown != 0 && (--_countdown) == 0) {
 		if (_status == 1) {
 			_status = 2;
@@ -848,7 +848,7 @@ void Class426::update() {
 	}
 }
 
-uint32 Class426::handleMessage(int messageNum, const MessageParam &param, Entity *sender) {
+uint32 SsCommonPressButton::handleMessage(int messageNum, const MessageParam &param, Entity *sender) {
 	uint32 messageResult = Sprite::handleMessage(messageNum, param, sender);
 	switch (messageNum) {
 	case 0x480B:
@@ -1353,7 +1353,7 @@ Scene1002::Scene1002(NeverhoodEngine *vm, Module *parentModule, int which)
 	_asDoor = insertSprite<AsScene1002Door>(tempClipRect);
 	tempSprite = insertSprite<AsScene1002BoxingGloveHitEffect>();
 	_asDoorSpy = insertSprite<AsScene1002DoorSpy>(tempClipRect, this, _asDoor, tempSprite);
-	_class426 = insertSprite<Class426>(this, 0x00412692, 0x140B60BE, 800, 0);
+	_ssPressButton = insertSprite<SsCommonPressButton>(this, 0x00412692, 0x140B60BE, 800, 0);
 	_asVenusFlyTrap = insertSprite<AsScene1002VenusFlyTrap>(this, _klayman, false);
 	_vm->_collisionMan->addSprite(_asVenusFlyTrap);
 
@@ -1440,7 +1440,7 @@ uint32 Scene1002::handleMessage(int messageNum, const MessageParam &param, Entit
 		} else if (param.asInteger() == 0x42845B19) {
 			sendEntityMessage(_klayman, 0x1014, _asRing5);
 		} else if (param.asInteger() == 0xC0A07458) {
-			sendEntityMessage(_klayman, 0x1014, _class426);
+			sendEntityMessage(_klayman, 0x1014, _ssPressButton);
 		}
 		break;
 	case 0x1024:
diff --git a/engines/neverhood/module1000.h b/engines/neverhood/module1000.h
index 864b5ccf94..f63d1f0b21 100644
--- a/engines/neverhood/module1000.h
+++ b/engines/neverhood/module1000.h
@@ -158,9 +158,9 @@ protected:
 	void stDoorSpyBoxingGlove();
 };
 
-class Class426 : public StaticSprite {
+class SsCommonPressButton : public StaticSprite {
 public:
-	Class426(NeverhoodEngine *vm, Scene *parentScene, uint32 fileHash1, uint32 fileHash2, int surfacePriority, uint32 soundFileHash);
+	SsCommonPressButton(NeverhoodEngine *vm, Scene *parentScene, uint32 fileHash1, uint32 fileHash2, int surfacePriority, uint32 soundFileHash);
 	void setFileHashes(uint32 fileHash1, uint32 fileHash2);
 protected:
 	Scene *_parentScene;
@@ -252,7 +252,7 @@ protected:
 	Sprite *_asKlaymanLadderHands;
 	Sprite *_asKlaymanPeekHand;
 	Sprite *_asOutsideDoorBackground;
-	Sprite *_class426;
+	Sprite *_ssPressButton;
 	bool _flag1B4;
 	bool _flag1BE;
 	bool _flag;
diff --git a/engines/neverhood/module2200.cpp b/engines/neverhood/module2200.cpp
index 36be19a01f..4460314d5e 100644
--- a/engines/neverhood/module2200.cpp
+++ b/engines/neverhood/module2200.cpp
@@ -518,7 +518,7 @@ Scene2201::Scene2201(NeverhoodEngine *vm, Module *parentModule, int which)
 	_asTape = insertSprite<AsScene1201Tape>(this, 7, 1100, 459, 432, 0x9148A011);
 	_vm->_collisionMan->addSprite(_asTape); 
 
-	_ssDoorButton = insertSprite<Class426>(this, 0xE4A43E29, 0xE4A43E29, 100, 0);
+	_ssDoorButton = insertSprite<SsCommonPressButton>(this, 0xE4A43E29, 0xE4A43E29, 100, 0);
 	
 	for (uint32 i = 0; i < 9; i++) {
 		if ((int16)getSubVar(0x484498D0, i) >= 0) {
@@ -1279,14 +1279,14 @@ Scene2205::Scene2205(NeverhoodEngine *vm, Module *parentModule, int which)
 		setPalette(0x0008028D);
 		addEntity(_palette);
 		insertMouse433(0x80289008);
-		_ssLightSwitch = insertSprite<Class426>(this, 0x2D339030, 0x2D309030, 100, 0);
+		_ssLightSwitch = insertSprite<SsCommonPressButton>(this, 0x2D339030, 0x2D309030, 100, 0);
 	} else {
 		_isLightOn = false;
 		setBackground(0xD00A028D);
 		setPalette(0xD00A028D);
 		addEntity(_palette);
 		insertMouse433(0xA0289D08);
-		_ssLightSwitch = insertSprite<Class426>(this, 0x2D339030, 0xDAC86E84, 100, 0);
+		_ssLightSwitch = insertSprite<SsCommonPressButton>(this, 0x2D339030, 0xDAC86E84, 100, 0);
 	}
 
 	_palette->addBasePalette(0xD00A028D, 0, 256, 0);
diff --git a/engines/neverhood/module2200.h b/engines/neverhood/module2200.h
index 3767b7bd64..53b94695d8 100644
--- a/engines/neverhood/module2200.h
+++ b/engines/neverhood/module2200.h
@@ -197,7 +197,7 @@ class Scene2205 : public Scene {
 public:
 	Scene2205(NeverhoodEngine *vm, Module *parentModule, int which);
 protected:
-	Class426 *_ssLightSwitch;
+	SsCommonPressButton *_ssLightSwitch;
 	Sprite *_ssDoorFrame;
 	bool _isKlaymanInLight;
 	bool _isLightOn;