diff options
| author | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
| commit | aa49b38c5a8032586cb94fc4ca07149eecabe64a (patch) | |
| tree | ea5c7617f8c482c8cf4141b728b3ccff5a7f84c7 /engines/lure/scripts.cpp | |
| parent | d3ea9ab2a9334747eb445c1b45aa30cb17ffdf1b (diff) | |
| parent | c86a6c466fabe31fbf36363aa8d0ac8ea6001b9f (diff) | |
| download | scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.gz scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.bz2 scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
engines/groovie/script.cpp
Diffstat (limited to 'engines/lure/scripts.cpp')
| -rw-r--r-- | engines/lure/scripts.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/engines/lure/scripts.cpp b/engines/lure/scripts.cpp index 20cbd328ce..22656dd3fe 100644 --- a/engines/lure/scripts.cpp +++ b/engines/lure/scripts.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "lure/animseq.h" @@ -34,7 +31,6 @@ #include "lure/sound.h" #include "common/stack.h" #include "common/endian.h" -#include "common/EventRecorder.h" namespace Lure { @@ -1131,7 +1127,7 @@ uint16 Script::execute(uint16 startOffset) { break; case S_OPCODE_RANDOM: - param = r.random() >> 8; // make number between 0 to 255 + param = r.getRandom() >> 8; // make number between 0 to 255 break; case S_OPCODE_END: |