[Scummvm-git-logs] scummvm master -> 901118c5cd5b3fe2f0a80d1785e51a0f035663ab

[antoniou79]

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:
901118c5cd BLADERUNNER: Remove redundant assignment for ammo


Commit: 901118c5cd5b3fe2f0a80d1785e51a0f035663ab
    https://github.com/scummvm/scummvm/commit/901118c5cd5b3fe2f0a80d1785e51a0f035663ab
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-10-24T13:41:07+03:00

Commit Message:
BLADERUNNER: Remove redundant assignment for ammo

Changed paths:
    engines/bladerunner/settings.cpp


diff --git a/engines/bladerunner/settings.cpp b/engines/bladerunner/settings.cpp
index b0c6092..722929f 100644
--- a/engines/bladerunner/settings.cpp
+++ b/engines/bladerunner/settings.cpp
@@ -65,12 +65,14 @@ Settings::Settings(BladeRunnerEngine *vm) {
 	_fullHDFrames = true;
 	_mst3k = false;
 
-	// TODO: A bug? why is this set again here, overriding the initialization above?
+#if BLADERUNNER_ORIGINAL_BUGS
+	// Probably a bug. Assigning these here again, overrides the initialization above.
 	//       Also note: the reset() method assigns "_ammoAmounts[0] = 1" like above!
 	_ammoType = 0;
 	_ammoAmounts[0] = 0;
 	_ammoAmounts[1] = 0;
 	_ammoAmounts[2] = 0;
+#endif // BLADERUNNER_ORIGINAL_BUGS
 
 	_learyMode = false;
 }