- 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
|
|
@ -633,9 +633,9 @@ CCMD (load)
|
|||
Printf ("cannot load during a network game\n");
|
||||
return;
|
||||
}
|
||||
string fname = argv[1];
|
||||
FString fname = argv[1];
|
||||
DefaultExtension (fname, ".zds");
|
||||
G_LoadGame (fname.GetChars());
|
||||
G_LoadGame (fname);
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
|
|
@ -668,9 +668,38 @@ CCMD (save)
|
|||
Printf ("player is dead in a single-player game\n");
|
||||
return;
|
||||
}
|
||||
string fname = argv[1];
|
||||
FString fname = argv[1];
|
||||
DefaultExtension (fname, ".zds");
|
||||
G_SaveGame (fname.GetChars(), argv.argc() > 2 ? argv[2] : argv[1]);
|
||||
G_SaveGame (fname, argv.argc() > 2 ? argv[2] : argv[1]);
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
//
|
||||
// CCMD wdir
|
||||
//
|
||||
// Lists the contents of a loaded wad file.
|
||||
//
|
||||
//==========================================================================
|
||||
|
||||
CCMD (wdir)
|
||||
{
|
||||
if (argv.argc() != 2)
|
||||
{
|
||||
Printf ("usage: wdir <wadfile>\n");
|
||||
return;
|
||||
}
|
||||
int wadnum = Wads.CheckIfWadLoaded (argv[1]);
|
||||
if (wadnum < 0)
|
||||
{
|
||||
Printf ("%s must be loaded to view its directory.\n", argv[1]);
|
||||
}
|
||||
for (int i = 0; i < Wads.GetNumLumps(); ++i)
|
||||
{
|
||||
if (Wads.GetLumpFile(i) == wadnum)
|
||||
{
|
||||
Printf ("%s\n", Wads.GetLumpFullName(i));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue