libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-24 02:36:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NEVERHOOD: Rename

Browse Source 
- Also fix compilation (oops)
This commit is contained in:
johndoe123 2012-10-02 07:52:15 +00:00 committed by Willem Jan Palenstijn
parent 4fef1ac9f2
commit 3ef691f1af
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/neverhood/klayman.cpp
View File

@ -502,13 +502,13 @@ void Klayman::stTryStandIdle() {
_idleCounter = 0;
_blinkCounter = 0;
_blinkCounterMax = _vm->_rnd->getRandomNumber(64) + 24;
SetUpdateHandler(&Klayman::upIdle);
SetUpdateHandler(&Klayman::upStandIdle);
SetMessageHandler(&Klayman::hmLowLevel);
SetSpriteUpdate(NULL);
}
}
void Klayman::upIdle() {
void Klayman::upStandIdle() {
update();
if (++_idleCounter >= 720) {
_idleCounter = 0;
@ -588,7 +588,7 @@ void Klayman::stStandAround() {
_status2 = 1;
_acceptInput = true;
startAnimation(0x5420E254, 0, -1);
SetUpdateHandler(&Klayman::upIdle);
SetUpdateHandler(&Klayman::upStandIdle);
SetMessageHandler(&Klayman::hmLowLevel);
SetSpriteUpdate(NULL);
}

28
engines/neverhood/klayman.h
View File

@ -318,6 +318,19 @@ protected:
// TODO Check if this can be turned into a void result
virtual uint32 xHandleMessage(int messageNum, const MessageParam &param);
void startWalkToX(int16 x, bool flag);
void startWalkToXExt(int16 x);
void startWalkToXSmall(int16 x);
void startSpecialWalkLeft(int16 x);
void startSpecialWalkRight(int16 x);
void sub41CC40(int16 x1, int16 x2);
void sub41CCE0(int16 x);
bool stStartActionFromIdle(AnimationCb callback);
void gotoNextStateExt();
void sub41C770();
void sub41C790();
void stIdlePickEar();
void evIdlePickEarDone();
uint32 hmIdlePickEar(int messageNum, const MessageParam &param, Entity *sender);
@ -338,20 +351,13 @@ protected:
void startIdleAnimation(uint32 fileHash, AnimationCb callback);
void upIdleAnimation();
bool stStartActionFromIdle(AnimationCb callback);
void gotoNextStateExt();
void sub41C770();
void sub41C790();
void upIdle();
void upStandIdle();
void stIdleBlink();
void stStandAround();
uint32 hmStartAction(int messageNum, const MessageParam &param, Entity *sender);
void startWalkToX(int16 x, bool flag);
uint32 hmSleeping(int messageNum, const MessageParam &param, Entity *sender);
bool stStartAction(AnimationCb callback3);
@ -359,7 +365,6 @@ protected:
void stSneak();
void stWalkingDone();
uint32 hmSneaking(int messageNum, const MessageParam &param, Entity *sender);
void startSpecialWalkLeft(int16 x);
void stStartWalking();
uint32 hmStartWalking(int messageNum, const MessageParam &param, Entity *sender);
@ -367,10 +372,6 @@ protected:
uint32 hmPressButton(int messageNum, const MessageParam &param, Entity *sender);
void startSpecialWalkRight(int16 x);
void sub41CC40(int16 x1, int16 x2);
void startWalkToXExt(int16 x);
void sub41CCE0(int16 x);
void stLargeStepDone();
uint32 hmLargeStep(int messageNum, const MessageParam &param, Entity *sender);
@ -393,7 +394,6 @@ protected:
uint32 hmInsertDisk(int messageNum, const MessageParam &param, Entity *sender);
void startWalkToXSmall(int16 x);
void stStartWalkingSmall();
uint32 hmWalkingSmall(int messageNum, const MessageParam &param, Entity *sender);
uint32 hmWalkFrontBackSmall(int messageNum, const MessageParam &param, Entity *sender);