zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-04 23:12:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use GetChars on FStrings.

Browse source
This commit is contained in:
Christoph Oelckers 2023-10-07 23:48:50 +02:00
parent 1859a902e0
commit 90eb9ceafe
40 changed files with 102 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/common/audio/music/i_music.cpp
View file

@ -312,8 +312,8 @@ static ZMusic_MidiSource GetMIDISource(const char *fn)
FString src = fn;
if (src.Compare("*") == 0) src = mus_playing.name;
auto lump = fileSystem.CheckNumForName(src, ns_music);
if (lump < 0) lump = fileSystem.CheckNumForFullName(src);
auto lump = fileSystem.CheckNumForName(src.GetChars(), ns_music);
if (lump < 0) lump = fileSystem.CheckNumForFullName(src.GetChars());
if (lump < 0)
{
Printf("Cannot find MIDI lump %s.\n", src.GetChars());
@ -391,7 +391,7 @@ UNSAFE_CCMD (writewave)
Printf("MIDI dump of %s failed: %s\n",argv[1], ZMusic_GetLastError());
}
S_ChangeMusic(savedsong.name, savedsong.baseorder, savedsong.loop, true);
S_ChangeMusic(savedsong.name.GetChars(), savedsong.baseorder, savedsong.loop, true);
}
else
{

24
source/common/audio/music/i_soundfont.cpp
View file

@ -68,7 +68,7 @@ std::pair<FileReader, FString> FSoundFontReader::LookupFile(const char *name)
for(int i = mPaths.Size()-1; i>=0; i--)
{
FString fullname = mPaths[i] + name;
auto fr = OpenFile(fullname);
auto fr = OpenFile(fullname.GetChars());
if (fr.isOpen()) return std::make_pair(std::move(fr), fullname);
}
}
@ -93,7 +93,7 @@ void FSoundFontReader::AddPath(const char *strp)
if (str.Back() != '/') str += '/'; // always let it end with a slash.
for (auto &s : mPaths)
{
if (pathcmp(s.GetChars(), str) == 0)
if (pathcmp(s.GetChars(), str.GetChars()) == 0)
{
// move string to the back.
mPaths.Delete(i);
@ -122,13 +122,13 @@ FileReader FSoundFontReader::Open(const char *name, std::string& filename)
if (name == nullptr)
{
fr = OpenMainConfigFile();
filename = MainConfigFileName();
filename = MainConfigFileName().GetChars();
}
else
{
auto res = LookupFile(name);
fr = std::move(res.first);
filename = res.second;
filename = res.second.GetChars();
}
return fr;
}
@ -244,7 +244,7 @@ FPatchSetReader::FPatchSetReader(const char *filename)
const char *paths[] = {
"C:/TIMIDITY",
"/TIMIDITY",
progdir
progdir.GetChars()
};
#endif
mAllowAbsolutePaths = true;
@ -258,7 +258,7 @@ FPatchSetReader::FPatchSetReader(const char *filename)
for(auto c : paths)
{
FStringf fullname("%s/%s", c, filename);
if (fr.OpenFile(fullname))
if (fr.OpenFile(fullname.GetChars()))
{
mFullPathToConfig = fullname;
}
@ -267,7 +267,7 @@ FPatchSetReader::FPatchSetReader(const char *filename)
if (mFullPathToConfig.Len() > 0)
{
FixPathSeperator(mFullPathToConfig);
mBasePath = ExtractFilePath(mFullPathToConfig);
mBasePath = ExtractFilePath(mFullPathToConfig.GetChars());
if (mBasePath.Len() > 0 && mBasePath.Back() != '/') mBasePath += '/';
}
}
@ -276,7 +276,7 @@ FPatchSetReader::FPatchSetReader(const char *filename)
FileReader FPatchSetReader::OpenMainConfigFile()
{
FileReader fr;
fr.OpenFile(mFullPathToConfig);
fr.OpenFile(mFullPathToConfig.GetChars());
return fr;
}
@ -286,7 +286,7 @@ FileReader FPatchSetReader::OpenFile(const char *name)
if (IsAbsPath(name)) path = name;
else path = mBasePath + name;
FileReader fr;
fr.OpenFile(path);
fr.OpenFile(path.GetChars());
return fr;
}
@ -302,7 +302,7 @@ FLumpPatchSetReader::FLumpPatchSetReader(const char *filename)
mBasePath = filename;
FixPathSeperator(mBasePath);
mBasePath = ExtractFilePath(mBasePath);
mBasePath = ExtractFilePath(mBasePath.GetChars());
if (mBasePath.Len() > 0 && mBasePath.Back() != '/') mBasePath += '/';
}
@ -523,8 +523,8 @@ FSoundFontReader *FSoundFontManager::OpenSoundFont(const char *name, int allowed
auto sfi = FindSoundFont(name, allowed);
if (sfi != nullptr)
{
if (sfi->type == SF_SF2) return new FSF2Reader(sfi->mFilename);
else return new FZipPatReader(sfi->mFilename);
if (sfi->type == SF_SF2) return new FSF2Reader(sfi->mFilename.GetChars());
else return new FZipPatReader(sfi->mFilename.GetChars());
}
return nullptr;

14
source/common/audio/music/music.cpp
View file

@ -463,7 +463,7 @@ static void SaveGains()
{
auto path = M_GetAppDataPath(true);
path << "/replaygain.ini";
FConfigFile gains(path);
FConfigFile gains(path.GetChars());
TMap<FString, float>::Iterator it(gainMap);
TMap<FString, float>::Pair* pair;
@ -471,7 +471,7 @@ static void SaveGains()
{
while (it.NextPair(pair))
{
gains.SetValueForKey(pair->Key, std::to_string(pair->Value).c_str());
gains.SetValueForKey(pair->Key.GetChars(), std::to_string(pair->Value).c_str());
}
}
gains.WriteConfigFile();
@ -484,7 +484,7 @@ static void ReadGains()
done = true;
auto path = M_GetAppDataPath(true);
path << "/replaygain.ini";
FConfigFile gains(path);
FConfigFile gains(path.GetChars());
if (gains.SetSection("Gains"))
{
const char* key;
@ -669,7 +669,7 @@ bool S_ChangeMusic(const char* musicname, int order, bool looping, bool force)
if (!mus_playing.name.IsEmpty() &&
mus_playing.handle != nullptr &&
stricmp(mus_playing.name, musicname) == 0 &&
mus_playing.name.CompareNoCase(musicname) == 0 &&
ZMusic_IsLooping(mus_playing.handle) == zmusic_bool(looping))
{
if (order != mus_playing.baseorder)
@ -768,7 +768,7 @@ void S_RestartMusic ()
{
FString song = mus_playing.LastSong;
mus_playing.LastSong = "";
S_ChangeMusic (song, mus_playing.baseorder, mus_playing.loop, true);
S_ChangeMusic (song.GetChars(), mus_playing.baseorder, mus_playing.loop, true);
}
else
{
@ -791,7 +791,7 @@ void S_MIDIDeviceChanged(int newdev)
// Reload the song to change the device
auto mi = mus_playing;
S_StopMusic(true);
S_ChangeMusic(mi.name, mi.baseorder, mi.loop);
S_ChangeMusic(mi.name.GetChars(), mi.baseorder, mi.loop);
}
}
@ -807,7 +807,7 @@ int S_GetMusic (const char **name)
if (mus_playing.name.IsNotEmpty())
{
*name = mus_playing.name;
*name = mus_playing.name.GetChars();
order = mus_playing.baseorder;
}
else

2
source/common/audio/sound/i_sound.cpp
View file

@ -248,7 +248,7 @@ public:
void I_InitSound ()
{
FModule_SetProgDir(progdir);
FModule_SetProgDir(progdir.GetChars());
/* Get command line options: */
nosound = !!Args->CheckParm ("-nosound");
nosfx = !!Args->CheckParm ("-nosfx");

2
source/common/audio/sound/oalsound.cpp
View file

@ -75,7 +75,7 @@ CVAR (String, snd_alresampler, "Default", CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
#define OPENALLIB1 "libopenal.1.dylib"
#define OPENALLIB2 "OpenAL.framework/OpenAL"
#else // !__APPLE__
#define OPENALLIB1 NicePath("$PROGDIR/" OPENALLIB)
#define OPENALLIB1 NicePath("$PROGDIR/" OPENALLIB).GetChars()
#define OPENALLIB2 OPENALLIB
#endif

6
source/common/audio/sound/s_reverbedit.cpp
View file

@ -227,7 +227,7 @@ void ExportEnvironments(const char *filename, uint32_t count, const ReverbContai
{
FString dest = M_GetDocumentsPath() + filename;
FileWriter *f = FileWriter::Open(dest);
FileWriter *f = FileWriter::Open(dest.GetChars());
if (f != nullptr)
{
@ -509,13 +509,13 @@ CCMD(createenvironment)
{
if (S_FindEnvironment(reverbedit_name))
{
M_StartMessage(FStringf("An environment with the name '%s' already exists", *reverbedit_name), 1);
M_StartMessage(FStringf("An environment with the name '%s' already exists", *reverbedit_name).GetChars(), 1);
return;
}
int id = (reverbedit_id1 << 8) + reverbedit_id2;
if (S_FindEnvironment(id))
{
M_StartMessage(FStringf("An environment with the ID (%d, %d) already exists", *reverbedit_id1, *reverbedit_id2), 1);
M_StartMessage(FStringf("An environment with the ID (%d, %d) already exists", *reverbedit_id1, *reverbedit_id2).GetChars(), 1);
return;
}

6
source/common/cutscenes/movieplayer.cpp
View file

@ -837,7 +837,7 @@ MoviePlayer* OpenMovie(const char* filename, TArray<int>& ans, const int* framet
{
auto fn = StripExtension(filename);
DefaultExtension(fn, ".ivf");
fr = fileSystem.OpenFileReader(fn);
fr = fileSystem.OpenFileReader(fn.GetChars());
}
if (!fr.isOpen()) fr = fileSystem.OpenFileReader(filename);
@ -905,7 +905,7 @@ MoviePlayer* OpenMovie(const char* filename, TArray<int>& ans, const int* framet
// VPX files have no sound track, so look for a same-named sound file with a known extension as the soundtrack to be played.
static const char* knownSoundExts[] = { "OGG", "FLAC", "MP3", "OPUS", "WAV" };
FString name = StripExtension(filename);
anm->soundtrack = fileSystem.FindFileWithExtensions(name, knownSoundExts, countof(knownSoundExts));
anm->soundtrack = fileSystem.FindFileWithExtensions(name.GetChars(), knownSoundExts, countof(knownSoundExts));
return anm;
}
// add more formats here.
@ -936,7 +936,7 @@ DEFINE_ACTION_FUNCTION(_MoviePlayer, Create)
if (firstframetime == -1) firstframetime = frametime;
if (lastframetime == -1) lastframetime = frametime;
int frametimes[] = { firstframetime, frametime, lastframetime };
auto movie = OpenMovie(filename, *sndinf, frametime == -1? nullptr : frametimes, flags, error);
auto movie = OpenMovie(filename.GetChars(), *sndinf, frametime == -1? nullptr : frametimes, flags, error);
if (!movie)
{
Printf(TEXTCOLOR_YELLOW "%s", error.GetChars());

4
source/common/cutscenes/screenjob.cpp
View file

@ -154,7 +154,7 @@ void AddGenericVideo(DObject* runner, const FString& fn, int soundid, int fps)
int CutsceneDef::GetSound()
{
FSoundID id = INVALID_SOUND;
if (soundName.IsNotEmpty()) id = soundEngine->FindSound(soundName);
if (soundName.IsNotEmpty()) id = soundEngine->FindSound(soundName.GetChars());
if (id == INVALID_SOUND) id = soundEngine->FindSoundByResID(soundID);
return id.index();
}
@ -163,7 +163,7 @@ void CutsceneDef::Create(DObject* runner)
{
if (function.IsNotEmpty())
{
CallCreateFunction(function, runner);
CallCreateFunction(function.GetChars(), runner);
}
else if (video.IsNotEmpty())
{

4
source/common/engine/i_net.cpp
View file

@ -419,12 +419,12 @@ void BuildAddress (sockaddr_in *address, const char *name)
if (!isnamed)
{
address->sin_addr.s_addr = inet_addr (target);
address->sin_addr.s_addr = inet_addr (target.GetChars());
Printf ("Node number %d, address %s\n", doomcom.numnodes, target.GetChars());
}
else
{
hostentry = gethostbyname (target);
hostentry = gethostbyname (target.GetChars());
if (!hostentry)
I_FatalError ("gethostbyname: couldn't find %s\n%s", target.GetChars(), neterror());
address->sin_addr.s_addr = *(int *)hostentry->h_addr_list[0];

2
source/common/engine/m_joy.cpp
View file

@ -98,7 +98,7 @@ static bool M_SetJoystickConfigSection(IJoystickConfig *joy, bool create, FConfi
FString id = "Joy:";
id += joy->GetIdentifier();
if (!GameConfig) return false;
return GameConfig->SetSection(id, create);
return GameConfig->SetSection(id.GetChars(), create);
}
//==========================================================================

6
source/common/engine/serializer.cpp
View file

@ -1145,7 +1145,7 @@ FSerializer &Serialize(FSerializer &arc, const char *key, FTextureID &value, FTe
}
else
{
name = pic->GetName();
name = pic->GetName().GetChars();
}
arc.WriteKey(key);
arc.w->StartArray();
@ -1507,8 +1507,8 @@ FString DictionaryToString(const Dictionary &dict)
while (i.NextPair(pair))
{
writer.Key(pair->Key);
writer.String(pair->Value);
writer.Key(pair->Key.GetChars());
writer.String(pair->Value.GetChars());
}
writer.EndObject();

2
source/common/engine/stats.cpp
View file

@ -116,7 +116,7 @@ void FStat::PrintStat (F2DDrawer *drawer)
// Count number of linefeeds but ignore terminating ones.
if (stattext[i] == '\n') y -= fontheight;
}
DrawText(drawer, NewConsoleFont, CR_GREEN, 5 / textScale, y, stattext,
DrawText(drawer, NewConsoleFont, CR_GREEN, 5 / textScale, y, stattext.GetChars(),
DTA_VirtualWidth, twod->GetWidth() / textScale,
DTA_VirtualHeight, twod->GetHeight() / textScale,
DTA_KeepRatio, true, TAG_DONE);

4
source/common/engine/stringtable.cpp
View file

@ -241,7 +241,7 @@ bool FStringTable::ParseLanguageCSV(int lumpnum, const char* buffer, size_t size
auto filter = filterstr.Split(" ", FString::TOK_SKIPEMPTY);
for (auto& entry : filter)
{
if (sysCallbacks.CheckGame(entry))
if (sysCallbacks.CheckGame(entry.GetChars()))
{
ok = true;
break;
@ -639,7 +639,7 @@ bool FStringTable::MatchDefaultString(const char *name, const char *content) con
// Check a secondary key, in case the text comparison cannot be done due to needed orthographic fixes (see Harmony's exit text)
FStringf checkkey("%s_CHECK", name);
auto cc = GetLanguageString(checkkey, FStringTable::default_table);
auto cc = GetLanguageString(checkkey.GetChars(), FStringTable::default_table);
if (cc) c = cc;
return (c && !strnicmp(c, content, strcspn(content, "\n\r\t")));

1
source/common/engine/stringtable.h
View file

@ -97,6 +97,7 @@ public:
bool MatchDefaultString(const char *name, const char *content) const;
const char *GetString(const char *name, uint32_t *langtable, int gender = -1) const;
const char *operator() (const char *name) const; // Never returns NULL
const char* operator() (const FString& name) const { return operator()(name.GetChars()); }
const char *operator[] (const char *name) const
{
return GetString(name, nullptr);

2
source/common/menu/joystickmenu.cpp
View file

@ -176,7 +176,7 @@ void UpdateJoystickMenu(IJoystickConfig *selected)
for (int ii = 0; ii < (int)Joysticks.Size(); ++ii)
{
it = CreateOptionMenuItemJoyConfigMenu(Joysticks[ii]->GetName(), Joysticks[ii]);
it = CreateOptionMenuItemJoyConfigMenu(Joysticks[ii]->GetName().GetChars(), Joysticks[ii]);
GC::WriteBarrier(opt, it);
opt->mItems.Push(it);
if (ii == itemnum) opt->mSelectedItem = opt->mItems.Size();

2
source/common/menu/menu.cpp
View file

@ -1209,7 +1209,7 @@ bool DMenuItemBase::GetString(int i, char *s, int len)
FString retstr;
VMReturn ret[2]; ret[0].IntAt(&retval); ret[1].StringAt(&retstr);
VMCall(func, params, countof(params), ret, 2);
strncpy(s, retstr, len);
strncpy(s, retstr.GetChars(), len);
return !!retval;
}
return false;

2
source/common/menu/menudef.cpp
View file

@ -1628,7 +1628,7 @@ static void InitMusicMenus()
{
FString display = entry.mName;
display.ReplaceChars("_", ' ');
auto it = CreateOptionMenuItemCommand(display, FStringf("%s \"%s\"", std::get<2>(p), entry.mName.GetChars()), true);
auto it = CreateOptionMenuItemCommand(display.GetChars(), FStringf("%s \"%s\"", std::get<2>(p), entry.mName.GetChars()), true);
static_cast<DOptionMenuDescriptor*>(*menu)->mItems.Push(it);
}
}

2
source/common/menu/messagebox.cpp
View file

@ -99,6 +99,6 @@ DEFINE_ACTION_FUNCTION(DMenu, StartMessage)
PARAM_STRING(msg);
PARAM_INT(mode);
PARAM_NAME(action);
M_StartMessage(msg, mode, action);
M_StartMessage(msg.GetChars(), mode, action);
return 0;
}

12
source/common/menu/savegamemanager.cpp
View file

@ -252,7 +252,7 @@ void FSavegameManagerBase::DoSave(int Selected, const char *savegamestring)
break;
}
}
PerformSaveGame(filename, savegamestring);
PerformSaveGame(filename.GetChars(), savegamestring);
}
M_ClearMenus();
}
@ -262,7 +262,7 @@ DEFINE_ACTION_FUNCTION(FSavegameManager, DoSave)
PARAM_SELF_STRUCT_PROLOGUE(FSavegameManagerBase);
PARAM_INT(sel);
PARAM_STRING(name);
self->DoSave(sel, name);
self->DoSave(sel, name.GetChars());
return 0;
}
@ -559,7 +559,7 @@ FString G_GetSavegamesFolder()
}
else
{
name = **save_dir ? save_dir : M_GetSavegamesPath();
name = **save_dir ? FString(save_dir) : M_GetSavegamesPath();
usefilter = true;
}
@ -574,8 +574,8 @@ FString G_GetSavegamesFolder()
if (usefilter && SavegameFolder.IsNotEmpty())
name << SavegameFolder << '/';
name = NicePath(name);
CreatePath(name);
name = NicePath(name.GetChars());
CreatePath(name.GetChars());
return name;
}
@ -589,7 +589,7 @@ FString G_BuildSaveName(const char* prefix)
{
FString name = G_GetSavegamesFolder() + prefix;
DefaultExtension(name, "." SAVEGAME_EXT); // only add an extension if the prefix doesn't have one already.
name = NicePath(name);
name = NicePath(name.GetChars());
name.Substitute("\\", "/");
return name;
}

4
source/common/models/models_ue1.cpp
View file

@ -53,14 +53,14 @@ bool FUE1Model::Load( const char *filename, int lumpnum, const char *buffer, int
if ( (size_t)realfilename.IndexOf("_d.3d") == realfilename.Len()-5 )
{
realfilename.Substitute("_d.3d","_a.3d");
lumpnum2 = fileSystem.CheckNumForFullName(realfilename);
lumpnum2 = fileSystem.CheckNumForFullName(realfilename.GetChars());
mDataLump = lumpnum;
mAnivLump = lumpnum2;
}
else
{
realfilename.Substitute("_a.3d","_d.3d");
lumpnum2 = fileSystem.CheckNumForFullName(realfilename);
lumpnum2 = fileSystem.CheckNumForFullName(realfilename.GetChars());
mAnivLump = lumpnum;
mDataLump = lumpnum2;
}

4
source/common/rendering/gl/gl_renderbuffers.cpp
View file

@ -836,8 +836,8 @@ FShaderProgram *GLPPRenderState::GetGLShader(PPShader *shader)
prolog = UniformBlockDecl::Create("Uniforms", shader->Uniforms, POSTPROCESS_BINDINGPOINT);
prolog += shader->Defines;
glshader->Compile(FShaderProgram::Vertex, shader->VertexShader, "", shader->Version);
glshader->Compile(FShaderProgram::Fragment, shader->FragmentShader, prolog, shader->Version);
glshader->Compile(FShaderProgram::Vertex, shader->VertexShader.GetChars(), "", shader->Version);
glshader->Compile(FShaderProgram::Fragment, shader->FragmentShader.GetChars(), prolog.GetChars(), shader->Version);
glshader->Link(shader->FragmentShader.GetChars());
if (!shader->Uniforms.empty())
glshader->SetUniformBufferLocation(POSTPROCESS_BINDINGPOINT, "Uniforms");

10
source/common/rendering/gl/gl_shader.cpp
View file

@ -109,7 +109,7 @@ static FString CalcProgramBinaryChecksum(const FString &vertex, const FString &f
static FString CreateProgramCacheName(bool create)
{
FString path = M_GetCachePath(create);
if (create) CreatePath(path);
if (create) CreatePath(path.GetChars());
path << "/shadercache.zdsc";
return path;
}
@ -125,7 +125,7 @@ static void LoadShaders()
{
FString path = CreateProgramCacheName(false);
FileReader fr;
if (!fr.OpenFile(path))
if (!fr.OpenFile(path.GetChars()))
I_Error("Could not open shader file");
char magic[4];
@ -166,7 +166,7 @@ static void LoadShaders()
static void SaveShaders()
{
FString path = CreateProgramCacheName(true);
std::unique_ptr<FileWriter> fw(FileWriter::Open(path));
std::unique_ptr<FileWriter> fw(FileWriter::Open(path.GetChars()));
if (fw)
{
uint32_t count = (uint32_t)ShaderCache.size();
@ -837,9 +837,9 @@ bool FShaderCollection::CompileNextShader()
}
else if (mCompileState == 2)
{
FString name = ExtractFileBase(usershaders[i].shader);
FString name = ExtractFileBase(usershaders[i].shader.GetChars());
FString defines = defaultshaders[usershaders[i].shaderType].Defines + usershaders[i].defines;
FShader *shc = Compile(name, usershaders[i].shader, defaultshaders[usershaders[i].shaderType].lightfunc, defines, true, mPassType);
FShader *shc = Compile(name.GetChars(), usershaders[i].shader.GetChars(), defaultshaders[usershaders[i].shaderType].lightfunc, defines.GetChars(), true, mPassType);
mMaterialShaders.Push(shc);
mCompileIndex++;
if (mCompileIndex >= (int)usershaders.Size())

10
source/common/rendering/gl/gl_shaderprogram.cpp
View file

@ -107,7 +107,7 @@ void FShaderProgram::CompileShader(ShaderType type)
const auto &handle = mShaders[type];
FGLDebug::LabelObject(GL_SHADER, handle, mShaderNames[type]);
FGLDebug::LabelObject(GL_SHADER, handle, mShaderNames[type].GetChars());
const FString &patchedCode = mShaderSources[type];
int lengths[1] = { (int)patchedCode.Len() };
@ -186,7 +186,7 @@ void FShaderProgram::Link(const char *name)
glUseProgram(mProgram);
for (auto &uni : samplerstobind)
{
auto index = glGetUniformLocation(mProgram, uni.first);
auto index = glGetUniformLocation(mProgram, uni.first.GetChars());
if (index >= 0)
{
glUniform1i(index, uni.second);
@ -300,8 +300,8 @@ void FPresentShaderBase::Init(const char * vtx_shader_name, const char * program
FString prolog = Uniforms.CreateDeclaration("Uniforms", PresentUniforms::Desc());
mShader.reset(new FShaderProgram());
mShader->Compile(FShaderProgram::Vertex, "shaders/pp/screenquad.vp", prolog, 330);
mShader->Compile(FShaderProgram::Fragment, vtx_shader_name, prolog, 330);
mShader->Compile(FShaderProgram::Vertex, "shaders/pp/screenquad.vp", prolog.GetChars(), 330);
mShader->Compile(FShaderProgram::Fragment, vtx_shader_name, prolog.GetChars(), 330);
mShader->Link(program_name);
mShader->SetUniformBufferLocation(Uniforms.BindingPoint(), "Uniforms");
Uniforms.Init();
@ -355,7 +355,7 @@ void FShadowMapShader::Bind()
mShader.reset(new FShaderProgram());
mShader->Compile(FShaderProgram::Vertex, "shaders/pp/screenquad.vp", "", 430);
mShader->Compile(FShaderProgram::Fragment, "shaders/pp/shadowmap.fp", prolog, 430);
mShader->Compile(FShaderProgram::Fragment, "shaders/pp/shadowmap.fp", prolog.GetChars(), 430);
mShader->Link("shaders/glsl/shadowmap");
mShader->SetUniformBufferLocation(Uniforms.BindingPoint(), "Uniforms");
Uniforms.Init();

2
source/common/rendering/hwrenderer/data/hw_shaderpatcher.cpp
View file

@ -188,7 +188,7 @@ FString RemoveSamplerBindings(FString code, TArray<std::pair<FString, int>> &sam
FString type = NextGlslToken(chars, len, pos);
FString identifier = NextGlslToken(chars, len, pos);
isSamplerUniformName = uniform.Compare("uniform") == 0 && isShaderType(type);
isSamplerUniformName = uniform.Compare("uniform") == 0 && isShaderType(type.GetChars());
if (isSamplerUniformName)
{
samplerstobind.Push(std::make_pair(identifier, val));

6
source/common/rendering/hwrenderer/postprocessing/hw_postprocessshader_ccmds.cpp
View file

@ -39,7 +39,7 @@ CCMD (shaderenable)
for (unsigned int i = 0; i < PostProcessShaders.Size(); i++)
{
PostProcessShader &shader = PostProcessShaders[i];
if (strcmp(shader.Name, shaderName) == 0)
if (shader.Name.Compare(shaderName) == 0)
{
if (value != -1)
shader.Enabled = value;
@ -70,7 +70,7 @@ CCMD (shaderuniform)
for (unsigned int i = 0; i < PostProcessShaders.Size(); i++)
{
PostProcessShader &shader = PostProcessShaders[i];
if (strcmp(shader.Name, shaderName) == 0)
if (shader.Name.Compare(shaderName) == 0)
{
if (argv.argc() > 3)
{
@ -116,7 +116,7 @@ CCMD(listuniforms)
for (unsigned int i = 0; i < PostProcessShaders.Size(); i++)
{
PostProcessShader &shader = PostProcessShaders[i];
if (strcmp(shader.Name, shaderName) == 0)
if (shader.Name.Compare(shaderName) == 0)
{
Printf("Shader '%s' uniforms:\n", shaderName);

4
source/common/scripting/core/imports.cpp
View file

@ -198,8 +198,8 @@ void InitImports()
{
assert(afunc->VMPointer != NULL);
*(afunc->VMPointer) = new VMNativeFunction(afunc->Function, afunc->FuncName);
(*(afunc->VMPointer))->QualifiedName = ClassDataAllocator.Strdup(FStringf("%s.%s", afunc->ClassName + 1, afunc->FuncName));
(*(afunc->VMPointer))->PrintableName = ClassDataAllocator.Strdup(FStringf("%s.%s [Native]", afunc->ClassName+1, afunc->FuncName));
(*(afunc->VMPointer))->QualifiedName = ClassDataAllocator.Strdup(FStringf("%s.%s", afunc->ClassName + 1, afunc->FuncName).GetChars());
(*(afunc->VMPointer))->PrintableName = ClassDataAllocator.Strdup(FStringf("%s.%s [Native]", afunc->ClassName+1, afunc->FuncName).GetChars());
(*(afunc->VMPointer))->DirectNativeCall = afunc->DirectNative;
AFTable.Push(*afunc);
});

4
source/common/scripting/interface/stringformat.cpp
View file

@ -408,13 +408,13 @@ DEFINE_ACTION_FUNCTION_NATIVE(FStringStruct, ByteAt, StringByteAt)
static void StringFilter(FString *self, FString *result)
{
*result = strbin1(*self);
*result = strbin1(self->GetChars());
}
DEFINE_ACTION_FUNCTION_NATIVE(FStringStruct, Filter, StringFilter)
{
PARAM_SELF_STRUCT_PROLOGUE(FString);
ACTION_RETURN_STRING(strbin1(*self));
ACTION_RETURN_STRING(strbin1(self->GetChars()));
}
static int StringIndexOf(FString *self, const FString &substr, int startIndex)

2
source/common/scripting/jit/jit_move.cpp
View file

@ -58,7 +58,7 @@ static int CastS2I(FString *b) { return (int)b->ToLong(); }
static double CastS2F(FString *b) { return b->ToDouble(); }
static int CastS2N(FString *b) { return b->Len() == 0 ? NAME_None : FName(*b).GetIndex(); }
static void CastN2S(FString *a, int b) { FName name = FName(ENamedName(b)); *a = name.IsValidName() ? name.GetChars() : ""; }
static int CastS2Co(FString *b) { return V_GetColor(*b); }
static int CastS2Co(FString *b) { return V_GetColor(b->GetChars()); }
static void CastCo2S(FString *a, int b) { PalEntry c(b); a->Format("%02x %02x %02x", c.r, c.g, c.b); }
static int CastS2So(FString *b) { return S_FindSound(*b).index(); }
static void CastSo2S(FString* a, int b) { *a = soundEngine->GetSoundName(FSoundID::fromInt(b)); }

2
source/common/startscreen/endoom.cpp
View file

@ -153,7 +153,7 @@ int RunEndoom()
return 0;
}
int endoom_lump = fileSystem.CheckNumForFullName (endoomName, true);
int endoom_lump = fileSystem.CheckNumForFullName (endoomName.GetChars(), true);
if (endoom_lump < 0 || fileSystem.FileLength (endoom_lump) != 4000)
{

6
source/common/startscreen/startscreen.cpp
View file

@ -570,8 +570,8 @@ void FStartScreen::CreateHeader()
fcolor.rgbBlue = BPART(GameStartupInfo.FgColor);
fcolor.rgbReserved = 255;
ClearBlock(HeaderBitmap, bcolor, 0, 0, HeaderBitmap.GetWidth(), HeaderBitmap.GetHeight());
int textlen = SizeOfText(GameStartupInfo.Name);
DrawString(HeaderBitmap, (HeaderBitmap.GetWidth() >> 4) - (textlen >> 1), 0.5, GameStartupInfo.Name, fcolor, bcolor);
int textlen = SizeOfText(GameStartupInfo.Name.GetChars());
DrawString(HeaderBitmap, (HeaderBitmap.GetWidth() >> 4) - (textlen >> 1), 0.5, GameStartupInfo.Name.GetChars(), fcolor, bcolor);
NetBitmap.Create(StartupBitmap.GetWidth() * Scale, 16);
}
@ -588,7 +588,7 @@ void FStartScreen::DrawNetStatus(int found, int total)
RgbQuad black = { 0, 0, 0, 255 };
RgbQuad gray = { 100, 100, 100, 255 };
ClearBlock(NetBitmap, black, 0, NetBitmap.GetHeight() - 16, NetBitmap.GetWidth(), 16);
DrawString(NetBitmap, 0, 0, NetMessageString, gray, black);
DrawString(NetBitmap, 0, 0, NetMessageString.GetChars(), gray, black);
char of[10];
mysnprintf(of, 10, "%d/%d", found, total);
int siz = SizeOfText(of);

4
source/common/textures/gametexture.cpp
View file

@ -182,7 +182,7 @@ void FGameTexture::AddAutoMaterials()
if (this->*(layer.pointer) == nullptr) // only if no explicit assignment had been done.
{
FStringf lookup("%s%s%s", layer.path, fullname ? "" : "auto/", searchname.GetChars());
auto lump = fileSystem.CheckNumForFullName(lookup, false, FileSys::ns_global, true);
auto lump = fileSystem.CheckNumForFullName(lookup.GetChars(), false, FileSys::ns_global, true);
if (lump != -1)
{
auto bmtex = TexMan.FindGameTexture(fileSystem.GetFileFullName(lump), ETextureType::Any, FTextureManager::TEXMAN_TryAny);
@ -199,7 +199,7 @@ void FGameTexture::AddAutoMaterials()
if (!this->Layers || this->Layers.get()->*(layer.pointer) == nullptr) // only if no explicit assignment had been done.
{
FStringf lookup("%s%s%s", layer.path, fullname ? "" : "auto/", searchname.GetChars());
auto lump = fileSystem.CheckNumForFullName(lookup, false, FileSys::ns_global, true);
auto lump = fileSystem.CheckNumForFullName(lookup.GetChars(), false, FileSys::ns_global, true);
if (lump != -1)
{
auto bmtex = TexMan.FindGameTexture(fileSystem.GetFileFullName(lump), ETextureType::Any, FTextureManager::TEXMAN_TryAny);

8
source/common/textures/multipatchtexturebuilder.cpp
View file

@ -137,7 +137,7 @@ struct FPatchLookup
void FMultipatchTextureBuilder::MakeTexture(BuildInfo &buildinfo, ETextureType usetype)
{
buildinfo.texture = new FGameTexture(nullptr, buildinfo.Name);
buildinfo.texture = new FGameTexture(nullptr, buildinfo.Name.GetChars());
buildinfo.texture->SetUseType(usetype);
buildinfo.texture->SetSize(buildinfo.Width, buildinfo.Height);
buildinfo.texture->SetOffsets(0, buildinfo.LeftOffset[0], buildinfo.TopOffset[0]); // These are needed for construction of other multipatch textures.
@ -373,7 +373,7 @@ void FMultipatchTextureBuilder::AddTexturesLump(const void *lumpdata, int lumpsi
int j;
for (j = (int)TexMan.NumTextures() - 1; j >= firstdup; --j)
{
if (strnicmp(TexMan.GameByIndex(j)->GetName(), (const char *)maptex + offset, 8) == 0)
if (strnicmp(TexMan.GameByIndex(j)->GetName().GetChars(), (const char *)maptex + offset, 8) == 0)
break;
}
if (j + 1 == firstdup)
@ -778,11 +778,11 @@ void FMultipatchTextureBuilder::ResolvePatches(BuildInfo &buildinfo)
{
for (unsigned i = 0; i < buildinfo.Inits.Size(); i++)
{
FTextureID texno = TexMan.CheckForTexture(buildinfo.Inits[i].TexName, buildinfo.Inits[i].UseType);
FTextureID texno = TexMan.CheckForTexture(buildinfo.Inits[i].TexName.GetChars(), buildinfo.Inits[i].UseType);
if (texno == buildinfo.texture->GetID()) // we found ourselves. Try looking for another one with the same name which is not a multipatch texture itself.
{
TArray<FTextureID> list;
TexMan.ListTextures(buildinfo.Inits[i].TexName, list, true);
TexMan.ListTextures(buildinfo.Inits[i].TexName.GetChars(), list, true);
for (int ii = list.Size() - 1; ii >= 0; ii--)
{
auto gtex = TexMan.GetGameTexture(list[ii]);

20
source/common/textures/texturemanager.cpp
View file

@ -178,7 +178,7 @@ FTextureID FTextureManager::CheckForTexture (const char *name, ETextureType uset
auto tex = Textures[i].Texture;
if (stricmp (tex->GetName(), name) == 0 )
if (tex->GetName().CompareNoCase(name) == 0 )
{
// If we look for short names, we must ignore any long name texture.
if ((flags & TEXMAN_ShortNameOnly) && tex->isFullNameTexture())
@ -306,7 +306,7 @@ int FTextureManager::ListTextures (const char *name, TArray<FTextureID> &list, b
{
auto tex = Textures[i].Texture;
if (stricmp (tex->GetName(), name) == 0)
if (tex->GetName().CompareNoCase(name) == 0)
{
auto texUseType = tex->GetUseType();
// NULL textures must be ignored.
@ -422,7 +422,7 @@ FTextureID FTextureManager::AddGameTexture (FGameTexture *texture, bool addtohas
// Textures without name can't be looked for
if (addtohash && texture->GetName().IsNotEmpty())
{
bucket = int(MakeKey (texture->GetName()) % HASH_SIZE);
bucket = int(MakeKey (texture->GetName().GetChars()) % HASH_SIZE);
hash = HashFirst[bucket];
}
else
@ -460,7 +460,7 @@ FTextureID FTextureManager::CreateTexture (int lumpnum, ETextureType usetype)
auto fn = fileSystem.GetFileFullName(lumpnum);
str = ExtractFileBase(fn);
}
auto out = MakeGameTexture(CreateTextureFromLump(lumpnum, usetype == ETextureType::Flat), str, usetype);
auto out = MakeGameTexture(CreateTextureFromLump(lumpnum, usetype == ETextureType::Flat), str.GetChars(), usetype);
if (out != NULL)
{
@ -514,7 +514,7 @@ void FTextureManager::ReplaceTexture (FTextureID texid, FGameTexture *newtexture
auto oldtexture = Textures[index].Texture;
newtexture->SetName(oldtexture->GetName());
newtexture->SetName(oldtexture->GetName().GetChars());
newtexture->SetUseType(oldtexture->GetUseType());
Textures[index].Texture = newtexture;
newtexture->SetID(oldtexture->GetID());
@ -793,7 +793,7 @@ void FTextureManager::ParseTextureDef(int lump, FMultipatchTextureBuilder &build
if (lumpnum>=0)
{
auto newtex = MakeGameTexture(CreateTextureFromLump(lumpnum), src, ETextureType::Override);
auto newtex = MakeGameTexture(CreateTextureFromLump(lumpnum), src.GetChars(), ETextureType::Override);
if (newtex != NULL)
{
@ -801,7 +801,7 @@ void FTextureManager::ParseTextureDef(int lump, FMultipatchTextureBuilder &build
newtex->SetWorldPanning(true);
newtex->SetDisplaySize((float)width, (float)height);
FTextureID oldtex = TexMan.CheckForTexture(src, ETextureType::MiscPatch);
FTextureID oldtex = TexMan.CheckForTexture(src.GetChars(), ETextureType::MiscPatch);
if (oldtex.isValid())
{
ReplaceTexture(oldtex, newtex, true);
@ -1127,8 +1127,8 @@ void FTextureManager::AddLocalizedVariants()
}
if (tokens.Size() >= 2)
{
FString base = ExtractFileBase(tokens[0]);
FTextureID origTex = CheckForTexture(base, ETextureType::MiscPatch);
FString base = ExtractFileBase(tokens[0].GetChars());
FTextureID origTex = CheckForTexture(base.GetChars(), ETextureType::MiscPatch);
if (origTex.isValid())
{
FTextureID tex = CheckForTexture(entry.name, ETextureType::MiscPatch);
@ -1367,7 +1367,7 @@ FTextureID FTextureManager::GetFrontSkyLayer(FTextureID texid)
// But do not link the new texture into the hash chain!
auto itex = new FImageTexture(image);
itex->SetNoRemap0();
auto FrontSkyLayer = MakeGameTexture(itex, tex->GetName(), ETextureType::Wall);
auto FrontSkyLayer = MakeGameTexture(itex, tex->GetName().GetChars(), ETextureType::Wall);
FrontSkyLayer->SetUseType(tex->GetUseType());
texid = TexMan.AddGameTexture(FrontSkyLayer, false);
Textures[texidx].FrontSkyLayer = texid.GetIndex();

2
source/common/thirdparty/libsmackerdec/src/FileStream.cpp vendored
View file

@ -28,7 +28,7 @@ bool FileStream::Open(const char *fileName)
{
FString fixedname = fileName;
FixPathSeperator(fixedname);
file = fileSystem.OpenFileReader(fixedname);
file = fileSystem.OpenFileReader(fixedname.GetChars());
if (!file.isOpen())
{
// log error

2
source/common/utility/engineerrors.cpp
View file

@ -60,7 +60,7 @@ void I_DebugPrintf(const char *fmt,...)
va_end(args);
auto wstr = WideString(s);
auto wstr = WideString(s.GetChars());
OutputDebugStringW(wstr.c_str());
}
}

2
source/common/utility/m_argv.cpp
View file

@ -158,7 +158,7 @@ int FArgs::CheckParm(const char** check, int start) const
{
for (unsigned i = start; i < Argv.Size(); ++i)
{
if (0 == stricmp(check, Argv[i]))
if (0 == stricmp(check, Argv[i].GetChars()))
{
return i;
}

2
source/common/utility/memarena.cpp
View file

@ -342,7 +342,7 @@ FString *FSharedStringArena::Alloc(const FString &source)
unsigned int hash;
Node *strnode;
strnode = FindString(source, source.Len(), hash);
strnode = FindString(source.GetChars(), source.Len(), hash);
if (strnode == NULL)
{
strnode = (Node *)iAlloc(sizeof(Node));

2
source/common/utility/palette.cpp
View file

@ -759,7 +759,7 @@ int V_GetColor(const char* str, FScriptPosition* sc)
if (!string.IsEmpty())
{
res = V_GetColorFromString(string, sc);
res = V_GetColorFromString(string.GetChars(), sc);
}
else
{

4
source/common/utility/s_playlist.cpp
View file

@ -80,7 +80,7 @@ bool FPlayList::ChangeList (const char *path)
// For a .PLS file, skip anything that doesn't start with File[0-9]+=
if (pls)
{
if (strncmp(song, "File", 4) != 0)
if (strncmp(song.GetChars(), "File", 4) != 0)
{
continue;
}
@ -205,5 +205,5 @@ const char *FPlayList::GetSong (int position) const
if ((unsigned)position >= Songs.Size())
return NULL;
return Songs[position];
return Songs[position].GetChars();
}

2
source/common/utility/zstring.h
View file

@ -163,8 +163,6 @@ public:
explicit operator bool() = delete; // this is needed to render the operator const char * ineffective when used in boolean constructs.
bool operator !() = delete;
operator const char *() const { return Chars; }
const char *GetChars() const { return Chars; }
const char &operator[] (int index) const { return Chars[index]; }