Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fix warnings

Browse source
This commit is contained in:
kaetemi 2013-09-27 01:32:01 +02:00
parent 3b1d4e3915
commit 3b4730c890
4 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
View file

@ -23,6 +23,7 @@
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/XKBlib.h>
#include "nel/misc/debug.h" #include "nel/misc/debug.h"
@ -566,7 +567,7 @@ bool CUnixEventEmitter::processMessage (XEvent &event, CEventServer *server)
} }
else else
{ {
k = XKeycodeToKeysym(_dpy, keyCode, 0); k = XkbKeycodeToKeysym(_dpy, keyCode, 0, 0);
} }
// send CEventKeyDown event only if keyCode is defined // send CEventKeyDown event only if keyCode is defined

17
code/ryzom/server/src/ai_share/world_map.h
View file

@ -1633,18 +1633,27 @@ CTopology::CTopology()
{ {
} }
// convert a 2 characters string to uint16
#ifdef NL_LITTLE_ENDIAN
# define NELID16(x) (uint16((x[0] << 8) | (x[1])))
#else
# define NELID16(x) (uint16((x[1] << 8) | (x[0])))
#endif
inline inline
void CTopology::serial(NLMISC::IStream& f) void CTopology::serial(NLMISC::IStream& f)
{ {
uint version = 0; uint version = 0;
uint16 check = (uint16)'Tp'; uint16 check = NELID16("Tp");
f.serial(check); f.serial(check);
if (check != (uint16)'TP') if (check != NELID16("TP"))
{ {
nlassert(check == (uint16)'Tp'); nlassert(check == NELID16("Tp"));
version = f.serialVersion(3); version = f.serialVersion(3);
} }
@ -2285,7 +2294,7 @@ sint CWhiteCell::getHeight(CWorldPosition const& wpos) const
inline inline
void CWhiteCell::serial(NLMISC::IStream& f) void CWhiteCell::serial(NLMISC::IStream& f)
{ {
f.serialCheck((uint16)'WC'); f.serialCheck(NELID16("WC"));
if (f.isReading()) if (f.isReading())
_HeightMap = I16x16Layer::load(f); _HeightMap = I16x16Layer::load(f);
else else

4
code/ryzom/tools/leveldesign/mission_compiler_lib/mission_compiler.cpp
View file

@ -177,8 +177,8 @@ GenderExtractor::GenderExtractor(const std::string & literal, const std::string&
static const char * es[] ={"e", "e1", "e2", "e3"}; static const char * es[] ={"e", "e1", "e2", "e3"};
static char * fs[] ={"f", "f1", "f2", "f3"}; static const char * fs[] ={"f", "f1", "f2", "f3"};
static char * hs[] ={"h", "h1", "h2", "h3"}; static const char * hs[] ={"h", "h1", "h2", "h3"};
const char * e = es[level]; const char * e = es[level];
const char * f = fs[level]; const char * f = fs[level];

2
code/ryzom/tools/leveldesign/mission_compiler_lib/variables.cpp
View file

@ -331,7 +331,7 @@ REGISTER_VAR_INDIRECT(CVarSBrick, "var_sbrick");
/* for special item */ /* for special item */
char *SpecialItemProp[] = const char *SpecialItemProp[] =
{ {
"Durability", "Durability",
"Weight", "Weight",