[Gemrb-commits] gemrb: branch master updated. v0.6.2-1107-gf7eff95

[Alyssa M. <fu...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  f7eff95634ed9603e4ea9f8fa9dc905b96a53119 (commit)

Summary of changes:
 gemrb/plugins/GUIScript/GUIScript.cpp |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
      from  22721562a58de0c57a78fc267934445dee6aa573 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=f7eff95634ed9603e4ea9f8fa9dc905b96a53119

commit f7eff95634ed9603e4ea9f8fa9dc905b96a53119
Author: Alyssa Milburn <fu...@fu...>
Date:   Sun Apr 24 11:10:53 2011 +0200

    fix missing equipment usage icons (thanks to dhewg)

diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp
index ce06d93..b14839e 100644
--- a/gemrb/plugins/GUIScript/GUIScript.cpp
+++ b/gemrb/plugins/GUIScript/GUIScript.cpp
@@ -8221,6 +8221,10 @@ static PyObject* GemRB_Window_SetupEquipmentIcons(PyObject * /*self*/, PyObject*
 
 		if (item->UseIcon[0]) {
 			Picture = gamedata->GetBAMSprite(item->UseIcon, 1, 0);
+			// try cycle 0 if cycle 1 doesn't exist
+			// (needed for e.g. sppr707b which is used by Daystar's Sunray)
+			if (!Picture)
+				Picture = gamedata->GetBAMSprite(item->UseIcon, 0, 0);
 		}
 
 		if (!Picture) {

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator