[Scummvm-cvs-logs] SF.net SVN: scummvm:[34191] scummvm/trunk/engines/tinsel

[fingolfin at users.sourceforge.net]

Revision: 34191
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34191&view=rev
Author:   fingolfin
Date:     2008-08-27 17:41:05 +0000 (Wed, 27 Aug 2008)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/dw.h
    scummvm/trunk/engines/tinsel/inventory.cpp

Modified: scummvm/trunk/engines/tinsel/dw.h
===================================================================
--- scummvm/trunk/engines/tinsel/dw.h	2008-08-27 10:00:32 UTC (rev 34190)
+++ scummvm/trunk/engines/tinsel/dw.h	2008-08-27 17:41:05 UTC (rev 34191)
@@ -110,8 +110,11 @@
 
 // Language for the resource strings
 enum LANGUAGE {
-	TXT_ENGLISH, TXT_FRENCH, TXT_GERMAN,
-		TXT_ITALIAN, TXT_SPANISH
+	TXT_ENGLISH,
+	TXT_FRENCH,
+	TXT_GERMAN,
+	TXT_ITALIAN,
+	TXT_SPANISH
 };
 
 } // end of namespace Tinsel

Modified: scummvm/trunk/engines/tinsel/inventory.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/inventory.cpp	2008-08-27 10:00:32 UTC (rev 34190)
+++ scummvm/trunk/engines/tinsel/inventory.cpp	2008-08-27 17:41:05 UTC (rev 34191)
@@ -769,25 +769,23 @@
 #ifdef USE_3FLAGS
 	// VERY quick dodgy bodge
 	if (cd.selBox == 0)
-		nLang = TXT_FRENCH;
+		nLang = TXT_FRENCH;		// = 1
 	else if (cd.selBox == 1)
-		nLang = TXT_GERMAN;
+		nLang = TXT_GERMAN;		// = 2
 	else
-		nLang = TXT_SPANISH;
-	if (nLang != language) {
+		nLang = TXT_SPANISH;	// = 4
 #elif defined(USE_4FLAGS)
 	nLang = (LANGUAGE)(cd.selBox + 1);
-	if (nLang != language) {
 #else
-	if (cd.selBox != language) {
-		nLang = (LANGUAGE)cd.selBox;
+	nLang = (LANGUAGE)cd.selBox;
 #endif
+
+	if (nLang != language) {
 		KillInventory();
 		ChangeLanguage(nLang);
 		language = nLang;
 		return true;
-	}
-	else
+	} else
 		return false;
 }
 #endif


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