TONY: Fix warnings about return values not being used

5 files changed, 24 insertions, 9 deletions

diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp
index d710667db6..3400235563 100644
--- a/engines/tony/custom.cpp
+++ b/engines/tony/custom.cpp
@@ -1833,7 +1833,7 @@ DECLARE_CUSTOM_FUNCTION(StartDialog)(uint32 nDialog, uint32 nStartGroup, uint32,
 	curDialog = nDialog;
 	
 	// Chiama l'MPAL per iniziare il dialogo
-	mpalQueryDoDialog(nDialog,nStartGroup);
+	mpalQueryDoDialogU32(nDialog, nStartGroup);
 
 	// Aspetta che una scelta si presenti
 	while ((nChoice=mpalQueryDialogWaitForChoice()) != -1) {
@@ -1844,7 +1844,7 @@ DECLARE_CUSTOM_FUNCTION(StartDialog)(uint32 nDialog, uint32 nStartGroup, uint32,
 
 		// Se c'e' una sola opzione, la fa automaticamente, e aspetta la prossima scelta
 		if (num == 1) {
-			mpalQueryDialogSelection(nChoice, sl[0]);
+			mpalQueryDialogSelectionU32(nChoice, sl[0]);
 			GlobalFree(sl);
 			continue;
 		}
@@ -1880,7 +1880,7 @@ DECLARE_CUSTOM_FUNCTION(StartDialog)(uint32 nDialog, uint32 nStartGroup, uint32,
 		MainHideMouse();
 		
 		dc.Hide();
-		mpalQueryDialogSelection(nChoice, sl[sel]);
+		mpalQueryDialogSelectionU32(nChoice, sl[sel]);
 
 		// Chiude la scelta
 		dc.Close();
diff --git a/engines/tony/loc.cpp b/engines/tony/loc.cpp
index 84e56a108d..62249da255 100644
--- a/engines/tony/loc.cpp
+++ b/engines/tony/loc.cpp
@@ -1349,7 +1349,7 @@ void RMCharacter::NewBoxEntered(int nBox) {
 	bool bOldReverse;
 	
 	// Richiama la On ExitBox
-	mpalQueryDoAction(3, curLocation, curbox);
+	mpalQueryDoActionU32(3, curLocation, curbox);
 
 	cur = theBoxes->GetBoxes(curLocation);
 	bOldReverse = cur->boxes[curbox].bReversed;
@@ -1383,7 +1383,7 @@ void RMCharacter::NewBoxEntered(int nBox) {
 	}
 
 	// Richiama la On EnterBox
-	mpalQueryDoAction(2, curLocation, curbox);
+	mpalQueryDoActionU32(2, curLocation, curbox);
 }
 	
 void RMCharacter::DoFrame(RMGfxTargetBuffer* bigBuf, int loc) {
diff --git a/engines/tony/mpal/mpal.h b/engines/tony/mpal/mpal.h
index d800be60b8..e66f1fdb7e 100644
--- a/engines/tony/mpal/mpal.h
+++ b/engines/tony/mpal/mpal.h
@@ -523,7 +523,8 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
 #define mpalQueryDialogSelection(nChoice,dwData)        \
         (bool)mpalQuery(MPQ_DIALOG_SELECTION,(uint32)(nChoice),(uint32)(dwData))
 
-
+#define mpalQueryDialogSelectionU32(nChoice, dwData)        \
+        mpalQuery(MPQ_DIALOG_SELECTION,(uint32)(nChoice),(uint32)(dwData))
 
 /****************************************************************************\
 *
@@ -547,9 +548,11 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
 *
 \****************************************************************************/
 
-#define mpalQueryDoAction(nAction,nItem,dwParam)      \
-        (HANDLE)mpalQuery(MPQ_DO_ACTION,(uint32)(nAction),(uint32)(nItem),(uint32)(dwParam))
+#define mpalQueryDoAction(nAction, nItem, dwParam)      \
+        (HANDLE)mpalQuery(MPQ_DO_ACTION, (uint32)(nAction), (uint32)(nItem), (uint32)(dwParam))
 
+#define mpalQueryDoActionU32(nAction, nItem, dwParam)      \
+        mpalQuery(MPQ_DO_ACTION, (uint32)(nAction), (uint32)(nItem), (uint32)(dwParam))
 
 
 /****************************************************************************\
@@ -569,6 +572,8 @@ typedef LPITEMIRQFUNCTION* LPLPITEMIRQFUNCTION;
 #define mpalQueryDoDialog(nDialog,nGroup)               \
         (HANDLE)mpalQuery(MPQ_DO_DIALOG,(uint32)(nDialog),(uint32)(nGroup))
 
+#define mpalQueryDoDialogU32(nDialog, nGroup)               \
+        mpalQuery(MPQ_DO_DIALOG,(uint32)(nDialog),(uint32)(nGroup))
 
 
 /****************************************************************************\
diff --git a/engines/tony/tonychar.cpp b/engines/tony/tonychar.cpp
index b7ecb3c0d4..12a8c8eabb 100644
--- a/engines/tony/tonychar.cpp
+++ b/engines/tony/tonychar.cpp
@@ -1061,6 +1061,9 @@ void RMTony::StartTalk(TALKTYPE nTalkType) {
 			headStartPat = PAT_SPAVENTOLEFT_STAND;
 			headLoopPat = PAT_SPAVENTOLEFT_LOOP;
 			break;
+
+		default:
+			break;
 		}
 		break;
 	}			
@@ -1355,6 +1358,10 @@ void RMTony::EndTalk(void) {
 			headStandPat = PAT_SPAVENTOLEFT_STAND;
 			bodyEndPat = 0;
 			break;
+
+
+		default:
+			break;
 		}
 		break;
 
@@ -1636,6 +1643,9 @@ void RMTony::StartStatic(TALKTYPE nTalk) {
 			headLoopPat = PAT_SPAVENTORIGHT_STAND;
 			m_nBodyOffset.Set(6, 56);
 			break;
+
+		default:
+			break;
 		}
 
 	default:
diff --git a/engines/tony/window.cpp b/engines/tony/window.cpp
index 248542ada6..41821ccacc 100644
--- a/engines/tony/window.cpp
+++ b/engines/tony/window.cpp
@@ -252,7 +252,7 @@ void RMWindow::Init(/*HINSTANCE hInst*/) {
 	
 	//hWaitFlip = CreateEvent(NULL,false,false, NULL);
 #endif
-};
+}
 
 void RMWindow::Close(void) {
 	DDClose();