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:
@@ -139,9 +139,9 @@ public:
|
||||
bool getCompleted( int completableId );
|
||||
|
||||
#ifdef _XBOX
|
||||
void changeTutorialState(eTutorial_State newState, CXuiScene *scene = NULL);
|
||||
void changeTutorialState(eTutorial_State newState, CXuiScene *scene = nullptr);
|
||||
#else
|
||||
void changeTutorialState(eTutorial_State newState, UIScene *scene = NULL);
|
||||
void changeTutorialState(eTutorial_State newState, UIScene *scene = nullptr);
|
||||
#endif
|
||||
bool isSelectedItemState();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user