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

Merge pull request #71 from 4jcraft/refactor/no-std-wildcard

Browse Source 
refactor: remove `using namespace std`
This commit is contained in:
Tropical
2026-03-08 10:09:33 -05:00
committed by GitHub
parent a508412246 06ca3c6b78
commit 43a28fc490
1972 changed files with 11580 additions and 11580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Minecraft.Client/Build/Common/Tutorial/AreaTask.cpp
View File

@@ -2,7 +2,7 @@
#include "Tutorial.h"
#include "AreaTask.h"
AreaTask::AreaTask(eTutorial_State state, Tutorial *tutorial, vector<TutorialConstraint *> *inConstraints, int descriptionId, EAreaTaskCompletionStates completionState)
AreaTask::AreaTask(eTutorial_State state, Tutorial *tutorial, std::vector<TutorialConstraint *> *inConstraints, int descriptionId, EAreaTaskCompletionStates completionState)
: TutorialTask( tutorial, descriptionId, false, inConstraints, false, false, false )
{
m_tutorialState = state;

4
Minecraft.Client/Build/Common/Tutorial/AreaTask.h
View File

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "TutorialTask.h"
@@ -16,7 +16,7 @@ private:
EAreaTaskCompletionStates m_completionState;
eTutorial_State m_tutorialState;
public:
AreaTask(eTutorial_State state, Tutorial *tutorial, vector<TutorialConstraint *> *inConstraints, int descriptionId = -1, EAreaTaskCompletionStates completionState = eAreaTaskCompletion_CompleteOnActivation);
AreaTask(eTutorial_State state, Tutorial *tutorial, std::vector<TutorialConstraint *> *inConstraints, int descriptionId = -1, EAreaTaskCompletionStates completionState = eAreaTaskCompletion_CompleteOnActivation);
virtual bool isCompleted();
virtual void setAsCurrentTask(bool active = true);
virtual void onStateChange(eTutorial_State newState);

12
Minecraft.Client/Build/Common/Tutorial/ChangeStateConstraint.cpp
View File

@@ -60,10 +60,10 @@ void ChangeStateConstraint::tick(int iPad)
{
// Send update settings packet to server
Minecraft *pMinecraft = Minecraft::GetInstance();
shared_ptr<MultiplayerLocalPlayer> player = minecraft->localplayers[iPad];
std::shared_ptr<MultiplayerLocalPlayer> player = minecraft->localplayers[iPad];
if(player != NULL && player->connection && player->connection->getNetworkPlayer() != NULL)
{
player->connection->send( shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs) ) );
player->connection->send( std::shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs) ) );
}
}
}
@@ -101,10 +101,10 @@ void ChangeStateConstraint::tick(int iPad)
{
// Send update settings packet to server
Minecraft *pMinecraft = Minecraft::GetInstance();
shared_ptr<MultiplayerLocalPlayer> player = minecraft->localplayers[iPad];
std::shared_ptr<MultiplayerLocalPlayer> player = minecraft->localplayers[iPad];
if(player != NULL && player->connection && player->connection->getNetworkPlayer() != NULL)
{
player->connection->send( shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs) ) );
player->connection->send( std::shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs) ) );
}
}
}
@@ -125,10 +125,10 @@ void ChangeStateConstraint::tick(int iPad)
{
// Send update settings packet to server
Minecraft *pMinecraft = Minecraft::GetInstance();
shared_ptr<MultiplayerLocalPlayer> player = minecraft->localplayers[iPad];
std::shared_ptr<MultiplayerLocalPlayer> player = minecraft->localplayers[iPad];
if(player != NULL && player->connection && player->connection->getNetworkPlayer() != NULL)
{
player->connection->send( shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs) ) );
player->connection->send( std::shared_ptr<PlayerInfoPacket>( new PlayerInfoPacket( player->connection->getNetworkPlayer()->GetSmallId(), -1, playerPrivs) ) );
}
}
}

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

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "TutorialTask.h"

2
Minecraft.Client/Build/Common/Tutorial/CompleteUsingItemTask.cpp
View File

@@ -23,7 +23,7 @@ bool CompleteUsingItemTask::isCompleted()
return bIsCompleted;
}
void CompleteUsingItemTask::completeUsingItem(shared_ptr<ItemInstance> item)
void CompleteUsingItemTask::completeUsingItem(std::shared_ptr<ItemInstance> item)
{
if(!hasBeenActivated() && !isPreCompletionEnabled()) return;
for(int i=0;i<m_iValidItemsCount;i++)

4
Minecraft.Client/Build/Common/Tutorial/CompleteUsingItemTask.h
View File

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "TutorialTask.h"
@@ -16,5 +16,5 @@ public:
CompleteUsingItemTask(Tutorial *tutorial, int descriptionId, int itemIds[], unsigned int itemIdsLength, bool enablePreCompletion = false);
virtual ~CompleteUsingItemTask();
virtual bool isCompleted();
virtual void completeUsingItem(shared_ptr<ItemInstance> item);
virtual void completeUsingItem(std::shared_ptr<ItemInstance> item);
};

6
Minecraft.Client/Build/Common/Tutorial/ControllerTask.h
View File

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "TutorialTask.h"
@@ -7,8 +7,8 @@ using namespace std;
class ControllerTask : public TutorialTask
{
private:
unordered_map<int, bool> completedMappings;
unordered_map<int, bool> southpawCompletedMappings;
std::unordered_map<int, bool> completedMappings;
std::unordered_map<int, bool> southpawCompletedMappings;
bool m_bHasSouthpaw;
unsigned int m_uiCompletionMask;
int *m_iCompletionMaskA;

6
Minecraft.Client/Build/Common/Tutorial/CraftTask.cpp
View File

@@ -3,7 +3,7 @@
#include "../../../../Minecraft.World/Headers/net.minecraft.world.item.h"
CraftTask::CraftTask( int itemId, int auxValue, int quantity,
Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, vector<TutorialConstraint *> *inConstraints /*= NULL*/,
Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, std::vector<TutorialConstraint *> *inConstraints /*= NULL*/,
bool bShowMinimumTime /*=false*/, bool bAllowFade /*=true*/, bool m_bTaskReminders /*=true*/ )
: TutorialTask(tutorial, descriptionId, enablePreCompletion, inConstraints, bShowMinimumTime, bAllowFade, m_bTaskReminders ),
m_quantity( quantity ),
@@ -17,7 +17,7 @@ CraftTask::CraftTask( int itemId, int auxValue, int quantity,
}
CraftTask::CraftTask( int *items, int *auxValues, int numItems, int quantity,
Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, vector<TutorialConstraint *> *inConstraints /*= NULL*/,
Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, std::vector<TutorialConstraint *> *inConstraints /*= NULL*/,
bool bShowMinimumTime /*=false*/, bool bAllowFade /*=true*/, bool m_bTaskReminders /*=true*/ )
: TutorialTask(tutorial, descriptionId, enablePreCompletion, inConstraints, bShowMinimumTime, bAllowFade, m_bTaskReminders ),
m_quantity( quantity ),
@@ -40,7 +40,7 @@ CraftTask::~CraftTask()
delete[] m_auxValues;
}
void CraftTask::onCrafted(shared_ptr<ItemInstance> item)
void CraftTask::onCrafted(std::shared_ptr<ItemInstance> item)
{
#ifndef _CONTENT_PACKAGE
wprintf(L"CraftTask::onCrafted - %ls\n", item->toString().c_str() );

6
Minecraft.Client/Build/Common/Tutorial/CraftTask.h
View File

@@ -5,16 +5,16 @@ class CraftTask : public TutorialTask
{
public:
CraftTask( int itemId, int auxValue, int quantity,
Tutorial *tutorial, int descriptionId, bool enablePreCompletion = true, vector<TutorialConstraint *> *inConstraints = NULL,
Tutorial *tutorial, int descriptionId, bool enablePreCompletion = true, std::vector<TutorialConstraint *> *inConstraints = NULL,
bool bShowMinimumTime=false, bool bAllowFade=true, bool m_bTaskReminders=true );
CraftTask( int *items, int *auxValues, int numItems, int quantity,
Tutorial *tutorial, int descriptionId, bool enablePreCompletion = true, vector<TutorialConstraint *> *inConstraints = NULL,
Tutorial *tutorial, int descriptionId, bool enablePreCompletion = true, std::vector<TutorialConstraint *> *inConstraints = NULL,
bool bShowMinimumTime=false, bool bAllowFade=true, bool m_bTaskReminders=true );
~CraftTask();
virtual bool isCompleted() { return bIsCompleted; }
virtual void onCrafted(shared_ptr<ItemInstance> item);
virtual void onCrafted(std::shared_ptr<ItemInstance> item);
private:
int *m_items;

6
Minecraft.Client/Build/Common/Tutorial/DiggerItemHint.cpp
View File

@@ -20,7 +20,7 @@ DiggerItemHint::DiggerItemHint(eTutorial_Hint id, Tutorial *tutorial, int descri
tutorial->addMessage(IDS_TUTORIAL_HINT_ATTACK_WITH_TOOL, true);
}
int DiggerItemHint::startDestroyBlock(shared_ptr<ItemInstance> item, Tile *tile)
int DiggerItemHint::startDestroyBlock(std::shared_ptr<ItemInstance> item, Tile *tile)
{
if(item != NULL)
{
@@ -46,7 +46,7 @@ int DiggerItemHint::startDestroyBlock(shared_ptr<ItemInstance> item, Tile *tile)
return -1;
}
int DiggerItemHint::attack(shared_ptr<ItemInstance> item, shared_ptr<Entity> entity)
int DiggerItemHint::attack(std::shared_ptr<ItemInstance> item, std::shared_ptr<Entity> entity)
{
if(item != NULL)
{
@@ -62,7 +62,7 @@ int DiggerItemHint::attack(shared_ptr<ItemInstance> item, shared_ptr<Entity> ent
if(itemFound)
{
// It's also possible that we could hit TileEntities (eg falling sand) so don't want to give this hint then
if( dynamic_pointer_cast<Mob>( entity ) != NULL )
if( std::dynamic_pointer_cast<Mob>( entity ) != NULL )
{
return IDS_TUTORIAL_HINT_ATTACK_WITH_TOOL;
}

4
Minecraft.Client/Build/Common/Tutorial/DiggerItemHint.h
View File

@@ -13,6 +13,6 @@ private:
public:
DiggerItemHint(eTutorial_Hint id, Tutorial *tutorial, int descriptionId, int items[], unsigned int itemsLength);
virtual int startDestroyBlock(shared_ptr<ItemInstance> item, Tile *tile);
virtual int attack(shared_ptr<ItemInstance> item, shared_ptr<Entity> entity);
virtual int startDestroyBlock(std::shared_ptr<ItemInstance> item, Tile *tile);
virtual int attack(std::shared_ptr<ItemInstance> item, std::shared_ptr<Entity> entity);
};

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

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "TutorialTask.h"

6
Minecraft.Client/Build/Common/Tutorial/FullTutorial.cpp
View File

@@ -159,7 +159,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"tutorialArea");
if(area != NULL)
{
vector<TutorialConstraint *> *areaConstraints = new vector<TutorialConstraint *>();
std::vector<TutorialConstraint *> *areaConstraints = new std::vector<TutorialConstraint *>();
areaConstraints->push_back( new AreaConstraint( IDS_TUTORIAL_CONSTRAINT_TUTORIAL_AREA, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
addTask(e_Tutorial_State_Gameplay, new AreaTask(e_Tutorial_State_Gameplay,this, areaConstraints) );
}
@@ -413,12 +413,12 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
AABB *exitArea = app.getGameRuleDefinitions()->getNamedArea(L"creativeExitArea");
if(exitArea != NULL)
{
vector<TutorialConstraint *> *creativeExitAreaConstraints = new vector<TutorialConstraint *>();
std::vector<TutorialConstraint *> *creativeExitAreaConstraints = new std::vector<TutorialConstraint *>();
creativeExitAreaConstraints->push_back( new AreaConstraint( -1, exitArea->x0,exitArea->y0,exitArea->z0,exitArea->x1,exitArea->y1,exitArea->z1,true,false) );
creativeFinalTask->AddTask( new AreaTask(e_Tutorial_State_CreativeMode, this, creativeExitAreaConstraints,IDS_TUTORIAL_TASK_CREATIVE_EXIT,AreaTask::eAreaTaskCompletion_CompleteOnConstraintsSatisfied) );
}
vector<TutorialConstraint *> *creativeAreaConstraints = new vector<TutorialConstraint *>();
std::vector<TutorialConstraint *> *creativeAreaConstraints = new std::vector<TutorialConstraint *>();
creativeAreaConstraints->push_back( new AreaConstraint( IDS_TUTORIAL_CONSTRAINT_TUTORIAL_AREA, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
creativeFinalTask->AddTask( new AreaTask(e_Tutorial_State_CreativeMode, this, creativeAreaConstraints) );

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

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "TutorialTask.h"

4
Minecraft.Client/Build/Common/Tutorial/InfoTask.h
View File

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "TutorialTask.h"
@@ -7,7 +7,7 @@ using namespace std;
class InfoTask : public TutorialTask
{
private:
unordered_map<int, bool> completedMappings;
std::unordered_map<int, bool> completedMappings;
ETelemetryChallenges m_eTelemetryEvent;

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

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "../../../../Minecraft.World/Util/Class.h"
#include "TutorialHint.h"

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

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "TutorialHint.h"

2
Minecraft.Client/Build/Common/Tutorial/PickupTask.cpp
View File

@@ -1,7 +1,7 @@
#include "../../../../Minecraft.World/Build/stdafx.h"
#include "PickupTask.h"
void PickupTask::onTake(shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux)
void PickupTask::onTake(std::shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux)
{
if(item->id == m_itemId)
{

6
Minecraft.Client/Build/Common/Tutorial/PickupTask.h
View File

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "TutorialTask.h"
class ItemInstance;
@@ -8,7 +8,7 @@ class PickupTask : public TutorialTask
{
public:
PickupTask( int itemId, unsigned int quantity, int auxValue,
Tutorial *tutorial, int descriptionId, bool enablePreCompletion = true, vector<TutorialConstraint *> *inConstraints = NULL,
Tutorial *tutorial, int descriptionId, bool enablePreCompletion = true, std::vector<TutorialConstraint *> *inConstraints = NULL,
bool bShowMinimumTime=false, bool bAllowFade=true, bool m_bTaskReminders=true )
: TutorialTask(tutorial, descriptionId, enablePreCompletion, inConstraints, bShowMinimumTime, bAllowFade, m_bTaskReminders ),
m_itemId( itemId),
@@ -17,7 +17,7 @@ public:
{}
virtual bool isCompleted() { return bIsCompleted; }
virtual void onTake(shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux);
virtual void onTake(std::shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux);
private:
int m_itemId;

8
Minecraft.Client/Build/Common/Tutorial/ProcedureCompoundTask.cpp
View File

@@ -111,7 +111,7 @@ bool ProcedureCompoundTask::isCompleted()
return allCompleted;
}
void ProcedureCompoundTask::onCrafted(shared_ptr<ItemInstance> item)
void ProcedureCompoundTask::onCrafted(std::shared_ptr<ItemInstance> item)
{
AUTO_VAR(itEnd, m_taskSequence.end());
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
@@ -222,7 +222,7 @@ bool ProcedureCompoundTask::AllowFade()
return allowFade;
}
void ProcedureCompoundTask::useItemOn(Level *level, shared_ptr<ItemInstance> item, int x, int y, int z,bool bTestUseOnly)
void ProcedureCompoundTask::useItemOn(Level *level, std::shared_ptr<ItemInstance> item, int x, int y, int z,bool bTestUseOnly)
{
AUTO_VAR(itEnd, m_taskSequence.end());
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
@@ -232,7 +232,7 @@ void ProcedureCompoundTask::useItemOn(Level *level, shared_ptr<ItemInstance> ite
}
}
void ProcedureCompoundTask::useItem(shared_ptr<ItemInstance> item, bool bTestUseOnly)
void ProcedureCompoundTask::useItem(std::shared_ptr<ItemInstance> item, bool bTestUseOnly)
{
AUTO_VAR(itEnd, m_taskSequence.end());
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)
@@ -242,7 +242,7 @@ void ProcedureCompoundTask::useItem(shared_ptr<ItemInstance> item, bool bTestUse
}
}
void ProcedureCompoundTask::onTake(shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux)
void ProcedureCompoundTask::onTake(std::shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux)
{
AUTO_VAR(itEnd, m_taskSequence.end());
for(AUTO_VAR(it, m_taskSequence.begin()); it < itEnd; ++it)

10
Minecraft.Client/Build/Common/Tutorial/ProcedureCompoundTask.h
View File

@@ -18,7 +18,7 @@ public:
virtual int getDescriptionId();
virtual int getPromptId();
virtual bool isCompleted();
virtual void onCrafted(shared_ptr<ItemInstance> item);
virtual void onCrafted(std::shared_ptr<ItemInstance> item);
virtual void handleUIInput(int iAction);
virtual void setAsCurrentTask(bool active = true);
virtual bool ShowMinimumTime();
@@ -26,11 +26,11 @@ public:
virtual void setShownForMinimumTime();
virtual bool AllowFade();
virtual void useItemOn(Level *level, shared_ptr<ItemInstance> item, int x, int y, int z, bool bTestUseOnly=false);
virtual void useItem(shared_ptr<ItemInstance> item, bool bTestUseOnly=false);
virtual void onTake(shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux);
virtual void useItemOn(Level *level, std::shared_ptr<ItemInstance> item, int x, int y, int z, bool bTestUseOnly=false);
virtual void useItem(std::shared_ptr<ItemInstance> item, bool bTestUseOnly=false);
virtual void onTake(std::shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux);
virtual void onStateChange(eTutorial_State newState);
private:
vector<TutorialTask *> m_taskSequence;
std::vector<TutorialTask *> m_taskSequence;
};

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

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "Tutorial.h"
#include "TutorialTask.h"

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

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "TutorialTask.h"

4
Minecraft.Client/Build/Common/Tutorial/StateChangeTask.h
View File

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "Tutorial.h"
#include "TutorialTask.h"
@@ -9,7 +9,7 @@ private:
eTutorial_State m_state;
public:
StateChangeTask(eTutorial_State state,
Tutorial *tutorial, int descriptionId = -1, bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = NULL,
Tutorial *tutorial, int descriptionId = -1, bool enablePreCompletion = false, std::vector<TutorialConstraint *> *inConstraints = NULL,
bool bShowMinimumTime=false, bool bAllowFade=true, bool m_bTaskReminders=true ) :
TutorialTask(tutorial, descriptionId, enablePreCompletion, inConstraints, bShowMinimumTime, bAllowFade, m_bTaskReminders ),
m_state( state )

2
Minecraft.Client/Build/Common/Tutorial/TakeItemHint.cpp
View File

@@ -17,7 +17,7 @@ TakeItemHint::TakeItemHint(eTutorial_Hint id, Tutorial *tutorial, int items[], u
}
}
bool TakeItemHint::onTake(shared_ptr<ItemInstance> item)
bool TakeItemHint::onTake(std::shared_ptr<ItemInstance> item)
{
if(item != NULL)
{

4
Minecraft.Client/Build/Common/Tutorial/TakeItemHint.h
View File

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "TutorialHint.h"
@@ -15,5 +15,5 @@ public:
TakeItemHint(eTutorial_Hint id, Tutorial *tutorial, int items[], unsigned int itemsLength);
~TakeItemHint();
virtual bool onTake( shared_ptr<ItemInstance> item );
virtual bool onTake( std::shared_ptr<ItemInstance> item );
};

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

@@ -18,7 +18,7 @@
#include "TutorialConstraints.h"
#include "TutorialHints.h"
vector<int> Tutorial::s_completableTasks;
std::vector<int> Tutorial::s_completableTasks;
int Tutorial::m_iTutorialHintDelayTime = 14000;
@@ -1003,7 +1003,7 @@ Tutorial::~Tutorial()
{
delete (*it);
}
for(unordered_map<int, TutorialMessage *>::iterator it = messages.begin(); it != messages.end(); ++it)
for(std::unordered_map<int, TutorialMessage *>::iterator it = messages.begin(); it != messages.end(); ++it)
{
delete (*it).second;
}
@@ -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);
@@ -1557,7 +1557,7 @@ bool Tutorial::setMessage(PopupMessageDetails *message)
if(!message->m_replaceCurrent) lastMessageTime = GetTickCount();
wstring text;
std::wstring text;
if(!message->m_messageString.empty())
{
text = message->m_messageString;
@@ -1568,11 +1568,11 @@ bool Tutorial::setMessage(PopupMessageDetails *message)
if( it != messages.end() && it->second != NULL )
{
TutorialMessage *messageString = it->second;
text = wstring( messageString->getMessageForDisplay() );
text = std::wstring( messageString->getMessageForDisplay() );
}
else
{
text = wstring( app.GetString(message->m_messageId) );
text = std::wstring( app.GetString(message->m_messageId) );
}
}
@@ -1590,7 +1590,7 @@ bool Tutorial::setMessage(PopupMessageDetails *message)
}
}
wstring title;
std::wstring title;
TutorialPopupInfo popupInfo;
popupInfo.interactScene = m_UIScene;
popupInfo.desc = text.c_str();
@@ -1601,7 +1601,7 @@ bool Tutorial::setMessage(PopupMessageDetails *message)
popupInfo.tutorial = this;
if( !message->m_titleString.empty() || message->m_titleId > 0 )
{
if(message->m_titleString.empty()) title = wstring( app.GetString(message->m_titleId) );
if(message->m_titleString.empty()) title = std::wstring( app.GetString(message->m_titleId) );
else title = message->m_titleString;
popupInfo.title = title.c_str();
@@ -1656,7 +1656,7 @@ bool Tutorial::setMessage(TutorialHint *hint, PopupMessageDetails *message)
return messageShown;
}
bool Tutorial::setMessage(const wstring &messageString, int icon, int auxValue)
bool Tutorial::setMessage(const std::wstring &messageString, int icon, int auxValue)
{
PopupMessageDetails *message = new PopupMessageDetails();
message->m_messageString = messageString;
@@ -1681,7 +1681,7 @@ void Tutorial::showTutorialPopup(bool show)
}
}
void Tutorial::useItemOn(Level *level, shared_ptr<ItemInstance> item, int x, int y, int z, bool bTestUseOnly)
void Tutorial::useItemOn(Level *level, std::shared_ptr<ItemInstance> item, int x, int y, int z, bool bTestUseOnly)
{
for(AUTO_VAR(it, activeTasks[m_CurrentState].begin()); it < activeTasks[m_CurrentState].end(); ++it)
{
@@ -1690,7 +1690,7 @@ void Tutorial::useItemOn(Level *level, shared_ptr<ItemInstance> item, int x, int
}
}
void Tutorial::useItemOn(shared_ptr<ItemInstance> item, bool bTestUseOnly)
void Tutorial::useItemOn(std::shared_ptr<ItemInstance> item, bool bTestUseOnly)
{
for(AUTO_VAR(it, activeTasks[m_CurrentState].begin()); it < activeTasks[m_CurrentState].end(); ++it)
{
@@ -1699,7 +1699,7 @@ void Tutorial::useItemOn(shared_ptr<ItemInstance> item, bool bTestUseOnly)
}
}
void Tutorial::completeUsingItem(shared_ptr<ItemInstance> item)
void Tutorial::completeUsingItem(std::shared_ptr<ItemInstance> item)
{
for(AUTO_VAR(it, activeTasks[m_CurrentState].begin()); it < activeTasks[m_CurrentState].end(); ++it)
{
@@ -1718,7 +1718,7 @@ void Tutorial::completeUsingItem(shared_ptr<ItemInstance> item)
}
}
void Tutorial::startDestroyBlock(shared_ptr<ItemInstance> item, Tile *tile)
void Tutorial::startDestroyBlock(std::shared_ptr<ItemInstance> item, Tile *tile)
{
int hintNeeded = -1;
for(AUTO_VAR(it, hints[m_CurrentState].begin()); it < hints[m_CurrentState].end(); ++it)
@@ -1754,7 +1754,7 @@ void Tutorial::destroyBlock(Tile *tile)
}
}
void Tutorial::attack(shared_ptr<Player> player, shared_ptr<Entity> entity)
void Tutorial::attack(std::shared_ptr<Player> player, std::shared_ptr<Entity> entity)
{
int hintNeeded = -1;
for(AUTO_VAR(it, hints[m_CurrentState].begin()); it < hints[m_CurrentState].end(); ++it)
@@ -1772,7 +1772,7 @@ void Tutorial::attack(shared_ptr<Player> player, shared_ptr<Entity> entity)
}
}
void Tutorial::itemDamaged(shared_ptr<ItemInstance> item)
void Tutorial::itemDamaged(std::shared_ptr<ItemInstance> item)
{
int hintNeeded = -1;
for(AUTO_VAR(it, hints[m_CurrentState].begin()); it < hints[m_CurrentState].end(); ++it)
@@ -1803,7 +1803,7 @@ void Tutorial::handleUIInput(int iAction)
currentTask[m_CurrentState]->handleUIInput(iAction);
}
void Tutorial::createItemSelected(shared_ptr<ItemInstance> item, bool canMake)
void Tutorial::createItemSelected(std::shared_ptr<ItemInstance> item, bool canMake)
{
int hintNeeded = -1;
for(AUTO_VAR(it, hints[m_CurrentState].begin()); it < hints[m_CurrentState].end(); ++it)
@@ -1821,7 +1821,7 @@ void Tutorial::createItemSelected(shared_ptr<ItemInstance> item, bool canMake)
}
}
void Tutorial::onCrafted(shared_ptr<ItemInstance> item)
void Tutorial::onCrafted(std::shared_ptr<ItemInstance> item)
{
for(unsigned int state = 0; state < e_Tutorial_State_Max; ++state)
{
@@ -1833,7 +1833,7 @@ void Tutorial::onCrafted(shared_ptr<ItemInstance> item)
}
}
void Tutorial::onTake(shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux)
void Tutorial::onTake(std::shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux)
{
if( !m_hintDisplayed )
{
@@ -1860,7 +1860,7 @@ void Tutorial::onTake(shared_ptr<ItemInstance> item, unsigned int invItemCountAn
}
}
void Tutorial::onSelectedItemChanged(shared_ptr<ItemInstance> item)
void Tutorial::onSelectedItemChanged(std::shared_ptr<ItemInstance> item)
{
// We only handle this if we are in a state that allows changing based on the selected item
// Menus and states like riding in a minecart will NOT allow this
@@ -1976,7 +1976,7 @@ bool Tutorial::isInputAllowed(int mapping)
return allowed;
}
vector<TutorialTask *> *Tutorial::getTasks()
std::vector<TutorialTask *> *Tutorial::getTasks()
{
return &tasks;
}
@@ -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
{

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

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "TutorialTask.h"
#include "TutorialConstraint.h"
#include "TutorialHint.h"
@@ -27,9 +27,9 @@ public:
int m_messageId;
int m_promptId;
int m_titleId;
wstring m_messageString;
wstring m_promptString;
wstring m_titleString;
std::wstring m_messageString;
std::wstring m_promptString;
std::wstring m_titleString;
int m_icon;
int m_iAuxVal;
bool m_allowFade;
@@ -78,13 +78,13 @@ private:
int m_firstTickTime;
protected:
unordered_map<int, TutorialMessage *> messages;
vector<TutorialConstraint *> m_globalConstraints;
vector<TutorialConstraint *> constraints[e_Tutorial_State_Max];
vector< pair<TutorialConstraint *, unsigned char> > constraintsToRemove[e_Tutorial_State_Max];
vector<TutorialTask *> tasks; // We store a copy of the tasks for the main gameplay tutorial so that we could display an overview menu
vector<TutorialTask *> activeTasks[e_Tutorial_State_Max];
vector<TutorialHint *> hints[e_Tutorial_State_Max];
std::unordered_map<int, TutorialMessage *> messages;
std::vector<TutorialConstraint *> m_globalConstraints;
std::vector<TutorialConstraint *> constraints[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];
TutorialTask *currentTask[e_Tutorial_State_Max];
TutorialConstraint *currentFailedConstraint[e_Tutorial_State_Max];
@@ -147,23 +147,23 @@ public:
bool setMessage(PopupMessageDetails *message);
bool setMessage(TutorialHint *hint, PopupMessageDetails *message);
bool setMessage(const wstring &message, int icon, int auxValue);
bool setMessage(const std::wstring &message, int icon, int auxValue);
void showTutorialPopup(bool show);
void useItemOn(Level *level, shared_ptr<ItemInstance> item, int x, int y, int z,bool bTestUseOnly=false);
void useItemOn(shared_ptr<ItemInstance> item, bool bTestUseOnly=false);
void completeUsingItem(shared_ptr<ItemInstance> item);
void startDestroyBlock(shared_ptr<ItemInstance> item, Tile *tile);
void useItemOn(Level *level, std::shared_ptr<ItemInstance> item, int x, int y, int z,bool bTestUseOnly=false);
void useItemOn(std::shared_ptr<ItemInstance> item, bool bTestUseOnly=false);
void completeUsingItem(std::shared_ptr<ItemInstance> item);
void startDestroyBlock(std::shared_ptr<ItemInstance> item, Tile *tile);
void destroyBlock(Tile *tile);
void attack(shared_ptr<Player> player, shared_ptr<Entity> entity);
void itemDamaged(shared_ptr<ItemInstance> item);
void attack(std::shared_ptr<Player> player, std::shared_ptr<Entity> entity);
void itemDamaged(std::shared_ptr<ItemInstance> item);
void handleUIInput(int iAction);
void createItemSelected(shared_ptr<ItemInstance> item, bool canMake);
void onCrafted(shared_ptr<ItemInstance> item);
void onTake(shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux);
void onSelectedItemChanged(shared_ptr<ItemInstance> item);
void createItemSelected(std::shared_ptr<ItemInstance> item, bool canMake);
void onCrafted(std::shared_ptr<ItemInstance> item);
void onTake(std::shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux);
void onSelectedItemChanged(std::shared_ptr<ItemInstance> item);
void onLookAt(int id, int iData=0);
void onLookAtEntity(eINSTANCEOF type);
void onEffectChanged(MobEffect *effect, bool bRemoved=false);
@@ -181,7 +181,7 @@ public:
int GetTutorialDisplayMessageTime() {return m_iTutorialDisplayMessageTime;}
// Only for the main gameplay tutorial
vector<TutorialTask *> *getTasks();
std::vector<TutorialTask *> *getTasks();
unsigned int getCurrentTaskIndex();
#ifdef _XBOX
@@ -193,7 +193,7 @@ public:
// These are required so that we have a consistent mapping of the completion bits stored in the profile data
static void staticCtor();
static vector<int> s_completableTasks;
static std::vector<int> s_completableTasks;
static void debugResetPlayerSavedProgress(int iPad);
};

10
Minecraft.Client/Build/Common/Tutorial/TutorialHint.cpp
View File

@@ -14,7 +14,7 @@ TutorialHint::TutorialHint(eTutorial_Hint id, Tutorial *tutorial, int descriptio
tutorial->addMessage(descriptionId, type != e_Hint_NoIngredients);
}
int TutorialHint::startDestroyBlock(shared_ptr<ItemInstance> item, Tile *tile)
int TutorialHint::startDestroyBlock(std::shared_ptr<ItemInstance> item, Tile *tile)
{
int returnVal = -1;
switch(m_type)
@@ -59,7 +59,7 @@ int TutorialHint::destroyBlock(Tile *tile)
return returnVal;
}
int TutorialHint::attack(shared_ptr<ItemInstance> item, shared_ptr<Entity> entity)
int TutorialHint::attack(std::shared_ptr<ItemInstance> item, std::shared_ptr<Entity> entity)
{
/*
switch(m_type)
@@ -71,7 +71,7 @@ int TutorialHint::attack(shared_ptr<ItemInstance> item, shared_ptr<Entity> entit
return -1;
}
int TutorialHint::createItemSelected(shared_ptr<ItemInstance> item, bool canMake)
int TutorialHint::createItemSelected(std::shared_ptr<ItemInstance> item, bool canMake)
{
int returnVal = -1;
switch(m_type)
@@ -86,7 +86,7 @@ int TutorialHint::createItemSelected(shared_ptr<ItemInstance> item, bool canMake
return returnVal;
}
int TutorialHint::itemDamaged(shared_ptr<ItemInstance> item)
int TutorialHint::itemDamaged(std::shared_ptr<ItemInstance> item)
{
int returnVal = -1;
switch(m_type)
@@ -100,7 +100,7 @@ int TutorialHint::itemDamaged(shared_ptr<ItemInstance> item)
return returnVal;
}
bool TutorialHint::onTake( shared_ptr<ItemInstance> item )
bool TutorialHint::onTake( std::shared_ptr<ItemInstance> item )
{
return false;
}

12
Minecraft.Client/Build/Common/Tutorial/TutorialHint.h
View File

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "TutorialEnum.h"
@@ -40,12 +40,12 @@ public:
eTutorial_Hint getId() { return m_id; }
virtual int startDestroyBlock(shared_ptr<ItemInstance> item, Tile *tile);
virtual int startDestroyBlock(std::shared_ptr<ItemInstance> item, Tile *tile);
virtual int destroyBlock(Tile *tile);
virtual int attack(shared_ptr<ItemInstance> item, shared_ptr<Entity> entity);
virtual int createItemSelected(shared_ptr<ItemInstance> item, bool canMake);
virtual int itemDamaged(shared_ptr<ItemInstance> item);
virtual bool onTake( shared_ptr<ItemInstance> item );
virtual int attack(std::shared_ptr<ItemInstance> item, std::shared_ptr<Entity> entity);
virtual int createItemSelected(std::shared_ptr<ItemInstance> item, bool canMake);
virtual int itemDamaged(std::shared_ptr<ItemInstance> item);
virtual bool onTake( std::shared_ptr<ItemInstance> item );
virtual bool onLookAt(int id, int iData=0);
virtual bool onLookAtEntity(eINSTANCEOF type);
virtual int tick();

6
Minecraft.Client/Build/Common/Tutorial/TutorialMode.cpp
View File

@@ -36,7 +36,7 @@ bool TutorialMode::destroyBlock(int x, int y, int z, int face)
int t = minecraft->level->getTile(x, y, z);
tutorial->destroyBlock(Tile::tiles[t]);
}
shared_ptr<ItemInstance> item = minecraft->player->getSelectedItem();
std::shared_ptr<ItemInstance> item = minecraft->player->getSelectedItem();
int damageBefore;
if(item != NULL)
{
@@ -78,7 +78,7 @@ void TutorialMode::tick()
*/
}
bool TutorialMode::useItemOn(shared_ptr<Player> player, Level *level, shared_ptr<ItemInstance> item, int x, int y, int z, int face, Vec3 *hit, bool bTestUseOnly, bool *pbUsedItem)
bool TutorialMode::useItemOn(std::shared_ptr<Player> player, Level *level, std::shared_ptr<ItemInstance> item, int x, int y, int z, int face, Vec3 *hit, bool bTestUseOnly, bool *pbUsedItem)
{
bool haveItem = false;
int itemCount = 0;
@@ -110,7 +110,7 @@ bool TutorialMode::useItemOn(shared_ptr<Player> player, Level *level, shared_ptr
return result;
}
void TutorialMode::attack(shared_ptr<Player> player, shared_ptr<Entity> entity)
void TutorialMode::attack(std::shared_ptr<Player> player, std::shared_ptr<Entity> entity)
{
if(!tutorial->m_allTutorialsComplete)
tutorial->attack(player, entity);

6
Minecraft.Client/Build/Common/Tutorial/TutorialMode.h
View File

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "../../../Player/MultiPlayerGameMode.h"
#include "Tutorial.h"
@@ -19,8 +19,8 @@ public:
virtual void startDestroyBlock(int x, int y, int z, int face);
virtual bool destroyBlock(int x, int y, int z, int face);
virtual void tick();
virtual bool useItemOn(shared_ptr<Player> player, Level *level, shared_ptr<ItemInstance> item, int x, int y, int z, int face, Vec3 *hit, bool bTestUseOnly=false, bool *pbUsedItem=NULL);
virtual void attack(shared_ptr<Player> player, shared_ptr<Entity> entity);
virtual bool useItemOn(std::shared_ptr<Player> player, Level *level, std::shared_ptr<ItemInstance> item, int x, int y, int z, int face, Vec3 *hit, bool bTestUseOnly=false, bool *pbUsedItem=NULL);
virtual void attack(std::shared_ptr<Player> player, std::shared_ptr<Entity> entity);
virtual bool isInputAllowed(int mapping);

2
Minecraft.Client/Build/Common/Tutorial/TutorialTask.cpp
View File

@@ -3,7 +3,7 @@
#include "TutorialConstraints.h"
#include "TutorialTask.h"
TutorialTask::TutorialTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, vector<TutorialConstraint *> *inConstraints,
TutorialTask::TutorialTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, std::vector<TutorialConstraint *> *inConstraints,
bool bShowMinimumTime, bool bAllowFade, bool bTaskReminders)
: tutorial( tutorial ), descriptionId( descriptionId ), m_promptId( -1 ), enablePreCompletion( enablePreCompletion ),
areConstraintsEnabled( false ), bIsCompleted( false ), bHasBeenActivated( false ),

16
Minecraft.Client/Build/Common/Tutorial/TutorialTask.h
View File

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "TutorialEnum.h"
class Level;
@@ -30,10 +30,10 @@ protected:
protected:
bool bIsCompleted;
bool m_bShownForMinimumTime;
vector<TutorialConstraint *> constraints;
std::vector<TutorialConstraint *> constraints;
bool areConstraintsEnabled;
public:
TutorialTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, vector<TutorialConstraint *> *inConstraints, bool bShowMinimumTime=false, bool bAllowFade=true, bool m_bTaskReminders=true );
TutorialTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, std::vector<TutorialConstraint *> *inConstraints, bool bShowMinimumTime=false, bool bAllowFade=true, bool m_bTaskReminders=true );
virtual ~TutorialTask();
virtual int getDescriptionId() { return descriptionId; }
@@ -52,12 +52,12 @@ public:
bool TaskReminders() { return m_bTaskReminders;}
virtual bool ShowMinimumTime() { return m_bShowMinimumTime;}
virtual void useItemOn(Level *level, shared_ptr<ItemInstance> item, int x, int y, int z, bool bTestUseOnly=false) { }
virtual void useItem(shared_ptr<ItemInstance> item,bool bTestUseOnly=false) { }
virtual void completeUsingItem(shared_ptr<ItemInstance> item) { }
virtual void useItemOn(Level *level, std::shared_ptr<ItemInstance> item, int x, int y, int z, bool bTestUseOnly=false) { }
virtual void useItem(std::shared_ptr<ItemInstance> item,bool bTestUseOnly=false) { }
virtual void completeUsingItem(std::shared_ptr<ItemInstance> item) { }
virtual void handleUIInput(int iAction) { }
virtual void onCrafted(shared_ptr<ItemInstance> item) { }
virtual void onTake(shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux) { }
virtual void onCrafted(std::shared_ptr<ItemInstance> item) { }
virtual void onTake(std::shared_ptr<ItemInstance> item, unsigned int invItemCountAnyAux, unsigned int invItemCountThisAux) { }
virtual void onStateChange(eTutorial_State newState) { }
virtual void onEffectChanged(MobEffect *effect, bool bRemoved=false) { }
};

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

@@ -5,7 +5,7 @@
#include "UseItemTask.h"
UseItemTask::UseItemTask(const int itemId, Tutorial *tutorial, int descriptionId,
bool enablePreCompletion, vector<TutorialConstraint *> *inConstraints, bool bShowMinimumTime, bool bAllowFade, bool bTaskReminders)
bool enablePreCompletion, std::vector<TutorialConstraint *> *inConstraints, bool bShowMinimumTime, bool bAllowFade, bool bTaskReminders)
: TutorialTask( tutorial, descriptionId, enablePreCompletion, inConstraints, bShowMinimumTime, bAllowFade, bTaskReminders ),
itemId( itemId )
{
@@ -16,7 +16,7 @@ bool UseItemTask::isCompleted()
return bIsCompleted;
}
void UseItemTask::useItem(shared_ptr<ItemInstance> item,bool bTestUseOnly)
void UseItemTask::useItem(std::shared_ptr<ItemInstance> item,bool bTestUseOnly)
{
if(bTestUseOnly) return;

6
Minecraft.Client/Build/Common/Tutorial/UseItemTask.h
View File

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "TutorialTask.h"
@@ -14,7 +14,7 @@ private:
public:
UseItemTask(const int itemId, Tutorial *tutorial, int descriptionId,
bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = NULL, bool bShowMinimumTime = false, bool bAllowFade = true, bool bTaskReminders = true );
bool enablePreCompletion = false, std::vector<TutorialConstraint *> *inConstraints = NULL, bool bShowMinimumTime = false, bool bAllowFade = true, bool bTaskReminders = true );
virtual bool isCompleted();
virtual void useItem(shared_ptr<ItemInstance> item, bool bTestUseOnly=false);
virtual void useItem(std::shared_ptr<ItemInstance> item, bool bTestUseOnly=false);
};

6
Minecraft.Client/Build/Common/Tutorial/UseTileTask.cpp
View File

@@ -5,7 +5,7 @@
#include "UseTileTask.h"
UseTileTask::UseTileTask(const int tileId, int x, int y, int z, Tutorial *tutorial, int descriptionId,
bool enablePreCompletion, vector<TutorialConstraint *> *inConstraints, bool bShowMinimumTime, bool bAllowFade, bool bTaskReminders)
bool enablePreCompletion, std::vector<TutorialConstraint *> *inConstraints, bool bShowMinimumTime, bool bAllowFade, bool bTaskReminders)
: TutorialTask( tutorial, descriptionId, enablePreCompletion, inConstraints, bShowMinimumTime, bAllowFade, bTaskReminders ),
x( x ), y( y ), z( z ), tileId( tileId )
{
@@ -13,7 +13,7 @@ UseTileTask::UseTileTask(const int tileId, int x, int y, int z, Tutorial *tutori
}
UseTileTask::UseTileTask(const int tileId, Tutorial *tutorial, int descriptionId,
bool enablePreCompletion, vector<TutorialConstraint *> *inConstraints, bool bShowMinimumTime, bool bAllowFade, bool bTaskReminders)
bool enablePreCompletion, std::vector<TutorialConstraint *> *inConstraints, bool bShowMinimumTime, bool bAllowFade, bool bTaskReminders)
: TutorialTask( tutorial, descriptionId, enablePreCompletion, inConstraints, bShowMinimumTime, bAllowFade, bTaskReminders ),
tileId( tileId )
{
@@ -25,7 +25,7 @@ bool UseTileTask::isCompleted()
return bIsCompleted;
}
void UseTileTask::useItemOn(Level *level, shared_ptr<ItemInstance> item, int x, int y, int z,bool bTestUseOnly)
void UseTileTask::useItemOn(Level *level, std::shared_ptr<ItemInstance> item, int x, int y, int z,bool bTestUseOnly)
{
if(bTestUseOnly) return;

8
Minecraft.Client/Build/Common/Tutorial/UseTileTask.h
View File

@@ -1,5 +1,5 @@
#pragma once
using namespace std;
//using namespace std;
#include "TutorialTask.h"
@@ -16,9 +16,9 @@ private:
public:
UseTileTask(const int tileId, int x, int y, int z, Tutorial *tutorial, int descriptionId,
bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = NULL, bool bShowMinimumTime = false, bool bAllowFade = true, bool bTaskReminders = true );
bool enablePreCompletion = false, std::vector<TutorialConstraint *> *inConstraints = NULL, bool bShowMinimumTime = false, bool bAllowFade = true, bool bTaskReminders = true );
UseTileTask(const int tileId, Tutorial *tutorial, int descriptionId,
bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = NULL, bool bShowMinimumTime = false, bool bAllowFade = true, bool bTaskReminders = true);
bool enablePreCompletion = false, std::vector<TutorialConstraint *> *inConstraints = NULL, bool bShowMinimumTime = false, bool bAllowFade = true, bool bTaskReminders = true);
virtual bool isCompleted();
virtual void useItemOn(Level *level, shared_ptr<ItemInstance> item, int x, int y, int z, bool bTestUseOnly=false);
virtual void useItemOn(Level *level, std::shared_ptr<ItemInstance> item, int x, int y, int z, bool bTestUseOnly=false);
};

4
Minecraft.Client/Build/Common/Tutorial/XuiCraftingTask.h
View File

@@ -12,7 +12,7 @@ public:
};
// Select group
XuiCraftingTask(Tutorial *tutorial, int descriptionId, Recipy::_eGroupType groupToSelect, bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = NULL,
XuiCraftingTask(Tutorial *tutorial, int descriptionId, Recipy::_eGroupType groupToSelect, bool enablePreCompletion = false, std::vector<TutorialConstraint *> *inConstraints = NULL,
bool bShowMinimumTime=false, bool bAllowFade=true, bool m_bTaskReminders=true )
: TutorialTask(tutorial, descriptionId, enablePreCompletion, inConstraints, bShowMinimumTime, bAllowFade, m_bTaskReminders ),
m_group(groupToSelect),
@@ -20,7 +20,7 @@ public:
{}
// Select Item
XuiCraftingTask(Tutorial *tutorial, int descriptionId, int itemId, bool enablePreCompletion = false, vector<TutorialConstraint *> *inConstraints = NULL,
XuiCraftingTask(Tutorial *tutorial, int descriptionId, int itemId, bool enablePreCompletion = false, std::vector<TutorialConstraint *> *inConstraints = NULL,
bool bShowMinimumTime=false, bool bAllowFade=true, bool m_bTaskReminders=true )
: TutorialTask(tutorial, descriptionId, enablePreCompletion, inConstraints, bShowMinimumTime, bAllowFade, m_bTaskReminders ),
m_item(itemId),