TONY: More renaming

scummvm · Aug 31, 2012 · f2df769 · f2df769
1 parent 7fbfbc8
commit f2df769
Show file tree

Hide file tree

Showing 18 changed files with 182 additions and 190 deletions.
diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp
@@ -1749,7 +1749,7 @@ int g_curDialog;
 
 DECLARE_CUSTOM_FUNCTION(SendDialogMessage)(CORO_PARAM, uint32 nPers, uint32 nMsg, uint32, uint32) {
 	CORO_BEGIN_CONTEXT;
-	LPSTR string;
+	char *string;
 	RMTextDialog *text;
 	int parm;
 	uint32 h;

diff --git a/engines/tony/custom.h b/engines/tony/custom.h
@@ -36,10 +36,7 @@ namespace Tony {
 
 using namespace MPAL;
 
-typedef uint32 HWND;
-
 #define INIT_CUSTOM_FUNCTION            MapCustomFunctions
-#define INIT_CUSTOM_FUNCTION_STRING     "MapCustomFunctions"
 
 #define DECLARE_CUSTOM_FUNCTION(x)      void x
 

diff --git a/engines/tony/game.cpp b/engines/tony/game.cpp
@@ -1039,7 +1039,7 @@ void RMOptionScreen::doFrame(CORO_PARAM, RMInput *input) {
 	}
 
 #define KEYPRESS(c)     (g_vm->getEngine()->getInput().getAsyncKeyState(c))
-#define PROCESS_CHAR(cod,c)  if (KEYPRESS(cod)) { \
+#define PROCESS_CHAR(cod, c)  if (KEYPRESS(cod)) { \
 		_editName[strlen(_editName) + 1] = '\0'; _editName[strlen(_editName)] = c; _ctx->bRefresh = true; }
 
 	// State Buttons

diff --git a/engines/tony/game.h b/engines/tony/game.h
@@ -42,7 +42,7 @@ namespace Tony {
 	assert(raw->isValid());                                \
 	assert((buf16) == NULL);                               \
 	(buf16) = new RMGfxSourceBuffer16(false);              \
-	(buf16)->init(*raw,raw->width(),raw->height());        \
+	(buf16)->init(*raw, raw->width(), raw->height());      \
 	delete raw;
 
 #define INIT_GFX8_FROMRAW(raw, dwRes, buf8)              \

diff --git a/engines/tony/gfxengine.cpp b/engines/tony/gfxengine.cpp
@@ -424,7 +424,7 @@ uint32 RMGfxEngine::loadLocation(int nLoc, RMPoint ptTonyStart, RMPoint start) {
 	_bLocationLoaded = true;
 
 	// On entering the location
-	return CORO_INVALID_PID_VALUE; //mpalQueryDoAction(0,m_nCurLoc,0);
+	return CORO_INVALID_PID_VALUE; //mpalQueryDoAction(0, m_nCurLoc, 0);
 }
 
 void RMGfxEngine::unloadLocation(CORO_PARAM, bool bDoOnExit, uint32 *result) {

diff --git a/engines/tony/globals.h b/engines/tony/globals.h
@@ -150,9 +150,9 @@ typedef struct {
 	int _nCf;
 
 	int _arg1, _arg2, _arg3, _arg4;
-} CFCALL;
-typedef CFCALL         *LPCFCALL;
-typedef LPCFCALL       *LPLPCFCALL;
+} CfCall;
+typedef CfCall         *LpCfCall;
+typedef LpCfCall       *LPLPCFCALL;
 
 
 struct CoroutineMutex {
@@ -176,20 +176,20 @@ class Globals {
 
 	Common::String _nextMusic;
 	bool _nextLoop;
-	int _nextChannel;
-	int _nextSync;
-	int _curChannel;
-	int _flipflop;
+	int  _nextChannel;
+	int  _nextSync;
+	int  _curChannel;
+	int  _flipflop;
 	CharacterStruct _character[16];
 	MCharacterStruct _mCharacter[10];
 	ChangedHotspotStruct _changedHotspot[256];
 	bool _isMChar[16];
 	bool _bAlwaysDisplay;
 	RMPoint _saveTonyPos;
-	int _saveTonyLoc;
+	int  _saveTonyLoc;
 	RMTextDialog *_curBackText;
 	bool _bTonyIsSpeaking;
-	int _curChangedHotspot;
+	int  _curChangedHotspot;
 	bool _bCfgInvLocked;
 	bool _bCfgInvNoScroll;
 	bool _bCfgTimerizedText;
@@ -210,8 +210,8 @@ class Globals {
 	bool _bSkipSfxNoLoop;
 	bool _bIdleExited;
 	bool _bNoBullsEye;
-	int _curDialog;
-	int _curSoundEffect;
+	int  _curDialog;
+	int  _curSoundEffect;
 	bool _bFadeOutStop;
 
 	RMTony *_tony;
@@ -251,22 +251,22 @@ class Globals {
 	Common::String     *_lplpFunctionStrings;
 	uint16              _nObjs;
 	uint16              _nVars;
-	HGLOBAL             _hVars;
+	MpalHandle          _hVars;
 	LpMpalVar           _lpmvVars;
 	uint16              _nMsgs;
-	HGLOBAL             _hMsgs;
+	MpalHandle          _hMsgs;
 	LpMpalMsg           _lpmmMsgs;
 	uint16              _nDialogs;
-	HGLOBAL             _hDialogs;
+	MpalHandle          _hDialogs;
 	LpMpalDialog        _lpmdDialogs;
 	uint16              _nItems;
-	HGLOBAL             _hItems;
+	MpalHandle          _hItems;
 	LpMpalItem          _lpmiItems;
 	uint16              _nLocations;
-	HGLOBAL             _hLocations;
+	MpalHandle          _hLocations;
 	LpMpalLocation      _lpmlLocations;
 	uint16              _nScripts;
-	HGLOBAL             _hScripts;
+	MpalHandle          _hScripts;
 	LpMpalScript        _lpmsScripts;
 	Common::File        _hMpr;
 	uint16              _nResources;