man this tutorial level is really screwed up
todo??: - fix the id system [days since the universe was created is NOT a valid id] - fix literally everything else although thats probably caused by the discrepancy above
This commit is contained in:
@@ -40,6 +40,9 @@ bool ChoiceTask::isCompleted()
|
||||
return false;
|
||||
|
||||
int xboxPad = pMinecraft->player->GetXboxPad();
|
||||
int tutorialPad = tutorial->getPad();
|
||||
bool hasValidPad = (tutorialPad >= 0 && tutorialPad < XUSER_MAX_COUNT);
|
||||
bool menuDisplayed = hasValidPad && ui.GetMenuDisplayed(tutorialPad);
|
||||
|
||||
if( m_bConfirmMappingComplete || m_bCancelMappingComplete )
|
||||
{
|
||||
@@ -48,14 +51,10 @@ bool ChoiceTask::isCompleted()
|
||||
return true;
|
||||
}
|
||||
|
||||
if(ui.GetMenuDisplayed(tutorial->getPad()))
|
||||
{
|
||||
// If a menu is displayed, then we use the handleUIInput to complete the task
|
||||
}
|
||||
else
|
||||
if(!menuDisplayed)
|
||||
{
|
||||
// If the player is under water then allow all keypresses so they can jump out
|
||||
if (pMinecraft->localplayers[tutorial->getPad()]->isUnderLiquid(Material::water)) return false;
|
||||
if (hasValidPad && pMinecraft->localplayers[tutorialPad] != nullptr && pMinecraft->localplayers[tutorialPad]->isUnderLiquid(Material::water)) return false;
|
||||
#ifdef _WINDOWS64
|
||||
if (!m_bConfirmMappingComplete &&
|
||||
(InputManager.GetValue(xboxPad, m_iConfirmMapping) > 0
|
||||
@@ -85,8 +84,9 @@ bool ChoiceTask::isCompleted()
|
||||
sendTelemetry();
|
||||
enableConstraints(false, true);
|
||||
}
|
||||
return m_bConfirmMappingComplete || m_bCancelMappingComplete;
|
||||
}
|
||||
|
||||
return m_bConfirmMappingComplete || m_bCancelMappingComplete;
|
||||
}
|
||||
|
||||
eTutorial_CompletionAction ChoiceTask::getCompletionAction()
|
||||
|
||||
Reference in New Issue
Block a user