[Scummvm-cvs-logs] SF.net SVN: scummvm: [27364] scummvm/trunk/backends/platform/symbian

anotherguest at users.sourceforge.net anotherguest at users.sourceforge.net
Mon Jun 11 21:30:24 CEST 2007


Revision: 27364
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27364&view=rev
Author:   anotherguest
Date:     2007-06-11 12:30:24 -0700 (Mon, 11 Jun 2007)

Log Message:
-----------
Include Kyra.dat and sky.cpt in the sis file. queen.tbl not included due to the size.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg
    scummvm/trunk/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v2.pkg
    scummvm/trunk/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
    scummvm/trunk/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg
    scummvm/trunk/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg
    scummvm/trunk/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg
    scummvm/trunk/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg
    scummvm/trunk/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
    scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp

Modified: scummvm/trunk/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg	2007-06-11 19:29:53 UTC (rev 27363)
+++ scummvm/trunk/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg	2007-06-11 19:30:24 UTC (rev 27364)
@@ -49,6 +49,10 @@
 "..\..\..\..\README"-"!:\system\apps\scummvm\README"
 "..\..\..\..\NEWS"-"!:\system\apps\scummvm\NEWS"
 
+; Common datafiles needed for some games
+"..\kyra.dat"-"!:\system\apps\scummvm\kyra.dat"
+"..\sky.cpt"-"!:\system\apps\scummvm\sky.cpt"
+
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"!:\system\apps\ScummVM\scummvm.ini",FILENULL
 ""-"!:\system\apps\ScummVM\scummvm.stdout.txt",FILENULL

Modified: scummvm/trunk/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v2.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v2.pkg	2007-06-11 19:29:53 UTC (rev 27363)
+++ scummvm/trunk/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v2.pkg	2007-06-11 19:30:24 UTC (rev 27364)
@@ -26,6 +26,10 @@
 "..\..\..\..\README"-"!:\system\apps\scummvm\README"
 "..\..\..\..\NEWS"-"!:\system\apps\scummvm\NEWS"
 
+; Common datafiles needed for some games
+"..\kyra.dat"-"!:\system\apps\scummvm\kyra.dat"
+"..\sky.cpt"-"!:\system\apps\scummvm\sky.cpt"
+
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"!:\system\apps\ScummVM\scummvm.ini",FILENULL
 ""-"!:\system\apps\ScummVM\scummvm.stdout.txt",FILENULL

Modified: scummvm/trunk/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg	2007-06-11 19:29:53 UTC (rev 27363)
+++ scummvm/trunk/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg	2007-06-11 19:30:24 UTC (rev 27364)
@@ -58,6 +58,10 @@
 "..\..\..\..\README"-"!:\resource\apps\scummvm\README"
 "..\..\..\..\NEWS"-"!:\resource\apps\scummvm\NEWS"
 
+; Common datafiles needed for some games
+"..\kyra.dat"-"c:\shared\scummvm\kyra.dat"
+"..\sky.cpt"-"c:\shared\scummvm\sky.cpt"
+
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"c:\data\scummvm\scummvm.ini",FILENULL
 ""-"c:\data\scummvm\scummvm.stdout.txt",FILENULL

Modified: scummvm/trunk/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg	2007-06-11 19:29:53 UTC (rev 27363)
+++ scummvm/trunk/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg	2007-06-11 19:30:24 UTC (rev 27364)
@@ -47,6 +47,11 @@
 "..\..\..\..\AUTHORS"-"!:\system\apps\scummvm\AUTHORS"
 "..\..\..\..\README"-"!:\system\apps\scummvm\README"
 "..\..\..\..\NEWS"-"!:\system\apps\scummvm\NEWS"
+
+; Common datafiles needed for some games
+"..\kyra.dat"-"!:\system\apps\scummvm\kyra.dat"
+"..\sky.cpt"-"!:\system\apps\scummvm\sky.cpt"
+
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"!:\system\apps\ScummVM\scummvm.ini",FILENULL
 ""-"!:\system\apps\ScummVM\scummvm.stdout.txt",FILENULL

Modified: scummvm/trunk/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg	2007-06-11 19:29:53 UTC (rev 27363)
+++ scummvm/trunk/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg	2007-06-11 19:30:24 UTC (rev 27364)
@@ -48,6 +48,10 @@
 "..\..\..\..\README"-"!:\system\apps\scummvm\README"
 "..\..\..\..\NEWS"-"!:\system\apps\scummvm\NEWS"
 
+; Common datafiles needed for some games
+"..\kyra.dat"-"!:\system\apps\scummvm\kyra.dat"
+"..\sky.cpt"-"!:\system\apps\scummvm\sky.cpt"
+
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"!:\system\apps\ScummVM\scummvm.ini",FILENULL
 ""-"!:\system\apps\ScummVM\scummvm.stdout.txt",FILENULL

Modified: scummvm/trunk/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg	2007-06-11 19:29:53 UTC (rev 27363)
+++ scummvm/trunk/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg	2007-06-11 19:30:24 UTC (rev 27364)
@@ -47,6 +47,10 @@
 "..\..\..\..\README"-"!:\system\apps\scummvm\README"
 "..\..\..\..\NEWS"-"!:\system\apps\scummvm\NEWS"
 
+; Common datafiles needed for some games
+"..\kyra.dat"-"!:\system\apps\scummvm\kyra.dat"
+"..\sky.cpt"-"!:\system\apps\scummvm\sky.cpt"
+
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"!:\system\apps\ScummVM\scummvm.ini",FILENULL
 ""-"!:\system\apps\ScummVM\scummvm.stdout.txt",FILENULL

Modified: scummvm/trunk/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg	2007-06-11 19:29:53 UTC (rev 27363)
+++ scummvm/trunk/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg	2007-06-11 19:30:24 UTC (rev 27364)
@@ -22,6 +22,10 @@
 ""-"!:\system\apps\ScummVM\scummvm.stderr.txt",FILENULL
 ""-"!:\system\apps\ScummVM\sdl.ini",FILENULL
 
+; Common datafiles needed for some games
+"..\kyra.dat"-"!:\system\apps\scummvm\kyra.dat"
+"..\sky.cpt"-"!:\system\apps\scummvm\sky.cpt"
+
 ; This install layout will let you upgrade to newer versions wihout loss of scummvm.ini.
 ; It will remove the config file, std***.txt files & dirs on uninstall.
 

Modified: scummvm/trunk/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
===================================================================
--- scummvm/trunk/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg	2007-06-11 19:29:53 UTC (rev 27363)
+++ scummvm/trunk/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg	2007-06-11 19:30:24 UTC (rev 27364)
@@ -56,6 +56,10 @@
 "..\..\..\..\README"-"!:\resource\apps\scummvm\README"
 "..\..\..\..\NEWS"-"!:\resource\apps\scummvm\NEWS"
 
+; Common datafiles needed for some games
+"..\kyra.dat"-"c:\shared\scummvm\kyra.dat"
+"..\sky.cpt"-"c:\shared\scummvm\sky.cpt"
+
 ; Config/log files: 'empty' will automagically be removed on uninstall
 ""-"c:\shared\scummvm\scummvm.ini",FILENULL
 ""-"c:\shared\scummvm\scummvm.stdout.txt",FILENULL

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2007-06-11 19:29:53 UTC (rev 27363)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2007-06-11 19:30:24 UTC (rev 27364)
@@ -106,10 +106,7 @@
 }
 
 void OSystem_SDL_Symbian::initBackend() {
-	char predfile[256];
-	strcpy(predfile, Symbian::GetExecutablePath());
-	strcat(predfile, "pred.dic");
-	ConfMan.set("predictive_dictionary", predfile);
+	ConfMan.set("extrapath", Symbian::GetExecutablePath());
 	ConfMan.setBool("FM_high_quality", false);
 #if !defined(S60) || defined(S60V3) // S60 has low quality as default
 	ConfMan.setBool("FM_medium_quality", true);


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




More information about the Scummvm-git-logs mailing list