Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/base/game.h')
-rw-r--r--src/game/base/game.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/game/base/game.h b/src/game/base/game.h
index 645d573..2fc5d95 100644
--- a/src/game/base/game.h
+++ b/src/game/base/game.h
@@ -37,9 +37,6 @@ const unsigned int cargopod_enttype = 263;
const unsigned int spacemine_enttype = 264;
const unsigned int race_enttype = 280;
-// planet docking distance
-const float planet_safe_distance = 50.0f;
-
// ship engine delay times
const float jump_timer_delay = 5.0f;
const float jump_cooldown_delay = 2.0f;
@@ -125,7 +122,6 @@ private:
static void func_impulse(core::Player *player, std::string const &args);
static void func_launch(core::Player *player, std::string const &args);
static void func_respawn(core::Player *player, std::string const &args);
- static void func_freeflight(core::Player *player, std::string const &args);
static void func_goto(core::Player *player, const std::string &args);
static void func_buy(core::Player *player, std::string const &args);
static void func_sell(core::Player *player, const std::string &args);
@@ -136,12 +132,18 @@ private:
static void func_mount(core::Player *player, const std::string &args);
static void func_unmount(core::Player *player, const std::string &args);
static void func_beam(core::Player *player, const std::string &args);
+
+
static void func_wingmen(core::Player *player, const std::string &args);
+ static void func_freeflight(core::Player *player, std::string const &args);
+
/* ---- target functions ----------------------------------- */
static void func_target_goto(core::Player *player, core::Entity *entity);
static void func_target_dock(core::Player *player, core::Entity *entity);
+ static void func_target_formation(core::Player *player, core::Entity *entity);
+
static void func_target_hail(core::Player *player, core::Entity *entity);
static void func_target_trade(core::Player *player, core::Entity *entity);
};