[Scummvm-cvs-logs] scummvm master -> 44e79c70fa2908e0abdb7c9effa1dd039404a520

[bgK]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
44e79c70fa MOHAWK: Don't initialize a null pointer, to make VS2010 happy.


Commit: 44e79c70fa2908e0abdb7c9effa1dd039404a520
    https://github.com/scummvm/scummvm/commit/44e79c70fa2908e0abdb7c9effa1dd039404a520
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2011-04-20T23:05:00-07:00

Commit Message:
MOHAWK: Don't initialize a null pointer, to make VS2010 happy.

Changed paths:
    engines/mohawk/myst_stacks/selenitic.cpp



diff --git a/engines/mohawk/myst_stacks/selenitic.cpp b/engines/mohawk/myst_stacks/selenitic.cpp
index f485bab..a84cd06 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;