[Scummvm-cvs-logs] SF.net SVN: scummvm:[52883] scummvm/branches/branch-1-2-0

[anotherguest at users.sourceforge.net]

Revision: 52883
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52883&view=rev
Author:   anotherguest
Date:     2010-09-25 15:00:45 +0000 (Sat, 25 Sep 2010)

Log Message:
-----------
SYMBIAN : Fixed working translation for Symbian (and for Platforms using built in classic theme)

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/backends/platform/symbian/src/ScummApp.cpp
    scummvm/branches/branch-1-2-0/backends/platform/symbian/src/SymbianOS.cpp
    scummvm/branches/branch-1-2-0/backends/platform/symbian/src/SymbianOS.h
    scummvm/branches/branch-1-2-0/base/main.cpp

Modified: scummvm/branches/branch-1-2-0/backends/platform/symbian/src/ScummApp.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/backends/platform/symbian/src/ScummApp.cpp	2010-09-25 14:59:24 UTC (rev 52882)
+++ scummvm/branches/branch-1-2-0/backends/platform/symbian/src/ScummApp.cpp	2010-09-25 15:00:45 UTC (rev 52883)
@@ -27,7 +27,7 @@
 
 #define _PAGESIZE_ 0x1000
 
-#if defined (__WINS__) && !defined (__SERIES60_30__) && !defined (UIQ3)
+#if defined (__WINS__) && !defined (S60V3) && !defined (UIQ3)
 extern "C" int _chkstk(int /*a*/) {
 _asm {
 	push ecx

Modified: scummvm/branches/branch-1-2-0/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/backends/platform/symbian/src/SymbianOS.cpp	2010-09-25 14:59:24 UTC (rev 52882)
+++ scummvm/branches/branch-1-2-0/backends/platform/symbian/src/SymbianOS.cpp	2010-09-25 15:00:45 UTC (rev 52883)
@@ -140,9 +140,6 @@
 }
 
 void OSystem_SDL_Symbian::initBackend() {
-	// First set the extrapath (for installed dat files etc)
-	ConfMan.set("extrapath", Symbian::GetExecutablePath());
-
 	// Calculate the default savepath
 	Common::String savePath;
 	savePath = Symbian::GetExecutablePath();
@@ -183,6 +180,13 @@
 	initZones();
 }
 
+void OSystem_SDL_Symbian::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
+	Common::FSNode pluginsNode(Symbian::GetExecutablePath());
+	if (pluginsNode.exists() && pluginsNode.isDirectory()) {
+			s.add("SYMBIAN_DATAFOLDER", new Common::FSDirectory(Symbian::GetExecutablePath()), priority);
+		}
+}
+
 OSystem_SDL_Symbian::~OSystem_SDL_Symbian() {
 	delete[] _stereo_mix_buffer;
 }

Modified: scummvm/branches/branch-1-2-0/backends/platform/symbian/src/SymbianOS.h
===================================================================
--- scummvm/branches/branch-1-2-0/backends/platform/symbian/src/SymbianOS.h	2010-09-25 14:59:24 UTC (rev 52882)
+++ scummvm/branches/branch-1-2-0/backends/platform/symbian/src/SymbianOS.h	2010-09-25 15:00:45 UTC (rev 52883)
@@ -61,6 +61,8 @@
 
 	// Returns reference to File session
 	RFs& FsSession();
+
+	void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
 protected:
 	//
 	// The mixer callback function.

Modified: scummvm/branches/branch-1-2-0/base/main.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/base/main.cpp	2010-09-25 14:59:24 UTC (rev 52882)
+++ scummvm/branches/branch-1-2-0/base/main.cpp	2010-09-25 15:00:45 UTC (rev 52883)
@@ -321,9 +321,6 @@
 	// Update the config file
 	ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain);
 
-	// Enable translation
-	TransMan.setLanguage(ConfMan.get("gui_language").c_str());
-
 	// Load and setup the debuglevel and the debug flags. We do this at the
 	// soonest possible moment to ensure debug output starts early on, if
 	// requested.
@@ -365,6 +362,9 @@
 
 	setupGraphics(system);
 
+	// Enable translation
+	TransMan.setLanguage(ConfMan.get("gui_language").c_str());
+
 	// Init the event manager. As the virtual keyboard is loaded here, it must
 	// take place after the backend is initiated and the screen has been setup
 	system.getEventManager()->init();


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