OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- return a std::string from GetFileFullPath

Browse source
This commit is contained in:
Christoph Oelckers 2023-08-19 21:42:58 +02:00
commit 8a5d3c096b
11 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/scripting/decorate/thingdef_parse.cpp
View file

@ -1129,7 +1129,7 @@ static PClassActor *ParseActorHeader(FScanner &sc, Baggage *bag)
{
PClassActor *info = CreateNewActor(sc, typeName, parentName);
info->ActorInfo()->DoomEdNum = DoomEdNum > 0 ? DoomEdNum : -1;
info->SourceLumpName = fileSystem.GetFileFullPath(sc.LumpNum);
info->SourceLumpName = fileSystem.GetFileFullPath(sc.LumpNum).c_str();
if (!info->SetReplacement(replaceName))
{

4
src/scripting/thingdef.cpp
View file

@ -433,12 +433,12 @@ void ParseScripts()
if (FScriptPosition::ErrorCounter > 0)
{
// Abort if the compiler produced any errors. Also do not compile further lumps, because they very likely miss some stuff.
I_Error("%d errors, %d warnings while compiling %s", FScriptPosition::ErrorCounter, FScriptPosition::WarnCounter, fileSystem.GetFileFullPath(lump).GetChars());
I_Error("%d errors, %d warnings while compiling %s", FScriptPosition::ErrorCounter, FScriptPosition::WarnCounter, fileSystem.GetFileFullPath(lump).c_str());
}
else if (FScriptPosition::WarnCounter > 0)
{
// If we got warnings, but no errors, print the information but continue.
Printf(TEXTCOLOR_ORANGE "%d warnings while compiling %s\n", FScriptPosition::WarnCounter, fileSystem.GetFileFullPath(lump).GetChars());
Printf(TEXTCOLOR_ORANGE "%d warnings while compiling %s\n", FScriptPosition::WarnCounter, fileSystem.GetFileFullPath(lump).c_str());
}
}