LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-17 17:28:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: unglob everything else and make it build

Browse Source
This commit is contained in:
Tropical
2026-03-06 21:06:31 -06:00
parent 04ff82ba70
commit e0479e90b4
114 changed files with 237 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Minecraft.Client/Build/Common/Tutorial/Tutorial.cpp
View File

@@ -1380,7 +1380,7 @@ void Tutorial::tick()
while(itCon != constraintsToRemove[m_CurrentState].end() )
{
constraints[e_Tutorial_State_Gameplay].push_back(itCon->first);
constraintsToRemove[e_Tutorial_State_Gameplay].push_back( pair<TutorialConstraint *, unsigned char>(itCon->first, itCon->second) );
constraintsToRemove[e_Tutorial_State_Gameplay].push_back( std::pair<TutorialConstraint *, unsigned char>(itCon->first, itCon->second) );
constraints[m_CurrentState].erase( find( constraints[m_CurrentState].begin(), constraints[m_CurrentState].end(), itCon->first) );
itCon = constraintsToRemove[m_CurrentState].erase(itCon);
@@ -2024,7 +2024,7 @@ void Tutorial::RemoveConstraint(TutorialConstraint *c, bool delayedRemove /*= fa
else if(delayedRemove)
{
c->setQueuedForRemoval(true);
constraintsToRemove[m_CurrentState].push_back( pair<TutorialConstraint *, unsigned char>(c, 0) );
constraintsToRemove[m_CurrentState].push_back( std::pair<TutorialConstraint *, unsigned char>(c, 0) );
}
else
{

2
Minecraft.Client/Build/Common/Tutorial/Tutorial.h
View File

@@ -81,7 +81,7 @@ protected:
std::unordered_map<int, TutorialMessage *> messages;
std::vector<TutorialConstraint *> m_globalConstraints;
std::vector<TutorialConstraint *> constraints[e_Tutorial_State_Max];
std::vector< pair<TutorialConstraint *, unsigned char> > constraintsToRemove[e_Tutorial_State_Max];
std::vector< std::pair<TutorialConstraint *, unsigned char> > constraintsToRemove[e_Tutorial_State_Max];
std::vector<TutorialTask *> tasks; // We store a copy of the tasks for the main gameplay tutorial so that we could display an overview menu
std::vector<TutorialTask *> activeTasks[e_Tutorial_State_Max];
std::vector<TutorialHint *> hints[e_Tutorial_State_Max];