aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-23 07:36:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
rti 2010-07-06 20:33:14 +02:00
commit 977ca59638
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/snowballs2/client/src/animation.cpp
View file

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

2
code/snowballs2/client/src/snowballs_client.cpp
View file

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

4
code/snowballs2/server/collision/src/collision_service.h
View file

@ -27,10 +27,10 @@ class CCollisionService : public NLNET::IService
protected: protected:
struct CEntity 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 OldClientPosition;
NLMISC::CVector NewClientPosition; NLMISC::CVector NewClientPosition;
NLPACS::UMovePrimitive *MovePrimitive; // ServerPösition NLPACS::UMovePrimitive *MovePrimitive; // ServerPosition
float Distance; float Distance;
bool Moving; bool Moving;
bool Retry; bool Retry;