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:
@@ -19,8 +19,8 @@ UIScene_NewUpdateMessage::UIScene_NewUpdateMessage(int iPad, void *initData, UIL
|
||||
message=app.FormatHTMLString(m_iPad,message);
|
||||
|
||||
vector<wstring> paragraphs;
|
||||
int lastIndex = 0;
|
||||
for ( int index = message.find(L"\r\n", lastIndex, 2);
|
||||
size_t lastIndex = 0;
|
||||
for ( size_t index = message.find(L"\r\n", lastIndex, 2);
|
||||
index != wstring::npos;
|
||||
index = message.find(L"\r\n", lastIndex, 2)
|
||||
)
|
||||
@@ -100,7 +100,7 @@ void UIScene_NewUpdateMessage::handleInput(int iPad, int key, bool repeat, bool
|
||||
|
||||
void UIScene_NewUpdateMessage::handlePress(F64 controlId, F64 childId)
|
||||
{
|
||||
switch((int)controlId)
|
||||
switch(static_cast<int>(controlId))
|
||||
{
|
||||
case eControl_Confirm:
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user