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

Fixed: clang warnings

Browse source
This commit is contained in:
kervala 2015-11-06 15:24:19 +01:00
parent e791f6dfb2
commit c0a35c42ca
6 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/gui/group_html.h
View file

@ -366,7 +366,7 @@ namespace NLGUI
bool _Connecting; bool _Connecting;
double _TimeoutValue; // the timeout in seconds double _TimeoutValue; // the timeout in seconds
double _ConnectingTimeout; double _ConnectingTimeout;
uint32 _RedirectsRemaining; sint _RedirectsRemaining;
// minimal embeded lua script support // minimal embeded lua script support
// Note : any embeded script is executed immediately after the closing // Note : any embeded script is executed immediately after the closing

2
code/nel/src/logic/logic_state_machine.cpp
View file

@ -49,7 +49,7 @@ void xmlCheckNodeName (xmlNodePtr &node, const char *nodeName)
// Make an error message // Make an error message
char tmp[512]; char tmp[512];
smprintf (tmp, 512, "LogicStateMachine STATE_MACHINE XML Syntax error in block line %d, node %s should be %s", smprintf (tmp, 512, "LogicStateMachine STATE_MACHINE XML Syntax error in block line %d, node %s should be %s",
(int)node->line, node->name, nodeName); node ? (int)node->line:-1, node->name, nodeName);
nlinfo (tmp); nlinfo (tmp);
nlstop; nlstop;

3
code/nel/src/misc/displayer.cpp
View file

@ -700,6 +700,9 @@ void CMsgBoxDisplayer::doDisplay ( const CLog::TDisplayInfo& args, const char *m
# endif # endif
abort(); abort();
break; break;
default:
break;
} }
// no more sent mail for crash // no more sent mail for crash

2
code/nel/src/pacs/global_retriever.cpp
View file

@ -784,7 +784,7 @@ bool NLPACS::CGlobalRetriever::buildInstance(const string &id, const NLMISC::C
const CRetrieverInstance &instance = makeInstance(retrieverId, 0, CVector(position)); const CRetrieverInstance &instance = makeInstance(retrieverId, 0, CVector(position));
// check make instance success // check make instance success
if (&instance == NULL || instance.getInstanceId() == -1 || instance.getRetrieverId() != retrieverId) if (instance.getInstanceId() == -1 || instance.getRetrieverId() != retrieverId)
return false; return false;
// links new instance to its neighbors // links new instance to its neighbors

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

@ -396,7 +396,7 @@ bool CSkyObject::setup(const CClientDate &date, const CClientDate &animationDate
for(uint k = 0; k < SKY_MAX_NUM_STAGE; ++k) for(uint k = 0; k < SKY_MAX_NUM_STAGE; ++k)
{ {
if (TexPanner[k].U != 0.f || TexPanner[k].V != 0.f || if (TexPanner[k].U != 0.f || TexPanner[k].V != 0.f ||
OffsetUBitmap != NULL || OffsetVBitmap != NULL ) OffsetUBitmap[k] != NULL || OffsetVBitmap[k] != NULL )
{ {
//nlinfo("global date = %f", animTime); //nlinfo("global date = %f", animTime);
// there's tex panning for that stage // there's tex panning for that stage

9
code/ryzom/common/src/game_share/utils.h
View file

@ -425,7 +425,8 @@ inline void CCallStackSingleton::setTopStackEntry(ICallStackEntry* newEntry)
inline void CCallStackSingleton::display(NLMISC::CLog *log) inline void CCallStackSingleton::display(NLMISC::CLog *log)
{ {
nlassert(log!=NULL); nlassert(log!=NULL);
getTopStackEntry()->displayStack(*log); ICallStackEntry *entry = getTopStackEntry();
if (entry) entry->displayStack(*log);
log->displayNL(""); log->displayNL("");
} }
@ -468,15 +469,13 @@ inline ICallStackEntry::~ICallStackEntry()
inline void ICallStackEntry::displayStack(NLMISC::CLog& log) const inline void ICallStackEntry::displayStack(NLMISC::CLog& log) const
{ {
// stop recursing when we reach a NULL object // stop recursing when we reach a NULL object
// (this is implemented in this way in order to ximplify call code) // (this is implemented in this way in order to simplify call code)
if (this==NULL)
return;
// display this entry // display this entry
displayEntry(log); displayEntry(log);
// recurse through call stack // recurse through call stack
_Next->displayStack(log); if (_Next) _Next->displayStack(log);
} }