1
0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-19 03:39:08 +00:00

Alright, this _TEMP_CONVERT_ stuff was a stupid idea

This commit is contained in:
2012-11-13 01:02:23 -08:00
parent 075c535e2c
commit b219c3c3cc
97 changed files with 314 additions and 466 deletions

View File

@ -49,7 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "plNetMessage/plNetMessage.h"
#include "pnNetCommon/plNetApp.h"
const plString plSDL::kAgeSDLObjectName = _TEMP_CONVERT_FROM_LITERAL("AgeSDLHook");
const plString plSDL::kAgeSDLObjectName = "AgeSDLHook";
// static
const uint8_t plStateDataRecord::kIOVersion=6;
@ -737,7 +737,7 @@ void plStateDataRecord::DumpToObjectDebugger(const char* msg, bool dirtyOnly, in
plString pad;
int i;
for(i=0;i<level; i++)
pad += _TEMP_CONVERT_FROM_LITERAL(" ");
pad += " ";
int numVars = dirtyOnly ? GetNumDirtyVars() : GetNumUsedVars();
int numSDVars = dirtyOnly ? GetNumDirtySDVars() : GetNumUsedSDVars();
@ -808,7 +808,7 @@ void plStateDataRecord::DumpToStream(hsStream* stream, const char* msg, bool dir
}
}
logStr = _TEMP_CONVERT_FROM_LITERAL("\n");
logStr = "\n";
stream->Write(logStr.GetSize(), logStr.c_str());
}

View File

@ -1790,7 +1790,7 @@ plString plSimpleStateVariable::GetKeyName(int idx) const
}
}
hsAssert(false, "passing wrong value type to SDL variable");
return _TEMP_CONVERT_FROM_LITERAL("(nil)");
return "(nil)";
}
#pragma optimize( "g", off ) // disable float optimizations