diff options
Diffstat (limited to 'src/game/base/ship.cc')
-rw-r--r-- | src/game/base/ship.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc index 20f37c8..c7a5eda 100644 --- a/src/game/base/ship.cc +++ b/src/game/base/ship.cc @@ -105,23 +105,23 @@ void Ship::jump(std::string const &args) helpstr.append(zone->label()); } - core::server()->send(owner(), "Usage: jump [^B" + helpstr + "^N]"); + owner()->send("Usage: jump [^B" + helpstr + "^N]"); return; } aux::to_lowercase(target); jumptargetzone = core::Zone::find_zone(target); if (!jumptargetzone) { - core::server()->send(owner(), "Unknown system '" + target + '\''); + owner()->send("Unknown system '" + target + '\''); return; } if (jumptargetzone == zone()) { - core::server()->send(owner(), "Already in the " + jumptargetzone->name() + '.'); + owner()->send("Already in the " + jumptargetzone->name() + '.'); return; } - core::server()->send(owner(), "Jumping to the " + jumptargetzone->name()); + owner()->send("Jumping to the " + jumptargetzone->name()); set_zone(jumptargetzone); if (owner()->control() == (EntityControlable*) this) owner()->set_zone(jumptargetzone); @@ -134,14 +134,14 @@ void Ship::jump(std::string const &args) } else { if (!jumpdrive() && !Base::g_devel->value()) { - core::server()->send(owner(), "This ship is not equiped with a hyperspace drive!"); + owner()->send("This ship is not equiped with a hyperspace drive!"); return; } else if (entity_eventstate == core::Entity::Jump) { return; } else if (entity_eventstate == core::Entity::JumpInitiate) { - core::server()->send(owner(), "Jump aborted, hyperspace drive deactivated."); + owner()->send("Jump aborted, hyperspace drive deactivated."); ship_jumpdrive_timer = 0; entity_timer = 0; entity_eventstate = core::Entity::Normal; @@ -183,14 +183,14 @@ JumpPoint * Ship::find_closest_jumppoint() if (jumppoint && jumppoint->target()) { if (Base::g_jumppointrange->value() < d) { - core::server()->send(owner(), "Jumppoint out of range!"); + owner()->send("Jumppoint out of range!"); return 0; } else { - core::server()->send(owner(), "Jumping to the " + jumppoint->target()->zone()->name()); + owner()->send("Jumping to the " + jumppoint->target()->zone()->name()); return jumppoint; } } else { - core::server()->send(owner(), "No jumppoints found!"); + owner()->send("No jumppoints found!"); return 0; } |