aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_mr.h
diff options
context:
space:
mode:
authorJohannes Schickel2008-05-11 22:32:37 +0000
committerJohannes Schickel2008-05-11 22:32:37 +0000
commit6e0c56996662dec6ccd9e724161e55562b728d8b (patch)
tree984e1e647cd413e5f1701520511dd339b0dbf44e /engines/kyra/kyra_mr.h
parent6e3c92e2392eb429723e23a4c782e0c1a7037b18 (diff)
downloadscummvm-rg350-6e0c56996662dec6ccd9e724161e55562b728d8b.tar.gz
scummvm-rg350-6e0c56996662dec6ccd9e724161e55562b728d8b.tar.bz2
scummvm-rg350-6e0c56996662dec6ccd9e724161e55562b728d8b.zip
Consisteny fixes:
- Renamed classes *_v1 -> *_LoK - Renamed files *_v1.* -> *_lok.* - Renamed WSAMovieV1 -> WSAMovie_v1 - Renamed WSAMovieV2 -> WSAMovie_v2 svn-id: r32042
Diffstat (limited to 'engines/kyra/kyra_mr.h')
-rw-r--r--engines/kyra/kyra_mr.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index a50fbfd440..4e28d6a5c0 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -39,7 +39,7 @@ namespace Kyra {
class SoundDigital;
class Screen_MR;
class MainMenu;
-class WSAMovieV2;
+class WSAMovie_v2;
class TextDisplayer_MR;
struct Button;
@@ -157,7 +157,7 @@ private:
void initMainMenu();
void uninitMainMenu();
- WSAMovieV2 *_menuAnim;
+ WSAMovie_v2 *_menuAnim;
// timer
void setupTimers();
@@ -262,7 +262,7 @@ private:
void clearInventorySlot(int slot, int page);
void drawInventorySlot(int page, int item, int slot);
- WSAMovieV2 *_invWsa;
+ WSAMovie_v2 *_invWsa;
int _invWsaFrame;
// localization
@@ -535,11 +535,11 @@ private:
struct Album {
uint8 *backUpPage;
uint8 *file;
- WSAMovieV2 *wsa;
+ WSAMovie_v2 *wsa;
uint8 *backUpRect;
struct PageMovie {
- WSAMovieV2 *wsa;
+ WSAMovie_v2 *wsa;
int curFrame;
int maxFrame;
uint32 timer;