From b7d62e90a7a0e4e404623af0c646495a3dd3fd2b Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Tue, 31 May 2011 13:17:14 +0000
Subject: Removed a forced recalculateLocalAabb for compound shapes, semi-colon
 in chat messages doesn't truncate the chat text any more, changed chat prompt
 to "Command:" if the first character is a slash, small misc cleanups

---
 src/core/application.h | 1 +
 src/core/entity.cc     | 4 ----
 src/core/gameserver.cc | 6 +++---
 src/core/netserver.cc  | 3 +++
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/core')

diff --git a/src/core/application.h b/src/core/application.h
index cdaef67..3f71b4c 100644
--- a/src/core/application.h
+++ b/src/core/application.h
@@ -124,6 +124,7 @@ private:
 
 	static Application	*application_instance;
 
+protected:
 	/*-- engine functions --*/
 
 	static void func_help(std::string const &args);
diff --git a/src/core/entity.cc b/src/core/entity.cc
index 6ce94a7..84f4de0 100644
--- a/src/core/entity.cc
+++ b/src/core/entity.cc
@@ -492,7 +492,6 @@ void Entity::frame(const unsigned long elapsed)
 {
 	if (entity_collision_child_shapes.size() > 0) {
 		btCompoundShape *compoundshape = static_cast<btCompoundShape *> (entity_collision_shape);
-		bool recalculate = false;
 		const float modelscale = radius() / model()->radius();
 		
 		for (int n = 0; n < compoundshape->getNumChildShapes(); n++) {
@@ -524,9 +523,6 @@ void Entity::frame(const unsigned long elapsed)
 					compoundshape->updateChildTransform(n, child_transform);
 				}
 			}
-			
-		if (recalculate)
-			compoundshape->recalculateLocalAabb();
 		}
 	}
 }
diff --git a/src/core/gameserver.cc b/src/core/gameserver.cc
index 58367e5..b4b3322 100644
--- a/src/core/gameserver.cc
+++ b/src/core/gameserver.cc
@@ -52,7 +52,7 @@ void func_time(std::string const &args)
 			<< std::setw(2) << hour << ":" 
 			<< std::setw(2) << min << ":" 
 			<< std::setw(2) << sec << " " 
-			<< std::setw(2) << "  ";
+			<< std::setw(2) << " ";
 					
 		// uptime 
 		float uptime = core::game()->time();
@@ -68,9 +68,9 @@ void func_time(std::string const &args)
 		
 		const int uptime_seconds = (int) floorf(uptime);
 		
-		con_print  << " Uptime: ";
+		con_print  << "Uptime: ";
 		if (uptime_days > 0) {
-			con_print << uptime_days << " " << aux::plural("day", uptime_days);
+			con_print << uptime_days << " " << aux::plural("day", uptime_days) << " ";
 		}
 		con_print << std::setfill('0') << std::setw(2) << uptime_hours << ":" 
 			<< std::setfill('0') << std::setw(2) << uptime_minutes << ":" 
diff --git a/src/core/netserver.cc b/src/core/netserver.cc
index d9a5bed..37adfc1 100644
--- a/src/core/netserver.cc
+++ b/src/core/netserver.cc
@@ -713,6 +713,9 @@ void NetServer::parse_incoming_message(NetClient *client, const std::string & me
 			send_message(client, "info", message);
 			send_disconnect(client);
 		}
+		
+		// TODO add player uid to connect message
+		
 		return;
 		
 	} else if (command.compare("pif") == 0) {
-- 
cgit v1.2.3