diff options
Diffstat (limited to 'src/game/base/racetrack.cc')
| -rw-r--r-- | src/game/base/racetrack.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/game/base/racetrack.cc b/src/game/base/racetrack.cc index f36c047..f54a24b 100644 --- a/src/game/base/racetrack.cc +++ b/src/game/base/racetrack.cc @@ -17,7 +17,7 @@ namespace game { CheckPoint::CheckPoint(RaceTrack *parent) { - entity_eventstate = core::Entity::NoPower; + set_state(core::Entity::NoPower); parent_track = parent; if (parent) { entity_color = parent->color(); @@ -42,7 +42,7 @@ RaceTrack::RaceTrack() : EntityDynamic() track_racestart = 0; track_checkpointtime = 0; - entity_eventstate = core::Entity::NoPower; + set_state(core::Entity::NoPower); set_flag(core::Entity::Dockable); } @@ -66,10 +66,10 @@ void RaceTrack::reset() track_checkpointtime = 0; for (CheckPoints::iterator cpit = track_checkpoints.begin(); cpit != track_checkpoints.end(); ++cpit) { - (*cpit)->set_eventstate(core::Entity::NoPower); + (*cpit)->set_state(core::Entity::NoPower); } - set_eventstate(core::Entity::NoPower); + set_state(core::Entity::NoPower); } void RaceTrack::dock(core::Entity *entity) @@ -91,10 +91,10 @@ void RaceTrack::dock(core::Entity *entity) track_player = ship->owner(); track_racestart = core::server()->time(); - set_eventstate(core::Entity::Normal); + set_state(core::Entity::Normal); for (CheckPoints::iterator cpit = track_checkpoints.begin(); cpit != track_checkpoints.end(); ++cpit) { - set_eventstate(core::Entity::Normal); + set_state(core::Entity::Normal); } entity_timer = 5.0f; @@ -151,7 +151,7 @@ void RaceTrack::frame(float seconds) track_racestart = core::server()->time(); } else { for (CheckPoints::iterator cpit = track_checkpoints.begin(); cpit != track_checkpoints.end(); ++cpit) { - (*cpit)->set_eventstate(core::Entity::NoPower); + (*cpit)->set_state(core::Entity::NoPower); } std::string message("^BGo!"); core::server()->broadcast(message); @@ -159,7 +159,7 @@ void RaceTrack::frame(float seconds) track_racestart = core::server()->time(); track_checkpointtime = core::server()->time() + 15.0f; track_checkpoint = track_checkpoints.begin(); - (*track_checkpoint)->set_eventstate(core::Entity::Normal); + (*track_checkpoint)->set_state(core::Entity::Normal); track_player->set_mission_target((*track_checkpoint)); } } @@ -184,9 +184,9 @@ void RaceTrack::frame(float seconds) std::string message("^BCheckpoint!"); core::server()->broadcast(message); track_checkpointtime = core::server()->time() + 15.0f; - (*track_checkpoint)->set_eventstate(core::Entity::NoPower); + (*track_checkpoint)->set_state(core::Entity::NoPower); track_checkpoint++; - (*track_checkpoint)->set_eventstate(core::Entity::Normal); + (*track_checkpoint)->set_state(core::Entity::Normal); track_player->set_mission_target((*track_checkpoint)); } else { |