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

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

View file

@ -74,7 +74,7 @@ char *WeaponSection;
FGameConfigFile::FGameConfigFile ()
{
string pathname;
FString pathname;
bMigrating = false;
pathname = GetConfigPath (true);
@ -504,14 +504,14 @@ void FGameConfigFile::ArchiveGlobalData ()
C_ArchiveCVars (this, 3);
}
string FGameConfigFile::GetConfigPath (bool tryProg)
FString FGameConfigFile::GetConfigPath (bool tryProg)
{
char *pathval;
string path;
FString path;
pathval = Args.CheckValue ("-config");
if (pathval != NULL)
return string(pathval);
return FString(pathval);
#ifndef unix
path = NULL;
@ -606,7 +606,7 @@ void FGameConfigFile::AddAutoexec (DArgs *list, const char *game)
// with a default autoexec.cfg file present.
if (!SetSection (section))
{
string path;
FString path;
#ifndef unix
if (Args.CheckParm ("-cdrom"))
@ -748,6 +748,6 @@ void FGameConfigFile::SetupWeaponList (const char *gamename)
CCMD (whereisini)
{
string path = GameConfig->GetConfigPath (false);
FString path = GameConfig->GetConfigPath (false);
Printf ("%s\n", path.GetChars());
}