Project modernization (#630)

* Fixed boats falling and a TP glitch #266

* Replaced every C-style cast with C++ ones

* Replaced every C-style cast with C++ ones

* Fixed boats falling and a TP glitch #266

* Updated NULL to nullptr and fixing some type issues

* Modernized and fixed a few bugs

- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.

* Fixing more conflicts

* Replace int loops with size_t and start work on overrides
This commit is contained in:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 deletions

View File

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