- 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:
parent
0e69196370
commit
ea3b76815d
45 changed files with 526 additions and 410 deletions
|
|
@ -183,7 +183,7 @@ int turnheld; // for accelerative turning
|
|||
int mousex;
|
||||
int mousey;
|
||||
|
||||
string savegamefile;
|
||||
FString savegamefile;
|
||||
char savedescription[SAVESTRINGSIZE];
|
||||
|
||||
// [RH] Name of screenshot file to generate (usually NULL)
|
||||
|
|
@ -194,8 +194,8 @@ int bodyqueslot;
|
|||
|
||||
void R_ExecuteSetViewSize (void);
|
||||
|
||||
string savename;
|
||||
string BackupSaveName;
|
||||
FString savename;
|
||||
FString BackupSaveName;
|
||||
|
||||
bool SendLand;
|
||||
const AInventory *SendItemUse, *SendItemDrop;
|
||||
|
|
@ -599,7 +599,7 @@ void G_BuildTiccmd (ticcmd_t *cmd)
|
|||
{
|
||||
sendsave = false;
|
||||
Net_WriteByte (DEM_SAVEGAME);
|
||||
Net_WriteString (savegamefile.GetChars());
|
||||
Net_WriteString (savegamefile);
|
||||
Net_WriteString (savedescription);
|
||||
savegamefile = "";
|
||||
}
|
||||
|
|
@ -1484,7 +1484,7 @@ static bool CheckSingleWad (char *name, bool &printRequires, bool printwarn)
|
|||
{
|
||||
return true;
|
||||
}
|
||||
if (!Wads.CheckIfWadLoaded (name))
|
||||
if (Wads.CheckIfWadLoaded (name) < 0)
|
||||
{
|
||||
if (printwarn)
|
||||
{
|
||||
|
|
@ -1734,9 +1734,9 @@ void G_SaveGame (const char *filename, const char *description)
|
|||
sendsave = true;
|
||||
}
|
||||
|
||||
string G_BuildSaveName (const char *prefix, int slot)
|
||||
FString G_BuildSaveName (const char *prefix, int slot)
|
||||
{
|
||||
string name;
|
||||
FString name;
|
||||
const char *leader;
|
||||
const char *slash = "";
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue