[Scummvm-cvs-logs] scummvm master -> 70ffcf91f5538765847f373ce2acbc611aec77c5

sev- sev at scummvm.org
Mon May 23 19:11:40 CEST 2016


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:
70ffcf91f5 SCUMM HE: Fixes for Amiga port


Commit: 70ffcf91f5538765847f373ce2acbc611aec77c5
    https://github.com/scummvm/scummvm/commit/70ffcf91f5538765847f373ce2acbc611aec77c5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-23T18:30:54+02:00

Commit Message:
SCUMM HE: Fixes for Amiga port

Changed paths:
    engines/scumm/he/moonbase/ai_main.cpp
    engines/scumm/he/moonbase/ai_main.h



diff --git a/engines/scumm/he/moonbase/ai_main.cpp b/engines/scumm/he/moonbase/ai_main.cpp
index 6844d2f..934c74e 100644
--- a/engines/scumm/he/moonbase/ai_main.cpp
+++ b/engines/scumm/he/moonbase/ai_main.cpp
@@ -211,7 +211,7 @@ void cleanUpAI() {
 	}
 }
 
-void setAIType(const int paramCount, const int *params) {
+void setAIType(const int paramCount, const int32 *params) {
 	if (AItype[params[AI_TYPE_PLAYER_NUM]]) {
 		delete AItype[params[AI_TYPE_PLAYER_NUM]];
 		AItype[params[AI_TYPE_PLAYER_NUM]] = NULL;
@@ -228,7 +228,7 @@ void setAIType(const int paramCount, const int *params) {
 	warning("AI for player %d is %s", params[AI_TYPE_PLAYER_NUM], AItype[params[AI_TYPE_PLAYER_NUM]]->getNameString());
 }
 
-int masterControlProgram(const int paramCount, const int *params) {
+int masterControlProgram(const int paramCount, const int32 *params) {
 	static Tree *myTree;
 
 	static int index;
diff --git a/engines/scumm/he/moonbase/ai_main.h b/engines/scumm/he/moonbase/ai_main.h
index 7b5ad3c..8952cb5 100644
--- a/engines/scumm/he/moonbase/ai_main.h
+++ b/engines/scumm/he/moonbase/ai_main.h
@@ -88,8 +88,8 @@ static int energyHogType = 0;
 
 void resetAI(ScummEngine_v90he *vm);
 void cleanUpAI();
-void setAIType(const int paramCount, const int *params);
-int masterControlProgram(const int paramCount, const int *params);
+void setAIType(const int paramCount, const int32 *params);
+int masterControlProgram(const int paramCount, const int32 *params);
 
 int chooseBehavior();
 int chooseTarget(int behavior);






More information about the Scummvm-git-logs mailing list