aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicola Mettifogo2007-04-01 11:44:58 +0000
committerNicola Mettifogo2007-04-01 11:44:58 +0000
commit18ef96d08bccb7d8afbe7ad42fae085ed8e36ea9 (patch)
tree65edbf128ee7c874f2e45c75f3a19bd5d221c57e
parent63ff4aa50bdc8504a28b3c20c70a6c9d32be76d9 (diff)
downloadscummvm-rg350-18ef96d08bccb7d8afbe7ad42fae085ed8e36ea9.tar.gz
scummvm-rg350-18ef96d08bccb7d8afbe7ad42fae085ed8e36ea9.tar.bz2
scummvm-rg350-18ef96d08bccb7d8afbe7ad42fae085ed8e36ea9.zip
made Menu use _vm instead of _engine
svn-id: r26336
-rw-r--r--engines/parallaction/menu.cpp26
-rw-r--r--engines/parallaction/menu.h4
2 files changed, 15 insertions, 15 deletions
diff --git a/engines/parallaction/menu.cpp b/engines/parallaction/menu.cpp
index c63f48731a..666adfde12 100644
--- a/engines/parallaction/menu.cpp
+++ b/engines/parallaction/menu.cpp
@@ -89,8 +89,8 @@ static uint16 _donnaKey[] = { 0, 2, 8, 5, 5, 1 };
static uint16 _doughKey[] = { 1, 7 ,7, 2, 2, 6 };
-Menu::Menu(Parallaction *engine) {
- _engine = engine;
+Menu::Menu(Parallaction *vm) {
+ _vm = vm;
}
Menu::~Menu() {
@@ -177,17 +177,17 @@ void Menu::newGame() {
selectCharacter();
char *v4 = strchr(_vm->_location._name, '.') + 1;
- strcpy(_engine->_characterName, v4);
+ strcpy(_vm->_characterName, v4);
return; // start game
}
uint16 Menu::chooseLanguage() {
- _engine->changeCursor(kCursorArrow);
+ _vm->changeCursor(kCursorArrow);
do {
- _engine->updateInput();
+ _vm->updateInput();
_vm->_gfx->swapBuffers();
if (_mouseButtons == kMouseLeftUp) {
@@ -204,7 +204,7 @@ uint16 Menu::chooseLanguage() {
}
}
- _engine->waitTime( 1 );
+ _vm->waitTime( 1 );
} while (true);
@@ -228,12 +228,12 @@ uint16 Menu::selectGame() {
uint16 _si = 0;
uint16 _di = 3;
- _engine->updateInput();
+ _vm->updateInput();
while (_mouseButtons != kMouseLeftUp) {
- _engine->updateInput();
+ _vm->updateInput();
_vm->_gfx->swapBuffers();
- _engine->waitTime( 1 );
+ _vm->waitTime( 1 );
_si = 0;
if (_vm->_mousePos.x > 160)
@@ -261,7 +261,7 @@ uint16 Menu::selectGame() {
// load game
strcpy(_vm->_location._name, "fogne");
- strcpy(_engine->_characterName, "dough");
+ strcpy(_vm->_characterName, "dough");
_vm->loadGame();
@@ -287,7 +287,7 @@ void Menu::selectCharacter() {
v14._width = BLOCK_WIDTH;
v14._height = BLOCK_HEIGHT;
- _engine->changeCursor(kCursorArrow);
+ _vm->changeCursor(kCursorArrow);
_vm->_midiPlayer->stop();
_vm->_gfx->_proportionalFont = false;
@@ -313,9 +313,9 @@ void Menu::selectCharacter() {
_mouseButtons = kMouseNone;
do {
- _engine->updateInput();
+ _vm->updateInput();
_vm->_gfx->swapBuffers();
- _engine->waitTime(1);
+ _vm->waitTime(1);
} while (_mouseButtons != kMouseLeftUp); // waits for left click
for (uint16 _si = 0; _si < 9; _si++) {
diff --git a/engines/parallaction/menu.h b/engines/parallaction/menu.h
index 694627ec6b..6f7418a23b 100644
--- a/engines/parallaction/menu.h
+++ b/engines/parallaction/menu.h
@@ -32,7 +32,7 @@ class Parallaction;
class Menu {
public:
- Menu(Parallaction *engine);
+ Menu(Parallaction *vm);
virtual ~Menu();
void start();
@@ -47,7 +47,7 @@ public:
protected:
- Parallaction* _engine;
+ Parallaction* _vm;
};