diff options
| author | jepael | 2019-09-26 21:41:46 +0300 |
|---|---|---|
| committer | D G Turner | 2019-09-26 20:01:24 +0100 |
| commit | f702537820622baf6bf0252636cc8f792bc9a0aa (patch) | |
| tree | 7622307a98b8029d34022eef5772a880c8c8f7a0 | |
| parent | 19a2195ba2cde329ccb9b9cd303c163b6ad4fe9c (diff) | |
| download | scummvm-rg350-f702537820622baf6bf0252636cc8f792bc9a0aa.tar.gz scummvm-rg350-f702537820622baf6bf0252636cc8f792bc9a0aa.tar.bz2 scummvm-rg350-f702537820622baf6bf0252636cc8f792bc9a0aa.zip | |
HDB: Fix Shadowed Variable Compiler Warning
| -rw-r--r-- | engines/hdb/ai-funcs.cpp | 4 | ||||
| -rw-r--r-- | engines/hdb/ai.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/hdb/ai-funcs.cpp b/engines/hdb/ai-funcs.cpp index 414e7c48c2..e2955959da 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 a456cde782..47d810bf03 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); |