diff options
| author | Strangerke | 2014-02-09 11:22:21 +0100 |
|---|---|---|
| committer | Strangerke | 2014-02-09 11:22:21 +0100 |
| commit | a1ab4cb062d5b94c2b0c590816b68770d8989248 (patch) | |
| tree | 44075daf77fa279b0549abc31cce40c1fbeb1be5 | |
| parent | 49be3ba7a8c3b9b57ade43dbd34dd8e6357d0f01 (diff) | |
| download | scummvm-rg350-a1ab4cb062d5b94c2b0c590816b68770d8989248.tar.gz scummvm-rg350-a1ab4cb062d5b94c2b0c590816b68770d8989248.tar.bz2 scummvm-rg350-a1ab4cb062d5b94c2b0c590816b68770d8989248.zip | |
CGE: Reduce the scope of some variables
| -rw-r--r-- | engines/cge/cge_main.cpp | 5 | ||||
| -rw-r--r-- | engines/cge/detection.cpp | 3 | ||||
| -rw-r--r-- | engines/cge/vga13h.cpp | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp index 602b36d6ef..b4015334c8 100644 --- a/engines/cge/cge_main.cpp +++ b/engines/cge/cge_main.cpp @@ -125,9 +125,8 @@ char *CGEEngine::mergeExt(char *buf, const char *name, const char *ext) { } int CGEEngine::takeEnum(const char **tab, const char *text) { - const char **e; if (text) { - for (e = tab; *e; e++) { + for (const char **e = tab; *e; e++) { if (scumm_stricmp(text, *e) == 0) { return e - tab; } @@ -1029,7 +1028,6 @@ void CGEEngine::loadSprite(const char *fname, int ref, int scene, int col = 0, i bool east = false; bool port = false; bool tran = false; - int i, lcnt = 0; char tmpStr[kLineMax + 1]; Common::String line; @@ -1041,6 +1039,7 @@ void CGEEngine::loadSprite(const char *fname, int ref, int scene, int col = 0, i error("Bad SPR [%s]", tmpStr); uint16 len; + int i, lcnt = 0; for (line = sprf.readLine(); !sprf.eos(); line = sprf.readLine()) { len = line.size(); lcnt++; diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp index c377970c51..0c7c2e2d64 100644 --- a/engines/cge/detection.cpp +++ b/engines/cge/detection.cpp @@ -208,10 +208,9 @@ SaveStateList CGEMetaEngine::listSaves(const char *target) const { sort(filenames.begin(), filenames.end()); // Sort (hopefully ensuring we are sorted numerically..) SaveStateList saveList; - int slotNum = 0; for (Common::StringArray::const_iterator filename = filenames.begin(); filename != filenames.end(); ++filename) { // Obtain the last 3 digits of the filename, since they correspond to the save slot - slotNum = atoi(filename->c_str() + filename->size() - 3); + int slotNum = atoi(filename->c_str() + filename->size() - 3); if (slotNum >= 0 && slotNum <= 99) { diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp index 4954e638ab..2022b803a5 100644 --- a/engines/cge/vga13h.cpp +++ b/engines/cge/vga13h.cpp @@ -210,10 +210,10 @@ Sprite *Sprite::expand() { error("Bad SPR [%s]", fname); Common::String line; char tmpStr[kLineMax + 1]; - int len = 0, lcnt = 0; + int lcnt = 0; for (line = sprf.readLine(); !sprf.eos(); line = sprf.readLine()) { - len = line.size(); + int len = line.size(); Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr)); lcnt++; if (len == 0 || *tmpStr == '.') |