about summary refs log tree commit diff
path: root/src/game
diff options
context:
space:
mode:
authorOlle Rosenquist <phobos99@gmail.com>2007-07-22 13:46:45 +0000
committerOlle Rosenquist <phobos99@gmail.com>2007-07-22 13:46:45 +0000
commit184796de1c1c455cca8c15649b7f406358d86bfe (patch)
tree0b46413dc03d3e483dd9182ac01ab2d460aadc71 /src/game
parentee8998207524a714d9fdae87cfe649f94b556c13 (diff)
downloadzcatch-184796de1c1c455cca8c15649b7f406358d86bfe.tar.gz
zcatch-184796de1c1c455cca8c15649b7f406358d86bfe.zip
Ninja fixes
Diffstat (limited to 'src/game')
-rw-r--r--src/game/server/game_server.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp
index 9ca153fd..03891e24 100644
--- a/src/game/server/game_server.cpp
+++ b/src/game/server/game_server.cpp
@@ -651,6 +651,7 @@ void player::init()
 	name[3] = 'b';
 	name[4] = 0;
 	client_id = -1;
+	team = 0;
 	extrapowerflags = 0;
 	ninjaactivationtick = 0;
 	reset();
@@ -665,7 +666,6 @@ void player::reset()
 	vel = vec2(0.0f, 0.0f);
 	direction = vec2(0.0f, 1.0f);
 	score = 0;
-	team = 0;
 	dead = true;
 	die_tick = 0;
 }
@@ -797,7 +797,7 @@ int player::handle_ninja()
 			int type = OBJTYPE_PLAYER;
 			entity *ents[64];
 			vec2 dir = pos - oldpos;
-			float radius = length(dir * 0.5f);
+			float radius = phys_size * 2.0f; //length(dir * 0.5f);
 			vec2 center = oldpos + dir * 0.5f;
 			int num = world.find_entities(center, radius, ents, 64, &type, 1);