1
0

Merging r6405 through r6424 from trunk to ogl-es branch

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6425 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2022-09-22 21:55:03 +00:00
parent ddc14ea87e
commit 07f17647d2
46 changed files with 589 additions and 463 deletions

View File

@@ -203,7 +203,7 @@ CIrrDeviceSDL::CIrrDeviceSDL(const SIrrlichtCreationParameters& param)
#endif
SDL_INIT_NOPARACHUTE ) < 0)
{
os::Printer::log( "Unable to initialize SDL!", SDL_GetError());
os::Printer::log("Unable to initialize SDL!", SDL_GetError());
Close = true;
}
else
@@ -429,7 +429,7 @@ bool CIrrDeviceSDL::createWindow()
}
if ( !Screen )
{
os::Printer::log( "Could not initialize display!" );
os::Printer::log("Could not initialize display!" );
return false;
}
@@ -618,7 +618,7 @@ bool CIrrDeviceSDL::run()
else
{
irrevent.MouseInput.Event = irr::EMIE_RMOUSE_LEFT_UP;
MouseButtonStates &= !irr::EMBSM_RIGHT;
MouseButtonStates &= ~irr::EMBSM_RIGHT;
}
break;
@@ -631,7 +631,7 @@ bool CIrrDeviceSDL::run()
else
{
irrevent.MouseInput.Event = irr::EMIE_MMOUSE_LEFT_UP;
MouseButtonStates &= !irr::EMBSM_MIDDLE;
MouseButtonStates &= ~irr::EMBSM_MIDDLE;
}
break;