[Scummvm-devel] Re: [Scummvm-cvs-logs] CVS: scummvm/common file.cpp,1.55,1.56

[Travis Howell]

Max Horn wrote:
> Am 10.02.2004 um 11:56 schrieb Travis Howell:
>
>> Update of /cvsroot/scummvm/scummvm/common
>> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16261/common
>>
>> Modified Files:
>> file.cpp
>> Log Message:
>>
>> Previous method wouldn't work, since each langague is in different
>> directory.
>>
>>
> [...]
>
>> Index: file.cpp
>> ===================================================================
>> RCS file: /cvsroot/scummvm/scummvm/common/file.cpp,v
>> retrieving revision 1.55
>> retrieving revision 1.56
>> diff -u -d -r1.55 -r1.56
>> --- file.cpp 6 Feb 2004 00:58:24 -0000 1.55
>> +++ file.cpp 10 Feb 2004 10:56:16 -0000 1.56
>> @@ -78,14 +78,7 @@
>>  "execute/",
>>  "EXECUTE/",
>>  // Simon the Sorcerer 2 Amiga/Mac
>> - "french/",
>> - "FRENCH/",
>> - "hebrew/",
>> - "HEBREW/",
>> - "italian/",
>> - "ITALIAN/",
>> - "spanish/",
>> - "SPANISH/",
>> + "../",
>>  "voices/",
>>  "VOICES/",
>>  // sword1/2 stuff if user just copied files without putting
>>
> So now, we always search parent dirs, too? That seems like a bad idea
> to me. It's not necessarily working on all systems (".." is a Unix
> metaphor, which also works on Windows). And might cause errors when a
> game is run from a dir with no parent (depending on your OS, the
> behavior may or may not be well defined / what you expect). At the
> very least, it should the last dir we try, as to not cause problems
> for our other engines.
>
> Yet another very good reason to get rid of this evil hack <sigh>.

Unfortunately no better way to handle it for playing off CD, until
directories can be chosen in each game engine.
The international version of Simon the Sorcerer 1 on CD has several common
data files in main directory and the language specific data files in the
language sub directory (french, hebrew, italian or spanish).
The best solution would be to add the extra needed langange sub directory
based on language, but I didn't think that was possible yet