aboutsummaryrefslogtreecommitdiff
path: root/devtools
diff options
context:
space:
mode:
authorJohannes Schickel2015-12-12 06:44:02 +0100
committerJohannes Schickel2015-12-12 06:54:58 +0100
commit2ef9ced7a9a8a2d95f0b017292cca37f681ef4ea (patch)
tree0dca4ea8562028d167f8dc53f9985fe682de161a /devtools
parentc09a9aa1bf2e84186d5bd7256670a7b361d95f0f (diff)
downloadscummvm-rg350-2ef9ced7a9a8a2d95f0b017292cca37f681ef4ea.tar.gz
scummvm-rg350-2ef9ced7a9a8a2d95f0b017292cca37f681ef4ea.tar.bz2
scummvm-rg350-2ef9ced7a9a8a2d95f0b017292cca37f681ef4ea.zip
DEVTOOLS: Silence compiler warnings in create_access.
Diffstat (limited to 'devtools')
-rw-r--r--devtools/create_access/amazon_resources.cpp2
-rw-r--r--devtools/create_access/amazon_resources.h2
-rw-r--r--devtools/create_access/create_access_dat.cpp4
-rw-r--r--devtools/create_access/martian_resources.cpp2
-rw-r--r--devtools/create_access/martian_resources.h2
5 files changed, 6 insertions, 6 deletions
diff --git a/devtools/create_access/amazon_resources.cpp b/devtools/create_access/amazon_resources.cpp
index 50b8f334fb..8156894b0d 100644
--- a/devtools/create_access/amazon_resources.cpp
+++ b/devtools/create_access/amazon_resources.cpp
@@ -754,4 +754,4 @@ const char *const IQLABELS_ENG[9] = {
const char *const CANT_GET_THERE_ENG = "YOU CAN'T GET THERE FROM HERE.";
-};
+} // End of namespace Amazon
diff --git a/devtools/create_access/amazon_resources.h b/devtools/create_access/amazon_resources.h
index fa281f8f7b..aae27ce3ba 100644
--- a/devtools/create_access/amazon_resources.h
+++ b/devtools/create_access/amazon_resources.h
@@ -57,6 +57,6 @@ extern const char *const HELPLVLTXT_ENG[3];
extern const char *const IQLABELS_ENG[9];
extern const char *const CANT_GET_THERE_ENG;
-};
+} // End of namespace Amazon
#endif
diff --git a/devtools/create_access/create_access_dat.cpp b/devtools/create_access/create_access_dat.cpp
index 0e57f76395..af9ab026c0 100644
--- a/devtools/create_access/create_access_dat.cpp
+++ b/devtools/create_access/create_access_dat.cpp
@@ -160,7 +160,7 @@ void writeMartianCommonData() {
}
}
-bool processExecutable(int idx, const char *name) {
+bool processExecutable(int exeIdx, const char *name) {
uint dataSegmentOffset;
uint filenamesOffset, numFilenames;
uint charsStart, charsEnd;
@@ -291,7 +291,7 @@ bool processExecutable(int idx, const char *name) {
// Write out header entry
uint outputOffset = outputFile.size();
- outputFile.seek(8 + idx * 8);
+ outputFile.seek(8 + exeIdx * 8);
outputFile.writeByte(gameId);
outputFile.writeByte(discType);
outputFile.writeByte(demoType);
diff --git a/devtools/create_access/martian_resources.cpp b/devtools/create_access/martian_resources.cpp
index 2a726a78ea..f631ce7e31 100644
--- a/devtools/create_access/martian_resources.cpp
+++ b/devtools/create_access/martian_resources.cpp
@@ -179,4 +179,4 @@ const char *const INVENTORY_NAMES_ENG[55] = {
"MONKEY WRENCH", "BIG DICK CARD", "BRA", "BOLT", nullptr
};
-};
+} // End of namespace Amazon
diff --git a/devtools/create_access/martian_resources.h b/devtools/create_access/martian_resources.h
index c3dfc2a7c2..f80f4c1cf4 100644
--- a/devtools/create_access/martian_resources.h
+++ b/devtools/create_access/martian_resources.h
@@ -47,6 +47,6 @@ extern const char *const HELPLVLTXT_ENG[3];
extern const char *const IQLABELS_ENG[9];
extern const char *const CANT_GET_THERE_ENG;
-};
+} // End of namespace Amazon
#endif