Remove broad command
This commit is contained in:
1 parent
1ab9f300b6
commit
3f68a8ba07
11 files changed
+120
-160
No files matched your search
+4
-25
@@ -649,11 +649,10 @@ namespace FRG
|
||||
Location* loc = currentLocation();
|
||||
if (!loc) return;
|
||||
if (loc->player) {
|
||||
loc->updateCharacterState(*loc->player, [&](CharacterState& workingState) {
|
||||
workingState.position = destPos;
|
||||
workingState.facingAngle = destRotY;
|
||||
workingState.targetFacingAngle = destRotY;
|
||||
});
|
||||
server().submit(SetCharacterPositionCommand{
|
||||
destName, loc->player->entityId(), destPos});
|
||||
server().submit(SetCharacterFacingAngleCommand{
|
||||
destName, loc->player->entityId(), destRotY, true});
|
||||
loc->stopCharacter(*loc->player);
|
||||
}
|
||||
loc->localState().cameraAzimuth = destRotY;
|
||||
@@ -1536,26 +1535,6 @@ namespace FRG
|
||||
return n;
|
||||
}
|
||||
|
||||
void Game::activateSlowMoEffect() {
|
||||
if (!currentLocation()) return;
|
||||
|
||||
if (currentLocation()->player) {
|
||||
currentLocation()->updateCharacterState(
|
||||
*currentLocation()->player, [](CharacterState& workingState) {
|
||||
workingState.slowMoTimeRemaining = workingState.slowMoActiveTime;
|
||||
});
|
||||
}
|
||||
|
||||
for (auto& npc : currentLocation()->npcs) {
|
||||
if (npc) {
|
||||
currentLocation()->updateCharacterState(
|
||||
*npc, [](CharacterState& workingState) {
|
||||
workingState.slowMoTimeRemaining = workingState.slowMoActiveTime;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Game::enterCameraDragMode(int eventX, int eventY)
|
||||
{
|
||||
cameraDragging = true;
|
||||
|
||||
Reference in new issue
Block a user