[Scummvm-cvs-logs] SF.net SVN: scummvm:[46054] scummvm/trunk/engines/kyra/sequences_hof.cpp

[lordhoto at users.sourceforge.net]

Revision: 46054
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46054&view=rev
Author:   lordhoto
Date:     2009-11-21 23:23:07 +0000 (Sat, 21 Nov 2009)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sequences_hof.cpp

Modified: scummvm/trunk/engines/kyra/sequences_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_hof.cpp	2009-11-21 23:06:22 UTC (rev 46053)
+++ scummvm/trunk/engines/kyra/sequences_hof.cpp	2009-11-21 23:23:07 UTC (rev 46054)
@@ -2794,21 +2794,15 @@
 			addShapeToPool(_screen->getPtrToShape(_animShapeFiledata, numShp), numShp);
 		} while (getShapePtr(numShp));
 	} else {
-		MainMenu::StaticData dataEN = {
+		const MainMenu::StaticData data = {
 			{ _sequenceStrings[97], _sequenceStrings[96], _sequenceStrings[95], _sequenceStrings[98], 0 },
 			{ 0x01, 0x04, 0x0C, 0x04, 0x00, 0xd7, 0xd6 },
 			{ 0xd8, 0xda, 0xd9, 0xd8 },
-			Screen::FID_8_FNT, 240
+			(_flags.lang == Common::JA_JPN) ? Screen::FID_SJIS_FNT : Screen::FID_8_FNT, 240
 		};
 		
-		MainMenu::StaticData dataJPN = {
-			{ _sequenceStrings[97], _sequenceStrings[96], _sequenceStrings[95], _sequenceStrings[98], 0 },
-			{ 0x01, 0x04, 0x0C, 0x04, 0x00, 0xd7, 0xd6 },
-			{ 0xd8, 0xda, 0xd9, 0xd8 },
-			Screen::FID_SJIS_FNT, 240
-		};
 		_menu = new MainMenu(this);
-		_menu->init(_flags.lang == Common::JA_JPN ? dataJPN : dataEN, MainMenu::Animation());
+		_menu->init(data, MainMenu::Animation());
 	}
 }
 


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