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

Changed: Minor changes

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2015-12-20 11:19:51 +01:00
parent c0a3345c83
commit 08671a2c57
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/ryzom/client/src/init_main_loop.cpp
View file

@ -741,7 +741,7 @@ void initMainLoop()
nmsg = "Creating Landscape ..."; nmsg = "Creating Landscape ...";
ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) ); ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) );
Landscape = Scene->createLandscape(); Landscape = Scene->createLandscape();
if(Landscape == 0) if(Landscape == NULL)
nlerror("initMainLoop : Cannot create a Landscape."); nlerror("initMainLoop : Cannot create a Landscape.");
if (!ClientCfg.Light) if (!ClientCfg.Light)
@ -829,7 +829,7 @@ void initMainLoop()
H_AUTO(InitRZWorld) H_AUTO(InitRZWorld)
// Initialize World and select the right continent. // Initialize World and select the right continent.
nmsg = "Loading World ..."; nmsg = "Loading World ...";
ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) ); ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) );
ContinentMngr.load(); ContinentMngr.load();
ContinentMngr.select(UserEntity->pos(), ProgressBar); ContinentMngr.select(UserEntity->pos(), ProgressBar);
@ -880,8 +880,9 @@ void initMainLoop()
{ {
nlwarning("Can't load HLSBank: %s", e.what()); nlwarning("Can't load HLSBank: %s", e.what());
} }
// setup according to client // setup according to client
if(ClientCfg.HDTextureInstalled) if (ClientCfg.HDTextureInstalled)
{ {
if(ClientCfg.HDEntityTexture) if(ClientCfg.HDEntityTexture)
{ {

2
code/ryzom/client/src/player_cl.cpp
View file

@ -469,8 +469,6 @@ void CPlayerCL::equip(SLOTTYPE::EVisualSlot slot, const std::string &shapeName,
return; return;
} }
// Attach to the skeleton. // Attach to the skeleton.
string stickPoint; string stickPoint;
if(!_Skeleton.empty()) if(!_Skeleton.empty())