aboutsummaryrefslogtreecommitdiff
path: root/engines/neverhood/scene.h
diff options
context:
space:
mode:
Diffstat (limited to 'engines/neverhood/scene.h')
-rw-r--r--engines/neverhood/scene.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/engines/neverhood/scene.h b/engines/neverhood/scene.h
index 39455c78fa..1abcbfb964 100644
--- a/engines/neverhood/scene.h
+++ b/engines/neverhood/scene.h
@@ -28,7 +28,7 @@
#include "neverhood/background.h"
#include "neverhood/entity.h"
#include "neverhood/graphics.h"
-#include "neverhood/klayman.h"
+#include "neverhood/klaymen.h"
#include "neverhood/module.h"
#include "neverhood/palette.h"
#include "neverhood/smackerplayer.h"
@@ -72,34 +72,34 @@ public:
void removeCollisionSprite(Sprite *sprite);
void checkCollision(Sprite *sprite, uint16 flags, int messageNum, uint32 messageParam);
// Some crazy templated functions to make the logic code smaller/simpler (imo!)
- // insertKlayman
+ // insertKlaymen
template<class T>
- void insertKlayman() {
- _klayman = (T*)addSprite(new T(_vm, this));
+ void insertKlaymen() {
+ _klaymen = (T*)addSprite(new T(_vm, this));
}
template<class T, class Arg1>
- void insertKlayman(Arg1 arg1) {
- _klayman = (T*)addSprite(new T(_vm, this, arg1));
+ void insertKlaymen(Arg1 arg1) {
+ _klaymen = (T*)addSprite(new T(_vm, this, arg1));
}
template<class T, class Arg1, class Arg2>
- void insertKlayman(Arg1 arg1, Arg2 arg2) {
- _klayman = (T*)addSprite(new T(_vm, this, arg1, arg2));
+ void insertKlaymen(Arg1 arg1, Arg2 arg2) {
+ _klaymen = (T*)addSprite(new T(_vm, this, arg1, arg2));
}
template<class T, class Arg1, class Arg2, class Arg3>
- void insertKlayman(Arg1 arg1, Arg2 arg2, Arg3 arg3) {
- _klayman = (T*)addSprite(new T(_vm, this, arg1, arg2, arg3));
+ void insertKlaymen(Arg1 arg1, Arg2 arg2, Arg3 arg3) {
+ _klaymen = (T*)addSprite(new T(_vm, this, arg1, arg2, arg3));
}
template<class T, class Arg1, class Arg2, class Arg3, class Arg4>
- void insertKlayman(Arg1 arg1, Arg2 arg2, Arg3 arg3, Arg4 arg4) {
- _klayman = (T*)addSprite(new T(_vm, this, arg1, arg2, arg3, arg4));
+ void insertKlaymen(Arg1 arg1, Arg2 arg2, Arg3 arg3, Arg4 arg4) {
+ _klaymen = (T*)addSprite(new T(_vm, this, arg1, arg2, arg3, arg4));
}
template<class T, class Arg1, class Arg2, class Arg3, class Arg4, class Arg5>
- void insertKlayman(Arg1 arg1, Arg2 arg2, Arg3 arg3, Arg4 arg4, Arg5 arg5) {
- _klayman = (T*)addSprite(new T(_vm, this, arg1, arg2, arg3, arg4, arg5));
+ void insertKlaymen(Arg1 arg1, Arg2 arg2, Arg3 arg3, Arg4 arg4, Arg5 arg5) {
+ _klaymen = (T*)addSprite(new T(_vm, this, arg1, arg2, arg3, arg4, arg5));
}
template<class T, class Arg1, class Arg2, class Arg3, class Arg4, class Arg5, class Arg6>
- void insertKlayman(Arg1 arg1, Arg2 arg2, Arg3 arg3, Arg4 arg4, Arg5 arg5, Arg6 arg6) {
- _klayman = (T*)addSprite(new T(_vm, this, arg1, arg2, arg3, arg4, arg5, arg6));
+ void insertKlaymen(Arg1 arg1, Arg2 arg2, Arg3 arg3, Arg4 arg4, Arg5 arg5, Arg6 arg6) {
+ _klaymen = (T*)addSprite(new T(_vm, this, arg1, arg2, arg3, arg4, arg5, arg6));
}
// insertSprite
template<class T>
@@ -164,7 +164,7 @@ protected:
Common::Array<Entity*> _entities;
Common::Array<BaseSurface*> _surfaces;
- Klayman *_klayman;
+ Klaymen *_klaymen;
Background *_background;
Palette *_palette;
SmackerPlayer *_smackerPlayer;
@@ -177,7 +177,7 @@ protected:
bool _doConvertMessages;
bool _canAcceptInput;
- bool _isKlaymanBusy;
+ bool _isKlaymenBusy;
bool _isMessageListBusy;
Mouse *_mouseCursor;