[Scummvm-cvs-logs] scummvm master -> 7efe29249bfa360d908c7b401e4ad061e8047c8f

[Strangerke]

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:
7efe29249b VOYEUR: Match the original and test _iForcedDeath after doHeadTitle()


Commit: 7efe29249bfa360d908c7b401e4ad061e8047c8f
    https://github.com/scummvm/scummvm/commit/7efe29249bfa360d908c7b401e4ad061e8047c8f
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-28T15:04:43-08:00

Commit Message:
VOYEUR: Match the original and test _iForcedDeath after doHeadTitle()

Changed paths:
    engines/voyeur/voyeur.cpp



diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index bc93acd..0ce1084 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -89,12 +89,13 @@ Common::Error VoyeurEngine::run() {
 	ESP_Init();
 	globalInitBolt();
 
-	// The original allows the victim to be explicitly specified via the command line.
-	// This is possible in ScummVM by using a boot parameter.
-	if (_iForceDeath >= 1 && _iForceDeath <= 4)
-		_voy->_eventFlags |= EVTFLAG_VICTIM_PRESET;
-
 	if (doHeadTitle()) {
+		// The original allows the victim to be explicitly specified via the command line.
+		// This is possible in ScummVM by using a boot parameter.
+		if (_iForceDeath >= 1 && _iForceDeath <= 4)
+			_voy->_eventFlags |= EVTFLAG_VICTIM_PRESET;
+
+
 		playStamp();
 		if (!shouldQuit())
 			doTailTitle();