From e60236e3046f7012efc7232f490207aeb498b598 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Sun, 11 Jan 2009 14:40:45 +0000 Subject: added tuning parameters for player collision and player hooking --- src/game/gamecore.cpp | 4 ++-- src/game/tuning.hpp | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/game/gamecore.cpp b/src/game/gamecore.cpp index 66f0ee0a..ceb63be3 100644 --- a/src/game/gamecore.cpp +++ b/src/game/gamecore.cpp @@ -312,7 +312,7 @@ void CHARACTER_CORE::tick(bool use_input) } // Check against other players first - if(world) + if(world && world->tuning.player_hooking) { float dist = 0.0f; for(int i = 0; i < MAX_CLIENTS; i++) @@ -407,7 +407,7 @@ void CHARACTER_CORE::tick(bool use_input) } } - if(world) + if(world && world->tuning.player_collision) { for(int i = 0; i < MAX_CLIENTS; i++) { diff --git a/src/game/tuning.hpp b/src/game/tuning.hpp index 210dbe96..4554a8eb 100644 --- a/src/game/tuning.hpp +++ b/src/game/tuning.hpp @@ -36,3 +36,6 @@ MACRO_TUNING_PARAM(laser_bounce_delay, 150) MACRO_TUNING_PARAM(laser_bounce_num, 1) MACRO_TUNING_PARAM(laser_bounce_cost, 0) MACRO_TUNING_PARAM(laser_damage, 5) + +MACRO_TUNING_PARAM(player_collision, 1) +MACRO_TUNING_PARAM(player_hooking, 1) -- cgit 1.4.1