From 4c5b00221c9405c5af06143974fbc6296ebe46b5 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Mon, 18 Oct 2010 19:13:58 +0000
Subject: local vstrafe support, initial ship collision, g_damping factor

---
 src/game/base/game.cc | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/game/base/game.cc')

diff --git a/src/game/base/game.cc b/src/game/base/game.cc
index a075574..346208b 100644
--- a/src/game/base/game.cc
+++ b/src/game/base/game.cc
@@ -54,6 +54,7 @@ core::Cvar *Game::g_impulsespeed = 0;
 core::Cvar *Game::g_impulseacceleration = 0;
 core::Cvar *Game::g_jumppointrange = 0;
 core::Cvar *Game::g_devel = 0;
+core::Cvar *Game::g_damping = 0;
 
 core::Module *factory()
 {
@@ -729,12 +730,14 @@ Game::Game() : core::Module("Project::OSiRiON", true)
 		return;
 	}
 
+	// load world.ini and the zones it refers to
 	if (!load_world()) {
 		abort();
 		return;
 	}
 
-	if (!load_player()) {
+	// load game default settings
+	if (!load_defaults()) {
 		abort();
 		return;
 	}
@@ -796,6 +799,9 @@ Game::Game() : core::Module("Project::OSiRiON", true)
 
 	g_devel = core::Cvar::get("g_devel", "0", core::Cvar::Archive);
 	g_devel->set_info("[bool] enable or disable developer mode");
+	
+	g_damping = core::Cvar::get("g_damping", "0.1", core::Cvar::Archive);
+	g_damping->set_info("[float] physics damping factor (0-1)");
 }
 
 Game::~Game()
@@ -1301,13 +1307,13 @@ bool Game::generate_entity_menus(core::Entity *entity)
 	return true;
 }
 
-// load default player settings
-bool Game::load_player()
+// load game defaults settings
+bool Game::load_defaults()
 {
 	Default::clear();
 
 	filesystem::IniFile inifile;
-	inifile.open("player");
+	inifile.open("game");
 	if (!inifile.is_open()) {
 		con_error << "Could not open " << inifile.name() << "!" << std::endl;
 		return false;
-- 
cgit v1.2.3