TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move DbgAltTex to CArg

Browse source
This commit is contained in:
Kp 2015-12-24 04:01:28 +00:00
parent b0e0f48058
commit 0fb84b883f
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/include/args.h
View file

@ -119,6 +119,7 @@ struct CArg : prohibit_void_ptr<CArg>
std::string SysPilot;
std::string SysRecordDemoNameTemplate;
std::string MplUdpHostAddr;
std::string DbgAltTex;
std::string DbgTexMap;
};
extern CArg CGameArg;
@ -148,7 +149,6 @@ struct Arg : prohibit_void_ptr<Arg>
bool EdiSaveHoardData;
bool EdiMacData; // also used for some read routines in non-editor build
#endif
std::string DbgAltTex;
};
extern struct Arg GameArg;

4
similar/main/text.cpp
View file

@ -214,8 +214,8 @@ void load_text()
};
#endif
if (!GameArg.DbgAltTex.empty())
filename = GameArg.DbgAltTex.c_str();
if (!CGameArg.DbgAltTex.empty())
filename = CGameArg.DbgAltTex.c_str();
auto tfile = PHYSFSX_openReadBuffered(filename);
if (!tfile)

2
similar/misc/args.cpp
View file

@ -356,7 +356,7 @@ static void ReadCmdArgs(Inilist &ini, Arglist &Args)
else if (!d_stricmp(p, "-renderstats"))
CGameArg.DbgRenderStats = true;
else if (!d_stricmp(p, "-text"))
GameArg.DbgAltTex = arg_string(pp, end);
CGameArg.DbgAltTex = arg_string(pp, end);
else if (!d_stricmp(p, "-tmap"))
CGameArg.DbgTexMap = arg_string(pp, end);
else if (!d_stricmp(p, "-showmeminfo"))