diff options
| author | Filippos Karapetis | 2012-06-26 11:12:37 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2012-06-26 11:13:14 +0300 |
| commit | 7e66cbd468a5b89eaf170d5e0fb3bb312365628c (patch) | |
| tree | f90184295e782faf20b88f794aa44efcd28cbf2f | |
| parent | f8b8bd8c9b4c64d4a898b3742cebb959bca5d4fc (diff) | |
| download | scummvm-rg350-7e66cbd468a5b89eaf170d5e0fb3bb312365628c.tar.gz scummvm-rg350-7e66cbd468a5b89eaf170d5e0fb3bb312365628c.tar.bz2 scummvm-rg350-7e66cbd468a5b89eaf170d5e0fb3bb312365628c.zip | |
SCI: Rename a parameter in validateExportFunc()
This ensures that it won't be confused with a function with the same name
| -rw-r--r-- | engines/sci/engine/script.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/engine/script.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index 57334b89aa..d4143dcceb 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -385,7 +385,7 @@ void Script::setLockers(int lockers) { _lockers = lockers; } -uint32 Script::validateExportFunc(int pubfunct, bool relocateSci3) { +uint32 Script::validateExportFunc(int pubfunct, bool relocSci3) { bool exportsAreWide = (g_sci->_features->detectLofsType() == SCI_VERSION_1_MIDDLE); if (_numExports <= pubfunct) { @@ -401,7 +401,7 @@ uint32 Script::validateExportFunc(int pubfunct, bool relocateSci3) { if (getSciVersion() != SCI_VERSION_3) { offset = READ_SCI11ENDIAN_UINT16(_exportTable + pubfunct); } else { - if (!relocateSci3) + if (!relocSci3) offset = READ_SCI11ENDIAN_UINT16(_exportTable + pubfunct) + getCodeBlockOffsetSci3(); else offset = relocateOffsetSci3(pubfunct * 2 + 22); diff --git a/engines/sci/engine/script.h b/engines/sci/engine/script.h index 1fc8caf313..0b499203c2 100644 --- a/engines/sci/engine/script.h +++ b/engines/sci/engine/script.h @@ -197,11 +197,11 @@ public: * Validate whether the specified public function is exported by * the script in the specified segment. * @param pubfunct Index of the function to validate - * @param relocateSci3 Decide whether to relocate this SCI3 public function or not + * @param relocSci3 Decide whether to relocate this SCI3 public function or not * @return NULL if the public function is invalid, its * offset into the script's segment otherwise */ - uint32 validateExportFunc(int pubfunct, bool relocateSci3); + uint32 validateExportFunc(int pubfunct, bool relocSci3); /** * Marks the script as deleted. |