diff options
| author | Bastien Bouclet | 2011-04-21 08:05:00 +0200 |
|---|---|---|
| committer | Bastien Bouclet | 2011-04-21 08:05:00 +0200 |
| commit | 44e79c70fa2908e0abdb7c9effa1dd039404a520 (patch) | |
| tree | 8118a29c2e058f3b63b20db889758bfdd37628ce | |
| parent | f236ecb5d310ea66fe02623b671697910ee18e48 (diff) | |
| download | scummvm-rg350-44e79c70fa2908e0abdb7c9effa1dd039404a520.tar.gz scummvm-rg350-44e79c70fa2908e0abdb7c9effa1dd039404a520.tar.bz2 scummvm-rg350-44e79c70fa2908e0abdb7c9effa1dd039404a520.zip | |
MOHAWK: Don't initialize a null pointer, to make VS2010 happy.
| -rw-r--r-- | engines/mohawk/myst_stacks/selenitic.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/engines/mohawk/myst_stacks/selenitic.cpp b/engines/mohawk/myst_stacks/selenitic.cpp index f485bab2f9..a84cd0632d 100644 --- a/engines/mohawk/myst_stacks/selenitic.cpp +++ b/engines/mohawk/myst_stacks/selenitic.cpp @@ -816,7 +816,7 @@ void Selenitic::o_soundLockEndMove(uint16 op, uint16 var, uint16 argc, uint16 *a debugC(kDebugScript, "Opcode %d: Sound lock end move", op); MystResourceType10 *slider = soundLockSliderFromVar(var); - uint16 *value = 0; + uint16 *value = &_state.soundLockSliderPositions[0]; switch (var) { case 20: // Sound lock sliders @@ -834,6 +834,9 @@ void Selenitic::o_soundLockEndMove(uint16 op, uint16 var, uint16 argc, uint16 *a case 24: value = &_state.soundLockSliderPositions[4]; break; + default: + error("Incorrect var value for Selenitic opcode 114"); + break; } uint16 stepped = 12 * (*value / 12) + 6; |