diff options
| author | James Brown | 2002-02-24 17:25:03 +0000 |
|---|---|---|
| committer | James Brown | 2002-02-24 17:25:03 +0000 |
| commit | abbc4bf289892ce20a7de1560c171a5822c897e1 (patch) | |
| tree | c0962bbbbc2279ec71528b8a94afe412e1f1e8bd /script.cpp | |
| parent | c8522359f5bd376433bf58ead734de43534a109c (diff) | |
| download | scummvm-rg350-abbc4bf289892ce20a7de1560c171a5822c897e1.tar.gz scummvm-rg350-abbc4bf289892ce20a7de1560c171a5822c897e1.tar.bz2 scummvm-rg350-abbc4bf289892ce20a7de1560c171a5822c897e1.zip | |
Code cleanup - get rid of a bunch of typecast and unused variable warnings.
svn-id: r3627
Diffstat (limited to 'script.cpp')
| -rw-r--r-- | script.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/script.cpp b/script.cpp index a689fa5f6d..e2a1bb5a25 100644 --- a/script.cpp +++ b/script.cpp @@ -330,8 +330,6 @@ int Scumm::readVar(uint var) { } void Scumm::writeVar(uint var, int value) { - int a; - if (!(var&0xF000)) { checkRange(_numVariables-1, 0, var, "Variable %d out of range(w)"); _vars[var] = value; @@ -510,7 +508,7 @@ void Scumm::runAllScripts() { for(_curExecScript = 0; _curExecScript<NUM_SCRIPT_SLOT; _curExecScript++) { if (vm.slot[_curExecScript].status == 2 && vm.slot[_curExecScript].didexec == 0) { - _currentScript = _curExecScript; + _currentScript = (char)_curExecScript; getScriptBaseAddress(); getScriptEntryPoint(); executeScript(); @@ -832,8 +830,7 @@ void Scumm::animateActor(int act, int anim) { #else - int shr,dir; - bool inRoom; + int dir; Actor *a; a = derefActorSafe(act, "animateActor"); @@ -926,7 +923,7 @@ int Scumm::defineArray(int array, int type, int dim2, int dim1) { id = getArrayId(); if (array&0x4000) { - _arrays[id] = vm.slot[_currentScript].number; + _arrays[id] = (char)vm.slot[_currentScript].number; } if (array&0x8000) { |