Modernize project codebase (#906)
* 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 * Add safety checks and fix a issue with vector going OOR
This commit is contained in:
@@ -11,7 +11,7 @@ UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void *_initData, UILaye
|
||||
// Setup all the Iggy references we need for this scene
|
||||
initialiseMovie();
|
||||
|
||||
m_signInInfo = *((SignInInfo *)_initData);
|
||||
m_signInInfo = *static_cast<SignInInfo *>(_initData);
|
||||
|
||||
m_bIgnoreInput = false;
|
||||
|
||||
@@ -167,7 +167,7 @@ int UIScene_QuadrantSignin::SignInReturned(void *pParam,bool bContinue, int iPad
|
||||
{
|
||||
app.DebugPrintf("SignInReturned for pad %d\n", iPad);
|
||||
|
||||
UIScene_QuadrantSignin *pClass = (UIScene_QuadrantSignin *)pParam;
|
||||
UIScene_QuadrantSignin *pClass = static_cast<UIScene_QuadrantSignin *>(pParam);
|
||||
|
||||
#ifdef _XBOX_ONE
|
||||
if(bContinue && pClass->m_signInInfo.requireOnline && ProfileManager.IsSignedIn(iPad))
|
||||
@@ -264,7 +264,7 @@ void UIScene_QuadrantSignin::setControllerState(int iPad, EControllerStatus stat
|
||||
value[0].number = iPad;
|
||||
|
||||
value[1].type = IGGY_DATATYPE_number;
|
||||
value[1].number = (int)state;
|
||||
value[1].number = static_cast<int>(state);
|
||||
|
||||
IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetControllerStatus , 2 , value );
|
||||
}
|
||||
@@ -272,9 +272,9 @@ void UIScene_QuadrantSignin::setControllerState(int iPad, EControllerStatus stat
|
||||
|
||||
int UIScene_QuadrantSignin::AvatarReturned(LPVOID lpParam,PBYTE pbThumbnail,DWORD dwThumbnailBytes)
|
||||
{
|
||||
UIScene_QuadrantSignin *pClass = (UIScene_QuadrantSignin *)lpParam;
|
||||
UIScene_QuadrantSignin *pClass = static_cast<UIScene_QuadrantSignin *>(lpParam);
|
||||
app.DebugPrintf(app.USER_SR,"AvatarReturned callback\n");
|
||||
if(pbThumbnail != NULL)
|
||||
if(pbThumbnail != nullptr)
|
||||
{
|
||||
// 4J-JEV - Added to ensure each new texture gets a unique name.
|
||||
static unsigned int quadrantImageCount = 0;
|
||||
|
||||
Reference in New Issue
Block a user