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

8
src/sc_man.cpp
View file

@ -62,7 +62,7 @@ char *sc_ScriptsDir = "";
// PRIVATE DATA DEFINITIONS ------------------------------------------------
static string ScriptName;
static FString ScriptName;
static char *ScriptBuffer;
static char *ScriptPtr;
static char *ScriptEndPtr;
@ -737,7 +737,7 @@ BOOL SC_Compare (const char *text)
void STACK_ARGS SC_ScriptError (const char *message, ...)
{
string composed;
FString composed;
if (message == NULL)
{
@ -785,7 +785,7 @@ struct SavedScript
BOOL sc_Crossed;
BOOL sc_FileScripts;
string * ScriptName;
FString *ScriptName;
char *ScriptBuffer;
char *ScriptPtr;
char *ScriptEndPtr;
@ -809,7 +809,7 @@ void SC_SaveScriptState()
ss.sc_End = sc_End;
ss.sc_Crossed = sc_Crossed;
ss.sc_FileScripts = sc_FileScripts;
ss.ScriptName = ::new string(ScriptName);
ss.ScriptName = ::new FString(ScriptName);
ss.ScriptBuffer = ScriptBuffer;
ss.ScriptPtr = ScriptPtr;
ss.ScriptEndPtr = ScriptEndPtr;