Skip to content

Commit

Permalink
SCI: Rename a parameter in validateExportFunc()
Browse files Browse the repository at this point in the history
This ensures that it won't be confused with a function with the same name
  • Loading branch information
bluegr committed Jun 26, 2012
1 parent f8b8bd8 commit 7e66cbd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions engines/sci/engine/script.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions engines/sci/engine/script.h
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,11 @@ class Script : public SegmentObj {
* 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.
Expand Down

0 comments on commit 7e66cbd

Please sign in to comment.