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:
@@ -48,8 +48,8 @@ UIScene_EULA::UIScene_EULA(int iPad, void *initData, UILayer *parentLayer) : UIS
|
||||
#endif
|
||||
|
||||
vector<wstring> paragraphs;
|
||||
int lastIndex = 0;
|
||||
for ( int index = EULA.find(L"\r\n", lastIndex, 2);
|
||||
size_t lastIndex = 0;
|
||||
for ( size_t index = EULA.find(L"\r\n", lastIndex, 2);
|
||||
index != wstring::npos;
|
||||
index = EULA.find(L"\r\n", lastIndex, 2)
|
||||
)
|
||||
@@ -132,7 +132,7 @@ void UIScene_EULA::handleInput(int iPad, int key, bool repeat, bool pressed, boo
|
||||
|
||||
void UIScene_EULA::handlePress(F64 controlId, F64 childId)
|
||||
{
|
||||
switch((int)controlId)
|
||||
switch(static_cast<int>(controlId))
|
||||
{
|
||||
case eControl_Confirm:
|
||||
//CD - Added for audio
|
||||
|
||||
Reference in New Issue
Block a user