Skip to content

Commit cbbccdf

Browse files
committed
xrEngine/EngineAPI.cpp: no longer need to copy renderer mode strings
Libraries aren't unloaded anymore after f351ad4
1 parent f0bb812 commit cbbccdf

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/xrEngine/EngineAPI.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "XR_IOConsole.h"
1010

1111
#include "xrCore/xr_token.h"
12-
#include "xrCore/ModuleLookup.hpp"
1312

1413
#include "xrScriptEngine/ScriptExporter.hpp"
1514

@@ -72,7 +71,7 @@ void CEngineAPI::SelectRenderer()
7271
if (renderer->CheckGameRequirements())
7372
{
7473
selectedRenderer = renderer;
75-
selected_mode = mode.c_str();
74+
selected_mode = mode;
7675
string64 buf;
7776
xr_sprintf(buf, "renderer %s", selected_mode);
7877
Console->Execute(buf);
@@ -143,10 +142,8 @@ void CEngineAPI::CreateRendererList(const std::array<RendererModule*, 2>& module
143142
VERIFY3(false, "Renderer mode duplicate. Skipping.", mode);
144143
continue;
145144
}
146-
// mode string will be freed after library unloading, copy.
147-
shared_str copiedMode = mode;
148145
renderModes[mode] = module;
149-
VidQualityToken.emplace_back(copiedMode.c_str(), modeIndex);
146+
VidQualityToken.emplace_back(mode, modeIndex);
150147
}
151148

152149
return true;

src/xrEngine/EngineAPI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class XR_NOVTABLE RendererModule
6262

6363
class ENGINE_API CEngineAPI
6464
{
65-
xr_map<shared_str, RendererModule*> renderModes;
65+
xr_map<cpcstr, RendererModule*> renderModes;
6666

6767
GameModule* gameModule{};
6868
RendererModule* selectedRenderer{};

0 commit comments

Comments
 (0)