mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-05-12 04:03:53 +00:00
Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
parent
a9be52c41a
commit
087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
|
|
@ -154,10 +154,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
addTask(e_Tutorial_State_Gameplay, new UseItemTask(Item::door_wood->id, this, IDS_TUTORIAL_TASK_PLACE_DOOR) );
|
||||
addTask(e_Tutorial_State_Gameplay, new CraftTask( Tile::torch_Id, -1, 1, this, IDS_TUTORIAL_TASK_CREATE_TORCH) );
|
||||
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"tutorialArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
vector<TutorialConstraint *> *areaConstraints = new vector<TutorialConstraint *>();
|
||||
areaConstraints->push_back( new AreaConstraint( IDS_TUTORIAL_CONSTRAINT_TUTORIAL_AREA, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
|
||||
|
|
@ -283,10 +283,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* MINECART
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"minecartArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
addHint(e_Tutorial_State_Gameplay, new AreaHint(e_Tutorial_Hint_Always_On, this, e_Tutorial_State_Gameplay, e_Tutorial_State_Riding_Minecart, IDS_TUTORIAL_HINT_MINECART, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1 ) );
|
||||
}
|
||||
|
|
@ -298,10 +298,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* BOAT
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"boatArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
addHint(e_Tutorial_State_Gameplay, new AreaHint(e_Tutorial_Hint_Always_On, this, e_Tutorial_State_Gameplay, e_Tutorial_State_Riding_Boat, IDS_TUTORIAL_HINT_BOAT, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1 ) );
|
||||
}
|
||||
|
|
@ -313,10 +313,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* FISHING
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"fishingArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
addHint(e_Tutorial_State_Gameplay, new AreaHint(e_Tutorial_Hint_Always_On, this, e_Tutorial_State_Gameplay, e_Tutorial_State_Fishing, IDS_TUTORIAL_HINT_FISHING, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1 ) );
|
||||
}
|
||||
|
|
@ -328,10 +328,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* PISTON - SELF-REPAIRING BRIDGE
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"pistonBridgeArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
addHint(e_Tutorial_State_Gameplay, new AreaHint(e_Tutorial_Hint_Always_On, this, e_Tutorial_State_Gameplay, e_Tutorial_State_None, IDS_TUTORIAL_HINT_PISTON_SELF_REPAIRING_BRIDGE, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1, true ) );
|
||||
}
|
||||
|
|
@ -343,10 +343,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* PISTON - PISTON AND REDSTONE CIRCUITS
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"pistonArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
eTutorial_State redstoneAndPistonStates[] = {e_Tutorial_State_Gameplay};
|
||||
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Redstone_And_Piston, redstoneAndPistonStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
|
||||
|
|
@ -368,10 +368,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* PORTAL
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"portalArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
eTutorial_State portalStates[] = {e_Tutorial_State_Gameplay};
|
||||
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Portal, portalStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
|
||||
|
|
@ -391,10 +391,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* CREATIVE
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"creativeArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
eTutorial_State creativeStates[] = {e_Tutorial_State_Gameplay};
|
||||
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_CreativeMode, creativeStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1,true,true,GameType::CREATIVE) );
|
||||
|
|
@ -411,7 +411,7 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
ProcedureCompoundTask *creativeFinalTask = new ProcedureCompoundTask( this );
|
||||
|
||||
AABB *exitArea = app.getGameRuleDefinitions()->getNamedArea(L"creativeExitArea");
|
||||
if(exitArea != nullptr)
|
||||
if(exitArea != NULL)
|
||||
{
|
||||
vector<TutorialConstraint *> *creativeExitAreaConstraints = new vector<TutorialConstraint *>();
|
||||
creativeExitAreaConstraints->push_back( new AreaConstraint( -1, exitArea->x0,exitArea->y0,exitArea->z0,exitArea->x1,exitArea->y1,exitArea->z1,true,false) );
|
||||
|
|
@ -434,10 +434,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* BREWING
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"brewingArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
eTutorial_State brewingStates[] = {e_Tutorial_State_Gameplay};
|
||||
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Brewing, brewingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
|
||||
|
|
@ -467,10 +467,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* ENCHANTING
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"enchantingArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
eTutorial_State enchantingStates[] = {e_Tutorial_State_Gameplay};
|
||||
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Enchanting, enchantingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
|
||||
|
|
@ -492,10 +492,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* ANVIL
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"anvilArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
eTutorial_State enchantingStates[] = {e_Tutorial_State_Gameplay};
|
||||
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Anvil, enchantingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
|
||||
|
|
@ -517,10 +517,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* TRADING
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"tradingArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
eTutorial_State tradingStates[] = {e_Tutorial_State_Gameplay};
|
||||
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Trading, tradingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
|
||||
|
|
@ -541,10 +541,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* FIREWORKS
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"fireworksArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
eTutorial_State fireworkStates[] = {e_Tutorial_State_Gameplay};
|
||||
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Fireworks, fireworkStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
|
||||
|
|
@ -563,10 +563,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* BEACON
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"beaconArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
eTutorial_State beaconStates[] = {e_Tutorial_State_Gameplay};
|
||||
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Beacon, beaconStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
|
||||
|
|
@ -585,10 +585,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* HOPPER
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"hopperArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
eTutorial_State hopperStates[] = {e_Tutorial_State_Gameplay};
|
||||
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Hopper, hopperStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
|
||||
|
|
@ -610,10 +610,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* ENDERCHEST
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"enderchestArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
eTutorial_State enchantingStates[] = {e_Tutorial_State_Gameplay};
|
||||
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Enderchests, enchantingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
|
||||
|
|
@ -632,10 +632,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* FARMING
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"farmingArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
eTutorial_State farmingStates[] = {e_Tutorial_State_Gameplay};
|
||||
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Farming, farmingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
|
||||
|
|
@ -661,10 +661,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* BREEDING
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"breedingArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
eTutorial_State breedingStates[] = {e_Tutorial_State_Gameplay};
|
||||
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Breeding, breedingStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
|
||||
|
|
@ -689,10 +689,10 @@ FullTutorial::FullTutorial(int iPad, bool isTrial /*= false*/)
|
|||
* SNOW AND IRON GOLEM
|
||||
*
|
||||
*/
|
||||
if(app.getGameRuleDefinitions() != nullptr)
|
||||
if(app.getGameRuleDefinitions() != NULL)
|
||||
{
|
||||
AABB *area = app.getGameRuleDefinitions()->getNamedArea(L"golemArea");
|
||||
if(area != nullptr)
|
||||
if(area != NULL)
|
||||
{
|
||||
eTutorial_State golemStates[] = {e_Tutorial_State_Gameplay};
|
||||
AddGlobalConstraint( new ChangeStateConstraint(this, e_Tutorial_State_Golem, golemStates, 1, area->x0,area->y0,area->z0,area->x1,area->y1,area->z1) );
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue