Skip to content

Commit

Permalink
WaitForMovement - Refactor code
Browse files Browse the repository at this point in the history
It now uses a single command instead of a chain of commands.
```cpp
CommandWaitForMovement(useVarID, ID, useVarTargetVariable, targetVariable, useVarFailuresAmount, failuresAmount)
```

You'll store if a Move Route failed or succeed on a target variable.
Then use that variable to define an outcome.
  • Loading branch information
jetrotal committed Oct 23, 2023
1 parent b58c8af commit 248a21f
Showing 1 changed file with 17 additions and 21 deletions.
38 changes: 17 additions & 21 deletions src/game_interpreter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4702,17 +4702,13 @@ bool Game_Interpreter::CommandCallMovement(lcf::rpg::EventCommand const& com) {
}

bool Game_Interpreter::CommandWaitForMovement(lcf::rpg::EventCommand const& com) {
// CommandWaitForMovement(useVarID, ID)
// CommandWaitForMovement(useVarID, ID, useVarTargetVariable, targetVariable, useVarFailuresAmount, failuresAmount)

// Needed for ShowChoice
auto* frame = GetFramePtr();
const auto& list = frame->commands;
auto& index = frame->current_command;

// Retrieve event ID
int eventID = ValueOrVariable(com.parameters[0], com.parameters[1]);
if (eventID == 0)
eventID = GetCurrentEventId();
if (eventID == 0) eventID = GetCurrentEventId();

int outputVariable = ValueOrVariable(com.parameters[2], com.parameters[3]);
int failuresAmount = ValueOrVariable(com.parameters[4], com.parameters[5]);

// Get the character associated with the event ID
Game_Character* ev = GetCharacter(eventID);
Expand All @@ -4721,24 +4717,24 @@ bool Game_Interpreter::CommandWaitForMovement(lcf::rpg::EventCommand const& com)
bool movementExists = !ev->GetMoveRoute().move_commands.empty();
bool movementIsRunning = movementExists && (ev->IsMoveRouteOverwritten() && !ev->IsMoveRouteFinished());

int i = frame->current_command + 1;

// Check the next command for a specific condition
const auto& cmd = list[i];
const int32_t failBranch = static_cast<int>(Cmd::ShowChoiceOption);

// If the next command is "Fails to move x times" and the character is stuck, cancel movement
if (cmd.code == failBranch && cmd.string == "Fails to move x times")
if (ev->isStuck(cmd.parameters[0])) {
// failed to move X times (0 = wait till finish)
if (failuresAmount > 0)
if (ev->isStuck(failuresAmount)) {
ev->failsMove = 0;
ev->CancelMoveRoute();
frame->current_command = i + 1;
Main_Data::game_variables->Set(outputVariable, 0);
Game_Map::SetNeedRefresh(true);
return true;
}

// Return false if movement is still in progress
if(!movementIsRunning) ev->failsMove = 0;
return !movementIsRunning;
if (!movementIsRunning) {
ev->failsMove = 0;
Main_Data::game_variables->Set(outputVariable, 1);
Game_Map::SetNeedRefresh(true);
return true;
}
return false;
}

Game_Interpreter& Game_Interpreter::GetForegroundInterpreter() {
Expand Down

0 comments on commit 248a21f

Please sign in to comment.