[Scummvm-cvs-logs] SF.net SVN: scummvm: [24287] scummvm/trunk/engines/agos/agos.cpp

[kirben at users.sourceforge.net]

Revision: 24287
          http://svn.sourceforge.net/scummvm/?rev=24287&view=rev
Author:   kirben
Date:     2006-10-12 22:00:19 -0700 (Thu, 12 Oct 2006)

Log Message:
-----------
Fix regressions when drawing icons in FF

Modified Paths:
--------------
    scummvm/trunk/engines/agos/agos.cpp

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2006-10-13 04:57:07 UTC (rev 24286)
+++ scummvm/trunk/engines/agos/agos.cpp	2006-10-13 05:00:19 UTC (rev 24287)
@@ -2296,11 +2296,10 @@
 	addTimeEvent(0, 1);
 	openGameFile();
 
-	if (getFileName(GAME_ICONFILE) != NULL) {
-		if (getGameType() == GType_FF)
-			loadIconData();
-		else
-			loadIconFile();
+	if (getGameType() == GType_FF) {
+		loadIconData();
+	} else if (getFileName(GAME_ICONFILE) != NULL) {
+		loadIconFile();
 	}
 
 	vc34_setMouseOff();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.