}
void MapState::UpdateWorld(float deltaT) {
- if (controlled && controlled->TileLock(map->Tileset()->Width(), map->Tileset()->Height())) {
- Vector<int> nowLock(controlled->Position());
- if (nowLock != lastLock) {
- OnGridLock();
+ if (controlled && controlled->TileLock(map->Tileset()->Size())) {
+ OnTileLock();
+ }
+ for (std::vector<Entity *>::iterator i(entities.begin()), end(entities.end()); i != end; ++i) {
+ (*i)->Update(deltaT);
+ }
+}
+
+void MapState::OnTileLock() {
+ if (moveTimer.Running() && !moveTimer.JustHit()) return;
+
+ Vector<int> nowLock(controlled->Position());
+ if (nowLock != lastLock) {
+ OnGridLock();
+ afterLock = true;
+ moveTimer.Clear();
+ } else if (moveTimer.JustHit()) {
+ OnGridLock();
+ afterLock = true;
+ }
+
+ // TODO: halt all activity if lock caused a state/map transition
+
+ if (nextDirection >= 0) {
+ bool blocked(CheckBlocking());
+ if (afterLock) {
+ OnMove(!blocked);
+ afterLock = false;
+ }
+ controlled->SetOrientation(Entity::Orientation(nextDirection));
+ if (!blocked) {
+ controlled->SetSpeed(walkingSpeed);
+ moveTimer.Clear();
+ } else {
+ controlled->SetSpeed(0.0f);
+ StopFollowers(*controlled);
+ if (!moveTimer.Running()) {
+ int tileSize((controlled->GetOrientation() % 2) ? map->Tileset()->Width() : map->Tileset()->Height());
+ moveTimer = PhysicsTimers().StartInterval(tileSize/walkingSpeed);
+ }
+ }
+ if (!controlled->AnimationRunning()) {
+ controlled->StartAnimation(*this);
}
- if (nextDirection >= 0) {
- if (afterLock) {
- // FIXME: this check is unreliable, see #21
- OnMove();
- afterLock = false;
+ } else {
+ controlled->SetSpeed(0.0f);
+ StopFollowers(*controlled);
+ controlled->StopAnimation();
+ moveTimer.Clear();
+ }
+
+ lastLock = nowLock;
+}
+
+bool MapState::CheckBlocking() const {
+ const Tile &tile(map->TileAt(controlled->Position()));
+ Vector<int> nextPosition;
+ switch (nextDirection) {
+ case Entity::ORIENTATION_NORTH:
+ if (tile.BlocksNorth()) {
+ return true;
+ } else {
+ nextPosition = Vector<int>(
+ controlled->Position().X(),
+ controlled->Position().Y() - map->Tileset()->Height());
}
- controlled->SetOrientation(Entity::Orientation(nextDirection));
- const Tile &tile(map->TileAt(controlled->Position()));
- bool blocked(false);
- switch (controlled->GetOrientation()) {
- case Entity::ORIENTATION_NORTH:
- blocked = tile.BlocksNorth();
- break;
- case Entity::ORIENTATION_EAST:
- blocked = tile.BlocksEast();
- break;
- case Entity::ORIENTATION_SOUTH:
- blocked = tile.BlocksSouth();
- break;
- case Entity::ORIENTATION_WEST:
- blocked = tile.BlocksWest();
- break;
+ break;
+ case Entity::ORIENTATION_EAST:
+ if (tile.BlocksEast()) {
+ return true;
+ } else {
+ nextPosition = Vector<int>(
+ controlled->Position().X() + map->Tileset()->Width(),
+ controlled->Position().Y());
}
- if (!blocked) {
- controlled->SetSpeed(walkingSpeed);
+ break;
+ case Entity::ORIENTATION_SOUTH:
+ if (tile.BlocksSouth()) {
+ return true;
} else {
- controlled->SetSpeed(0.0f);
+ nextPosition = Vector<int>(
+ controlled->Position().X(),
+ controlled->Position().Y() + map->Tileset()->Height());
}
- if (!controlled->AnimationRunning()) {
- controlled->StartAnimation(*this);
+ break;
+ case Entity::ORIENTATION_WEST:
+ if (tile.BlocksWest()) {
+ return true;
+ } else {
+ nextPosition = Vector<int>(
+ controlled->Position().X() - map->Tileset()->Width(),
+ controlled->Position().Y());
}
- } else {
- controlled->SetSpeed(0.0f);
- controlled->StopAnimation();
- }
- if (nowLock != lastLock) {
- lastLock = nowLock;
- afterLock = true;
+ break;
+ default:
+ return false;
+ }
+ Vector<int> nextTileCoords(map->TileCoordinates(nextPosition));
+ for (std::vector<Entity *>::const_iterator i(entities.begin()), end(entities.end()); i != end; ++i) {
+ const Entity &e(**i);
+ if (map->TileCoordinates(e.Position()) == nextTileCoords && e.Blocking()) {
+ return true;
}
}
+ return false;
+}
+
+void MapState::OnGridLock() {
+ LockEntities();
+ CheckMonster();
+ CheckTrigger();
+}
+
+void MapState::LockEntities() {
for (std::vector<Entity *>::iterator i(entities.begin()), end(entities.end()); i != end; ++i) {
- (*i)->Update(deltaT);
+ if (*i == controlled) {
+ // don't lock player
+ continue;
+ }
+ (*i)->Position().Lock(map->Tileset()->Size());
}
}
-void MapState::OnGridLock() {
+void MapState::CheckMonster() {
+ Vector<int> coords(map->TileCoordinates(controlled->Position()));
+ Vector<int> neighbor[4];
+ neighbor[0] = Vector<int>(coords.X() - 1, coords.Y()); // W
+ neighbor[1] = Vector<int>(coords.X(), coords.Y() + 1); // S
+ neighbor[2] = Vector<int>(coords.X() + 1, coords.Y()); // E
+ neighbor[3] = Vector<int>(coords.X(), coords.Y() - 1); // N
+
+ for (int i(0); i < 4; ++i) {
+ for (std::vector<Entity *>::iterator e(entities.begin()), end(entities.end()); e != end; ++e) {
+ if ((*e)->Hostile() && map->TileCoordinates((*e)->Position()) == neighbor[i]) {
+ // remove entity, push battle state and transition and halt all other activity
+ }
+ }
+ }
+}
+
+void MapState::CheckTrigger() {
Trigger *trigger(map->TriggerAt(Vector<int>(controlled->Position())));
if (trigger) {
// TODO: run trigger
}
- // TODO: check for adjacent monsters
- // TODO: force all entities into their grid positions?
+
}
-void MapState::OnMove() {
+void MapState::OnMove(bool realMove) {
// TODO: evaluate monster movements
- UpdateFollower(controlled);
+ if (realMove) {
+ UpdateFollower(*controlled);
+ } else {
+ StopFollowers(*controlled);
+ }
}
-void MapState::UpdateFollower(Entity *e) {
- if (!e->Follower()) return;
- UpdateFollower(e->Follower());
+void MapState::UpdateFollower(Entity &e) {
+ if (!e.Follower()) return;
+
+ Entity &f(*e.Follower());
+ UpdateFollower(f);
- e->Follower()->SetOrientation(e->GetOrientation());
- // TODO: set follower speed
+ Vector<int> coords(map->TileCoordinates(e.Position()));
+ Vector<int> fCoords(map->TileCoordinates(f.Position()));
+ Vector<int> direction(coords - fCoords);
+
+ if (direction.Y() < 0) {
+ f.SetOrientation(Entity::ORIENTATION_NORTH);
+ f.SetSpeed(walkingSpeed);
+ f.StartAnimation(*this);
+ } else if (direction.X() > 0) {
+ f.SetOrientation(Entity::ORIENTATION_EAST);
+ f.SetSpeed(walkingSpeed);
+ f.StartAnimation(*this);
+ } else if (direction.Y() > 0) {
+ f.SetOrientation(Entity::ORIENTATION_SOUTH);
+ f.SetSpeed(walkingSpeed);
+ f.StartAnimation(*this);
+ } else if (direction.X() < 0) {
+ f.SetOrientation(Entity::ORIENTATION_WEST);
+ f.SetSpeed(walkingSpeed);
+ f.StartAnimation(*this);
+ } else {
+ f.SetSpeed(0.0f);
+ f.StopAnimation();
+ }
+}
+
+void MapState::StopFollowers(Entity &e) {
+ for (Entity *f(e.Follower()); f; f = f->Follower()) {
+ f->SetSpeed(0.0f);
+ f->StopAnimation();
+ }
}
projects / l2e.git / blobdiff