diff options
9 files changed, 34 insertions, 4 deletions
diff --git a/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg b/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg index 9e664961c4..d15f549207 100644 --- a/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg +++ b/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg @@ -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 diff --git a/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v2.pkg b/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v2.pkg index 1518dc9517..5e0c8bfdaa 100644 --- a/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v2.pkg +++ b/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v2.pkg @@ -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 diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg index 2f4f9469bc..12d5b37be2 100644 --- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg +++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg @@ -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 diff --git a/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg b/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg index 8fc4c60217..db94745b35 100644 --- a/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg +++ b/backends/platform/symbian/S80/scummvm-CVS-SymbianS80.pkg @@ -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 diff --git a/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg b/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg index 70238c9593..6752bc3813 100644 --- a/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg +++ b/backends/platform/symbian/S90/scummvm-CVS-SymbianS90.pkg @@ -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 diff --git a/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg b/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg index 86f0028e02..d55d70c823 100644 --- a/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg +++ b/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg @@ -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 diff --git a/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg b/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg index e0d36c477a..8783f25337 100644 --- a/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg +++ b/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2_SE.pkg @@ -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. diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg index 402852c2f4..f92b013cd7 100644 --- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg +++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg @@ -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 diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp index 8da3207dff..c992c97316 100644 --- a/backends/platform/symbian/src/SymbianOS.cpp +++ b/backends/platform/symbian/src/SymbianOS.cpp @@ -106,10 +106,7 @@ OSystem_SDL_Symbian::OSystem_SDL_Symbian() :_channels(0),_stereo_mix_buffer(0) { } 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); |