aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/sprites.h
diff options
context:
space:
mode:
authorVicent Marti2008-06-14 14:44:29 +0000
committerVicent Marti2008-06-14 14:44:29 +0000
commitd0b27cf9c66b9281899acf826cb205e19dcb7260 (patch)
tree74e813b1d1f081f35f41ca7a95da5d048951b9e7 /engines/kyra/sprites.h
parentd51a0cab3fe494698f001d81d5d86cea7cd0395b (diff)
parent91d3ea31359950b59ee46af8355cc0f5790257e5 (diff)
downloadscummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.gz
scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.bz2
scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.zip
Merged trunk into the GUI branch.
Fixed MSVS9 project files. svn-id: r32702
Diffstat (limited to 'engines/kyra/sprites.h')
-rw-r--r--engines/kyra/sprites.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/sprites.h b/engines/kyra/sprites.h
index 3304458fda..212bfc7428 100644
--- a/engines/kyra/sprites.h
+++ b/engines/kyra/sprites.h
@@ -26,7 +26,7 @@
#ifndef KYRA_SPRITES_H
#define KYRA_SPRITES_H
-#include "kyra/kyra_v1.h"
+#include "kyra/kyra_lok.h"
namespace Kyra {
@@ -63,11 +63,11 @@ struct Anim {
bool disable;
};
-class KyraEngine_v1;
+class KyraEngine_LoK;
class Sprites {
public:
- Sprites(KyraEngine_v1 *vm, OSystem *system);
+ Sprites(KyraEngine_LoK *vm, OSystem *system);
~Sprites();
void updateSceneAnims();
@@ -86,7 +86,7 @@ public:
protected:
void freeSceneShapes();
- KyraEngine_v1 *_vm;
+ KyraEngine_LoK *_vm;
Resource *_res;
OSystem *_system;
Screen *_screen;