[Scummvm-git-logs] scummvm master -> 93a89024e9306a1a3ee181ac66201f38bdfc077e

dreammaster dreammaster at scummvm.org
Sun Dec 17 03:51:55 CET 2017


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:
93a89024e9 XEEN: Fix crash when combat lasts multiple turns


Commit: 93a89024e9306a1a3ee181ac66201f38bdfc077e
    https://github.com/scummvm/scummvm/commit/93a89024e9306a1a3ee181ac66201f38bdfc077e
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-12-16T21:51:46-05:00

Commit Message:
XEEN: Fix crash when combat lasts multiple turns

Changed paths:
    engines/xeen/interface.cpp


diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp
index 5bbc6ab..3147d0a 100644
--- a/engines/xeen/interface.cpp
+++ b/engines/xeen/interface.cpp
@@ -1693,8 +1693,8 @@ void Interface::doCombat() {
 
 			// Handling for if the combat turn is complete
 			if (combat.allHaveGone()) {
-				Common::fill(&combat._charsGone[0], &combat._charsGone[combat._charsGone.size()], false);
-				Common::fill(&combat._charsBlocked[0], &combat._charsBlocked[combat._charsBlocked.size()], false);
+				Common::fill(&combat._charsGone[0], &combat._charsGone[0] + combat._charsGone.size(), false);
+				Common::fill(&combat._charsBlocked[0], &combat._charsBlocked[0] + combat._charsBlocked.size(), false);
 				combat.setSpeedTable();
 				combat._whosTurn = -1;
 				combat._whosSpeed = -1;





More information about the Scummvm-git-logs mailing list