From 08671a2c57fa042c8c4818b1c0187a126db34ac0 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 20 Dec 2015 11:19:51 +0100 Subject: [PATCH] Changed: Minor changes --HG-- branch : develop --- code/ryzom/client/src/init_main_loop.cpp | 7 ++++--- code/ryzom/client/src/player_cl.cpp | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/ryzom/client/src/init_main_loop.cpp b/code/ryzom/client/src/init_main_loop.cpp index 63bad66c4..b7383e308 100644 --- a/code/ryzom/client/src/init_main_loop.cpp +++ b/code/ryzom/client/src/init_main_loop.cpp @@ -741,7 +741,7 @@ void initMainLoop() nmsg = "Creating Landscape ..."; ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) ); Landscape = Scene->createLandscape(); - if(Landscape == 0) + if(Landscape == NULL) nlerror("initMainLoop : Cannot create a Landscape."); if (!ClientCfg.Light) @@ -829,7 +829,7 @@ void initMainLoop() H_AUTO(InitRZWorld) // Initialize World and select the right continent. - nmsg = "Loading World ..."; + nmsg = "Loading World ..."; ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) ); ContinentMngr.load(); ContinentMngr.select(UserEntity->pos(), ProgressBar); @@ -880,8 +880,9 @@ void initMainLoop() { nlwarning("Can't load HLSBank: %s", e.what()); } + // setup according to client - if(ClientCfg.HDTextureInstalled) + if (ClientCfg.HDTextureInstalled) { if(ClientCfg.HDEntityTexture) { diff --git a/code/ryzom/client/src/player_cl.cpp b/code/ryzom/client/src/player_cl.cpp index 97e378c2b..f94fb5e78 100644 --- a/code/ryzom/client/src/player_cl.cpp +++ b/code/ryzom/client/src/player_cl.cpp @@ -469,8 +469,6 @@ void CPlayerCL::equip(SLOTTYPE::EVisualSlot slot, const std::string &shapeName, return; } - - // Attach to the skeleton. string stickPoint; if(!_Skeleton.empty())