[Scummvm-git-logs] scummvm master -> f702537820622baf6bf0252636cc8f792bc9a0aa

digitall d.g.turner at ntlworld.com
Thu Sep 26 21:05:06 CEST 2019


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:
f702537820 HDB: Fix Shadowed Variable Compiler Warning


Commit: f702537820622baf6bf0252636cc8f792bc9a0aa
    https://github.com/scummvm/scummvm/commit/f702537820622baf6bf0252636cc8f792bc9a0aa
Author: jepael (jepael at users.noreply.github.com)
Date: 2019-09-26T20:01:24+01:00

Commit Message:
HDB: Fix Shadowed Variable Compiler Warning

Changed paths:
    engines/hdb/ai-funcs.cpp
    engines/hdb/ai.h


diff --git a/engines/hdb/ai-funcs.cpp b/engines/hdb/ai-funcs.cpp
index 414e7c4..e295595 100644
--- a/engines/hdb/ai-funcs.cpp
+++ b/engines/hdb/ai-funcs.cpp
@@ -88,7 +88,7 @@ AIEntity *AI::spawn(AIType type, AIDir dir, int x, int y, const char *funcInit,
 	return e;
 }
 
-bool AI::cacheEntGfx(AIEntity *e, bool init) {
+bool AI::cacheEntGfx(AIEntity *e, bool initFlag) {
 	int i = 0;
 	while (true) {
 		if (aiEntList[i].type == END_AI_TYPES)
@@ -425,7 +425,7 @@ bool AI::cacheEntGfx(AIEntity *e, bool init) {
 
 			e->aiInit = aiEntList[i].initFunc;
 			e->aiInit2 = aiEntList[i].initFunc2;
-			if (init) {
+			if (initFlag) {
 				e->aiInit(e);
 				if (e->aiInit2)
 					e->aiInit2(e);
diff --git a/engines/hdb/ai.h b/engines/hdb/ai.h
index a456cde..47d810b 100644
--- a/engines/hdb/ai.h
+++ b/engines/hdb/ai.h
@@ -845,7 +845,7 @@ public:
 
 	// Entity Functions
 	AIEntity *spawn(AIType type, AIDir dir, int x, int y, const char *funcInit, const char *funcAction, const char *funcUse, AIDir dir2, int level, int value1, int value2, int callInit);
-	bool cacheEntGfx(AIEntity *e, bool init);
+	bool cacheEntGfx(AIEntity *e, bool initFlag);
 	void stopEntity(AIEntity *e);
 	AIEntity *locateEntity(const char *luaName);
 	AIEntity *findEntity(int x, int y);





More information about the Scummvm-git-logs mailing list