From d7b8ec69e08a9bcf8ea2082c94f6f559587fce05 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 6 Jul 2010 08:52:29 +0200 Subject: [PATCH] Changed: #825 Remove all warning when compiling Ryzom --- code/snowballs2/client/src/animation.cpp | 2 +- code/snowballs2/client/src/snowballs_client.cpp | 2 +- code/snowballs2/server/collision/src/collision_service.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/snowballs2/client/src/animation.cpp b/code/snowballs2/client/src/animation.cpp index bb5a97c84..a30b35e06 100644 --- a/code/snowballs2/client/src/animation.cpp +++ b/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; diff --git a/code/snowballs2/client/src/snowballs_client.cpp b/code/snowballs2/client/src/snowballs_client.cpp index 8548afdc9..d57b4f223 100644 --- a/code/snowballs2/client/src/snowballs_client.cpp +++ b/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 } diff --git a/code/snowballs2/server/collision/src/collision_service.h b/code/snowballs2/server/collision/src/collision_service.h index 3b8468928..c1bbc9ac5 100644 --- a/code/snowballs2/server/collision/src/collision_service.h +++ b/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;