[Scummvm-cvs-logs] SF.net SVN: scummvm: [26336] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 26336
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26336&view=rev
Author:   peres001
Date:     2007-04-01 04:44:58 -0700 (Sun, 01 Apr 2007)

Log Message:
-----------
made Menu use _vm instead of _engine

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/menu.cpp
    scummvm/trunk/engines/parallaction/menu.h

Modified: scummvm/trunk/engines/parallaction/menu.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/menu.cpp	2007-04-01 00:13:54 UTC (rev 26335)
+++ scummvm/trunk/engines/parallaction/menu.cpp	2007-04-01 11:44:58 UTC (rev 26336)
@@ -89,8 +89,8 @@
 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 @@
 	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 @@
 			}
 		}
 
-		_engine->waitTime( 1 );
+		_vm->waitTime( 1 );
 
 	} while (true);
 
@@ -228,12 +228,12 @@
 	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 @@
 	// load game
 
 	strcpy(_vm->_location._name, "fogne");
-	strcpy(_engine->_characterName, "dough");
+	strcpy(_vm->_characterName, "dough");
 
 	_vm->loadGame();
 
@@ -287,7 +287,7 @@
 	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 @@
 
 			_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++) {

Modified: scummvm/trunk/engines/parallaction/menu.h
===================================================================
--- scummvm/trunk/engines/parallaction/menu.h	2007-04-01 00:13:54 UTC (rev 26335)
+++ scummvm/trunk/engines/parallaction/menu.h	2007-04-01 11:44:58 UTC (rev 26336)
@@ -32,7 +32,7 @@
 class Menu {
 
 public:
-	Menu(Parallaction *engine);
+	Menu(Parallaction *vm);
 	virtual 	~Menu();
 
 	void		start();
@@ -47,7 +47,7 @@
 
 
 protected:
-	Parallaction*	_engine;
+	Parallaction*	_vm;
 
 
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.