OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Removed -bpal parameter. Blood's blood.pal is loaded from blood.rff, and

Browse source 
its tiles are loaded from the same directory.
- RFF files now load their entire directories into the lumplist.
- Added char * and const char * type coversions for FString, so FStrings can be
  freely passed to functions expecting C strings. (Except varargs functions,
  which still require manually fetching the C string out of it.)
- Renamed the name class to FName.
- Renamed the string class to FString to emphasize that it is not std::string.


SVN r74 (trunk)
This commit is contained in:
Randy Heit 2006-05-03 22:45:01 +00:00
commit ea3b76815d
45 changed files with 526 additions and 410 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/d_main.cpp
View file

@ -1598,7 +1598,7 @@ static EIWADType IdentifyVersion (void)
else if (*value == '~' && (*(value + 1) == 0 || *(value + 1) == '/'))
{
string homepath = GetUserFile (*(value + 1) ? value + 2 : value + 1);
CheckIWAD (homepath.GetChars(), wads);
CheckIWAD (homepath, wads);
}
#endif
else
@ -1726,7 +1726,7 @@ static const char *BaseFileSearch (const char *file, const char *ext, bool lookf
if (stricmp (key, "Path") == 0)
{
const char *dir;
string homepath;
FString homepath;
if (*value == '$')
{
@ -1743,7 +1743,7 @@ static const char *BaseFileSearch (const char *file, const char *ext, bool lookf
else if (*value == '~' && (*(value + 1) == 0 || *(value + 1) == '/'))
{
homepath = GetUserFile (*(value + 1) ? value + 2 : value + 1);
dir = homepath.GetChars();
dir = homepath;
}
#endif
else
@ -1765,9 +1765,9 @@ static const char *BaseFileSearch (const char *file, const char *ext, bool lookf
// Retry, this time with a default extension
if (ext != NULL)
{
string tmp = file;
FString tmp = file;
DefaultExtension (tmp, ext);
return BaseFileSearch (tmp.GetChars(), NULL);
return BaseFileSearch (tmp, NULL);
}
return NULL;
}