[Scummvm-git-logs] scummvm master -> ef00f1d05366e1e7e18a339927081e333168879c

digitall dgturner at iee.org
Sat Aug 17 23:32:43 CEST 2019


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:
ef00f1d053 STARTREK: Fix introduced bug in mission chain loading code


Commit: ef00f1d05366e1e7e18a339927081e333168879c
    https://github.com/scummvm/scummvm/commit/ef00f1d05366e1e7e18a339927081e333168879c
Author: D G Turner (digitall at scummvm.org)
Date: 2019-08-17T22:29:15+01:00

Commit Message:
STARTREK: Fix introduced bug in mission chain loading code

This needs to avoid loading when the mission is "VENG" i.e. the last
mission, since there is no next mission to load and this would have
loaded an invalid memory string.

Changed paths:
    engines/startrek/room.cpp


diff --git a/engines/startrek/room.cpp b/engines/startrek/room.cpp
index 5cc913a..c0ce89e 100644
--- a/engines/startrek/room.cpp
+++ b/engines/startrek/room.cpp
@@ -557,7 +557,7 @@ void Room::endMission(int16 score, int16 arg1, int16 arg2) {
 		"VENG"
 	};
 
-	for (int i = 0; i < ARRAYSIZE(missionNames); i++) {
+	for (int i = 0; i < ARRAYSIZE(missionNames)-1; i++) {
 		if (_vm->_missionName == missionNames[i]) {
 			_vm->_missionToLoad = missionNames[i + 1];
 			break;





More information about the Scummvm-git-logs mailing list