merge

code/snowballs2/client/src/animation.cpp

@@ -70,7 +70,7 @@ UPlayListManager *PlayListManager = NULL;
 
 struct Anim
 {
-	char		*Name;
+	const char	*Name;
 	bool		 Loop;
 	uint		 Id;
 	UAnimation	*Animation;

code/snowballs2/client/src/snowballs_client.cpp

@@ -211,7 +211,7 @@ SwitchNextGameState:
 #ifdef NL_OS_WINDOWS
 				MessageBox(NULL, e.what(), "NeL Exception", MB_OK | MB_ICONSTOP);
 #else
-				printf(e.what());
+				printf("%s\n", e.what());
 #endif
 				return; // exit if driver loading failed
 			}

code/snowballs2/server/collision/src/collision_service.h

@@ -27,10 +27,10 @@ class CCollisionService : public NLNET::IService
 protected:
 	struct CEntity
 	{
-		CEntity() : NewClientPosition(), OldClientPosition(), MovePrimitive(NULL), Moving(false), Retry(false) { }
+		CEntity() : OldClientPosition(), NewClientPosition(), MovePrimitive(NULL), Distance(0.0f), Moving(false), Retry(false) { }
 		NLMISC::CVector OldClientPosition;
 		NLMISC::CVector NewClientPosition;
-		NLPACS::UMovePrimitive *MovePrimitive; // ServerPösition
+		NLPACS::UMovePrimitive *MovePrimitive; // ServerPosition
 		float Distance;
 		bool Moving;
 		bool Retry;