From 2ef9ced7a9a8a2d95f0b017292cca37f681ef4ea Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sat, 12 Dec 2015 06:44:02 +0100 Subject: DEVTOOLS: Silence compiler warnings in create_access. --- devtools/create_access/amazon_resources.cpp | 2 +- devtools/create_access/amazon_resources.h | 2 +- devtools/create_access/create_access_dat.cpp | 4 ++-- devtools/create_access/martian_resources.cpp | 2 +- devtools/create_access/martian_resources.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'devtools') 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 -- cgit v1.2.3