CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Separate each condition as separate functions

Browse Source
This commit is contained in:
NT_x86
2022-10-05 17:25:35 +03:00
parent 932de58185
commit 27ac18b503
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/DataModelV2/LevelInstance.h
View File

@@ -17,5 +17,9 @@ public:
std::string winMessage;
std::string loseMessage;
virtual void PropUpdate(LPPROPGRIDITEM &pItem);
void winCondition();
void loseCondition();
void pauseCondition();
void drawCondition();
void Step(SimTime sdt);
};

37
src/source/DataModelV2/LevelInstance.cpp
View File

@@ -177,6 +177,32 @@ void LevelInstance::PropUpdate(LPPROPGRIDITEM &pItem)
Instance::PropUpdate(pItem);
}
void LevelInstance::winCondition()
{
DataModelInstance* DataModel = (DataModelInstance*)getParent(); //If level parent gets changed to something other than Datamodel it could cause nasty data corruption bugs
DataModel->setMessage(winMessage);
DataModel->toggleRun();
}
void LevelInstance::loseCondition()
{
DataModelInstance* DataModel = (DataModelInstance*)getParent();
DataModel->setMessage(loseMessage);
DataModel->toggleRun();
}
void LevelInstance::pauseCondition()
{
DataModelInstance* DataModel = (DataModelInstance*)getParent();
DataModel->toggleRun();
}
void LevelInstance::drawCondition()
{
DataModelInstance* DataModel = (DataModelInstance*)getParent();
DataModel->toggleRun();
}
void LevelInstance::Step(SimTime sdt)
{
switch(TimerAffectsScore)
@@ -196,24 +222,21 @@ void LevelInstance::Step(SimTime sdt)
}
else{
timer = 0.0f;
DataModelInstance* DataModel = (DataModelInstance*)getParent(); //If level parent gets changed to something other than Datamodel it could cause nasty data corruption bugs
switch(TimerUpAction)
{
case Enum::ActionType::Nothing:
break;
case Enum::ActionType::Pause:
DataModel->toggleRun();
pauseCondition();
break;
case Enum::ActionType::Lose:
DataModel->setMessage(loseMessage);
DataModel->toggleRun();
loseCondition();
break;
case Enum::ActionType::Draw:
DataModel->toggleRun();
drawCondition();
break;
case Enum::ActionType::Win:
DataModel->setMessage(winMessage);
DataModel->toggleRun();
winCondition();
break;
}
}