[Scummvm-cvs-logs] scummvm master -> f5c0e1679245d59b62d4819004f81039838ba78b

Strangerke Strangerke at scummvm.org
Tue Nov 24 23:33:53 CET 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f5c0e16792 MADS: Phantom - change the type of timeout to uint32 in handlePrisonerSpeech()


Commit: f5c0e1679245d59b62d4819004f81039838ba78b
    https://github.com/scummvm/scummvm/commit/f5c0e1679245d59b62d4819004f81039838ba78b
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-11-24T23:28:02+01:00

Commit Message:
MADS: Phantom - change the type of timeout to uint32 in handlePrisonerSpeech()

Changed paths:
    engines/mads/nebular/nebular_scenes3.cpp
    engines/mads/nebular/nebular_scenes3.h



diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 0bf90c2..0fb13a7 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -551,7 +551,7 @@ void Scene307::handlePrisonerEncounter() {
 	}
 }
 
-void Scene307::handlePrisonerSpeech(int firstQuoteId, int number, long timeout) {
+void Scene307::handlePrisonerSpeech(int firstQuoteId, int number, uint32 timeout) {
 	int height = number * 14;
 	int posY;
 
diff --git a/engines/mads/nebular/nebular_scenes3.h b/engines/mads/nebular/nebular_scenes3.h
index cf925b3..af75b14 100644
--- a/engines/mads/nebular/nebular_scenes3.h
+++ b/engines/mads/nebular/nebular_scenes3.h
@@ -158,7 +158,7 @@ private:
 	void handlePrisonerDialog();
 	void handlePrisonerEncounter();
 	void setDialogNode(int node);
-	void handlePrisonerSpeech(int firstQuoteId, int number, long timeout);
+	void handlePrisonerSpeech(int firstQuoteId, int number, uint32 timeout);
 
 public:
 	Scene307(MADSEngine *vm);






More information about the Scummvm-git-logs mailing list