diff options
author | Matthew Hoops | 2011-06-03 01:14:16 -0400 |
---|---|---|
committer | Matthew Hoops | 2011-06-03 01:14:16 -0400 |
commit | 224c71e483e09931ba386555ff3b436b9defe63d (patch) | |
tree | 8e6178331a7bbd3ee1be318d3fc7a7c7f478468f /engines/sword2/interpreter.cpp | |
parent | d4c92983920cfe3b25a22d91e12c750e591b917e (diff) | |
parent | 547fd1bdcabcba0e741eb31100ba99ff73399d24 (diff) | |
download | scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.gz scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.tar.bz2 scummvm-rg350-224c71e483e09931ba386555ff3b436b9defe63d.zip |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/sword2/interpreter.cpp')
-rw-r--r-- | engines/sword2/interpreter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword2/interpreter.cpp b/engines/sword2/interpreter.cpp index 7f340df171..e7fb979d69 100644 --- a/engines/sword2/interpreter.cpp +++ b/engines/sword2/interpreter.cpp @@ -264,7 +264,7 @@ int Logic::runScript2(byte *scriptData, byte *objectData, byte *offsetPtr) { // int32_TYPE 1 numberOfScripts // int32_TYPE numberOfScripts The offsets for each script - // Initialise some stuff + // Initialize some stuff uint32 ip = 0; // Code pointer int scriptNumber; @@ -374,7 +374,7 @@ int Logic::runScript2(byte *scriptData, byte *objectData, byte *offsetPtr) { // sets variable 913 to 1 (probably to stop him from // turning around every now and then). The script may // then go on to set the variable to different values - // to trigger various behaviours in him, but if you + // to trigger various behaviors in him, but if you // have run out of these cases the script won't ever // set it back to 0 again. // @@ -614,7 +614,7 @@ int Logic::runScript2(byte *scriptData, byte *objectData, byte *offsetPtr) { // The scripts do not always call the mcode command // with as many parameters as it can accept. To keep - // things predictable, initialise the remaining + // things predictable, initialize the remaining // parameters to 0. for (i = STACK_SIZE - 1; i >= value; i--) { |