mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-08-20 09:57:10 +00:00
fix(jui): mouse unlocking while in a screen
This commit is contained in:
parent
3310481ca3
commit
f6e151265c
|
|
@ -597,29 +597,18 @@ void Minecraft::setScreen(Screen* screen) {
|
||||||
|
|
||||||
// 4J-PB - if a screen has been set, go into menu mode
|
// 4J-PB - if a screen has been set, go into menu mode
|
||||||
// it's possible that player doesn't exist here yet
|
// it's possible that player doesn't exist here yet
|
||||||
/*if(screen!=NULL)
|
// 4jcraft: reuse this for the java GUI
|
||||||
{
|
#ifdef ENABLE_JAVA_GUIS
|
||||||
if(player && player->GetXboxPad()!=-1)
|
if (screen != NULL && player != NULL) {
|
||||||
{
|
if (player && player->GetXboxPad() != -1) {
|
||||||
InputManager.SetMenuDisplayed(player->GetXboxPad(),true);
|
InputManager.SetMenuDisplayed(player->GetXboxPad(), true);
|
||||||
|
}
|
||||||
|
} else if (player != NULL) {
|
||||||
|
if (player && player->GetXboxPad() != -1) {
|
||||||
|
InputManager.SetMenuDisplayed(player->GetXboxPad(), false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
#endif
|
||||||
{
|
|
||||||
// set all
|
|
||||||
//InputManager.SetMenuDisplayed(XUSER_INDEX_ANY,true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if(player && player->GetXboxPad()!=-1)
|
|
||||||
{
|
|
||||||
InputManager.SetMenuDisplayed(player->GetXboxPad(),false);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
//InputManager.SetMenuDisplayed(XUSER_INDEX_ANY,false);
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Minecraft::checkGlError(const std::wstring& string) {
|
void Minecraft::checkGlError(const std::wstring& string) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue