[Scummvm-cvs-logs] scummvm master -> 261d15d007d83e3087699068e3f46a8f250dd757

digitall dgturner at iee.org
Sun Sep 7 10:28:51 CEST 2014


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:
261d15d007 KYRA (LOL): Fix bug #6727 due to incorrect assertion range.


Commit: 261d15d007d83e3087699068e3f46a8f250dd757
    https://github.com/scummvm/scummvm/commit/261d15d007d83e3087699068e3f46a8f250dd757
Author: D G Turner (digitall at scummvm.org)
Date: 2014-09-07T09:32:12+01:00

Commit Message:
KYRA (LOL): Fix bug #6727 due to incorrect assertion range.

This was the bug with "Engine assertion at various dialogues if no items
in inventory".

Changed paths:
    engines/kyra/items_lol.cpp



diff --git a/engines/kyra/items_lol.cpp b/engines/kyra/items_lol.cpp
index f2a9637..e1f864d 100644
--- a/engines/kyra/items_lol.cpp
+++ b/engines/kyra/items_lol.cpp
@@ -265,7 +265,7 @@ bool LoLEngine::addItemToInventory(Item itemIndex) {
 		gui_drawInventory();
 	}
 
-	assert(pos > 0 && pos < 48);
+	assert(pos >= 0 && pos < 48);
 	_inventory[pos] = itemIndex;
 	gui_drawInventory();
 






More information about the Scummvm-git-logs mailing list