Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Minecraft.Client/Options.cpp
View File

@@ -76,7 +76,7 @@ bool Options::Option::isBoolean() const
int Options::Option::getId() const
{
return static_cast<int>(this - options);
return (int)(this-options);
}
wstring Options::Option::getCaptionId() const
@@ -152,8 +152,8 @@ void Options::init()
keyMappings[12] = keyPickItem;
keyMappings[13] = keyToggleFog;
minecraft = nullptr;
//optionsFile = nullptr;
minecraft = NULL;
//optionsFile = NULL;
difficulty = 2;
hideGui = false;
@@ -417,12 +417,12 @@ void Options::load()
BufferedReader *br = new BufferedReader(new InputStreamReader( new FileInputStream( optionsFile ) ) );
wstring line = L"";
while ((line = br->readLine()) != L"") // 4J - was check against nullptr - do we need to distinguish between empty lines and a fail here?
while ((line = br->readLine()) != L"") // 4J - was check against NULL - do we need to distinguish between empty lines and a fail here?
{
// 4J - removed try/catch
// try {
wstring cmds[2];
size_t splitpos = line.find(L":");
int splitpos = (int)line.find(L":");
if( splitpos == wstring::npos )
{
cmds[0] = line;