- 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

@ -488,21 +488,21 @@ void DCajunMaster::ForgetBots ()
bool DCajunMaster::LoadBots ()
{
string tmp;
FString tmp;
bool gotteam = false;
bglobal.ForgetBots ();
#ifndef unix
tmp = progdir;
tmp += "zcajun/" BOTFILENAME;
if (!FileExists (tmp.GetChars()))
if (!FileExists (tmp))
{
DPrintf ("No " BOTFILENAME ", so no bots\n");
return false;
}
#else
tmp = GetUserFile (BOTFILENAME);
if (!FileExists (tmp.GetChars()))
if (!FileExists (tmp))
{
if (!FileExists (SHARE_DIR BOTFILENAME))
{
@ -515,7 +515,7 @@ bool DCajunMaster::LoadBots ()
#endif
else
{
SC_OpenFile (tmp.GetChars());
SC_OpenFile (tmp);
}
while (SC_GetString ())