diff --git a/code/nel/include/nel/misc/common.h b/code/nel/include/nel/misc/common.h index f72a4dd3b..4f5bacb75 100644 --- a/code/nel/include/nel/misc/common.h +++ b/code/nel/include/nel/misc/common.h @@ -298,7 +298,7 @@ void nlSleep( uint32 ms ); #endif /// Returns Thread Id (note: on Linux, Process Id is the same as the Thread Id) -uint getThreadId(); +size_t getThreadId(); /// Returns a readable string from a vector of bytes. unprintable char are replaced by '?' std::string stringFromVector( const std::vector& v, bool limited = true ); diff --git a/code/nel/include/nel/misc/debug.h b/code/nel/include/nel/misc/debug.h index 6343e5523..8a7626fbd 100644 --- a/code/nel/include/nel/misc/debug.h +++ b/code/nel/include/nel/misc/debug.h @@ -374,19 +374,19 @@ extern bool _assertex_stop_1(bool &ignoreNextTime); // Linux set of asserts is reduced due to that there is no message box displayer #define nlassert(exp) \ -{ \ +do { \ if (!(exp)) { \ NLMISC::createDebug (); \ NLMISC::INelContext::getInstance().getAssertLog()->setPosition (__LINE__, __FILE__, __FUNCTION__); \ NLMISC::INelContext::getInstance().getAssertLog()->displayNL ("\"%s\" ", #exp); \ NLMISC_BREAKPOINT; \ } \ -} +} while(0) #define nlassertonce(exp) nlassert(exp) #define nlassertex(exp, str) \ -{ \ +do { \ if (!(exp)) { \ NLMISC::createDebug (); \ NLMISC::INelContext::getInstance().getAssertLog()->setPosition (__LINE__, __FILE__, __FUNCTION__); \ @@ -394,7 +394,7 @@ extern bool _assertex_stop_1(bool &ignoreNextTime); NLMISC::INelContext::getInstance().getAssertLog()->displayRawNL str; \ NLMISC_BREAKPOINT; \ } \ -} +} while(0) #define nlverify(exp) nlassert(exp) #define nlverifyonce(exp) nlassert(exp) @@ -403,7 +403,7 @@ extern bool _assertex_stop_1(bool &ignoreNextTime); # else // NL_OS_UNIX #define nlassert(exp) \ -{ \ +do { \ static bool ignoreNextTime = false; \ bool _expResult_ = (exp) ? true : false; \ if (!ignoreNextTime && !_expResult_) { \ @@ -411,20 +411,20 @@ extern bool _assertex_stop_1(bool &ignoreNextTime); NLMISC_BREAKPOINT; \ } \ ASSERT_THROW_EXCEPTION_CODE_EX(_expResult_, #exp) \ -} +} while(0) #define nlassertonce(exp) \ -{ \ +do { \ static bool ignoreNextTime = false; \ if (!ignoreNextTime && !(exp)) { \ ignoreNextTime = true; \ if(NLMISC::_assert_stop(ignoreNextTime, __LINE__, __FILE__, __FUNCTION__, #exp)) \ NLMISC_BREAKPOINT; \ } \ -} +} while(0) #define nlassertex(exp, str) \ -{ \ +do { \ static bool ignoreNextTime = false; \ bool _expResult_ = (exp) ? true : false; \ if (!ignoreNextTime && !_expResult_) { \ @@ -434,10 +434,10 @@ extern bool _assertex_stop_1(bool &ignoreNextTime); NLMISC_BREAKPOINT; \ } \ ASSERT_THROW_EXCEPTION_CODE_EX(_expResult_, #exp) \ -} +} while(0) #define nlverify(exp) \ -{ \ +do { \ static bool ignoreNextTime = false; \ bool _expResult_ = (exp) ? true : false; \ if (!_expResult_ && !ignoreNextTime) { \ @@ -445,10 +445,10 @@ extern bool _assertex_stop_1(bool &ignoreNextTime); NLMISC_BREAKPOINT; \ } \ ASSERT_THROW_EXCEPTION_CODE_EX(_expResult_, #exp) \ -} +} while(0) #define nlverifyonce(exp) \ -{ \ +do { \ static bool ignoreNextTime = false; \ bool _expResult_ = (exp) ? true : false; \ if (!_expResult_ && !ignoreNextTime) { \ @@ -456,10 +456,10 @@ extern bool _assertex_stop_1(bool &ignoreNextTime); if(NLMISC::_assert_stop(ignoreNextTime, __LINE__, __FILE__, __FUNCTION__, #exp)) \ NLMISC_BREAKPOINT; \ } \ -} +} while(0) #define nlverifyex(exp, str) \ -{ \ +do { \ static bool ignoreNextTime = false; \ bool _expResult_ = (exp) ? true : false; \ if (!_expResult_ && !ignoreNextTime) { \ @@ -469,7 +469,7 @@ extern bool _assertex_stop_1(bool &ignoreNextTime); NLMISC_BREAKPOINT; \ } \ ASSERT_THROW_EXCEPTION_CODE_EX(_expResult_, #exp) \ -} +} while(0) # endif // NL_OS_UNIX @@ -478,28 +478,28 @@ extern bool _assertex_stop_1(bool &ignoreNextTime); #define nlunreferenced(identifier) (identifier) #define nlstop \ -{ \ +do { \ static bool ignoreNextTime = false; \ if (!ignoreNextTime) { \ if(NLMISC::_assert_stop(ignoreNextTime, __LINE__, __FILE__, __FUNCTION__, NULL)) \ NLMISC_BREAKPOINT; \ } \ ASSERT_THROW_EXCEPTION_CODE(false) \ -} +} while(0) #define nlstoponce \ -{ \ +do { \ static bool ignoreNextTime = false; \ if (!ignoreNextTime) { \ ignoreNextTime = true; \ if(NLMISC::_assert_stop(ignoreNextTime, __LINE__, __FILE__, __FUNCTION__, NULL)) \ NLMISC_BREAKPOINT; \ } \ -} +} while(0) #define nlstopex(str) \ -{ \ +do { \ static bool ignoreNextTime = false; \ if (!ignoreNextTime) { \ NLMISC::_assertex_stop_0(ignoreNextTime, __LINE__, __FILE__, __FUNCTION__, NULL); \ @@ -507,7 +507,7 @@ extern bool _assertex_stop_1(bool &ignoreNextTime); if(NLMISC::_assertex_stop_1(ignoreNextTime)) \ NLMISC_BREAKPOINT; \ } \ -} +} while(0) struct EFatalError : public Exception diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp index 9c93d6b80..901c5e3f3 100644 --- a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp +++ b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp @@ -3187,7 +3187,7 @@ IOcclusionQuery::TOcclusionType COcclusionQueryD3D::getOcclusionType() H_AUTO_D3D(COcclusionQueryD3D_getOcclusionType); nlassert(Driver); nlassert(Query); - nlassert(Driver->_CurrentOcclusionQuery != this) // can't query result between a begin/end pair! + nlassert(Driver->_CurrentOcclusionQuery != this); // can't query result between a begin/end pair! if (OcclusionType == NotAvailable) { DWORD numPix; @@ -3207,7 +3207,7 @@ uint COcclusionQueryD3D::getVisibleCount() H_AUTO_D3D(COcclusionQueryD3D_getVisibleCount); nlassert(Driver); nlassert(Query); - nlassert(Driver->_CurrentOcclusionQuery != this) // can't query result between a begin/end pair! + nlassert(Driver->_CurrentOcclusionQuery != this); // can't query result between a begin/end pair! if (getOcclusionType() == NotAvailable) return 0; return VisibleCount; } diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.cpp b/code/nel/src/3d/driver/opengl/driver_opengl.cpp index ce504aad0..2f7e3ed24 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl.cpp @@ -4231,7 +4231,7 @@ IOcclusionQuery::TOcclusionType COcclusionQueryGL::getOcclusionType() H_AUTO_OGL(COcclusionQueryGL_getOcclusionType) nlassert(Driver); nlassert(ID); - nlassert(Driver->_CurrentOcclusionQuery != this) // can't query result between a begin/end pair! + nlassert(Driver->_CurrentOcclusionQuery != this); // can't query result between a begin/end pair! if (OcclusionType == NotAvailable) { GLuint result; @@ -4254,7 +4254,7 @@ uint COcclusionQueryGL::getVisibleCount() H_AUTO_OGL(COcclusionQueryGL_getVisibleCount) nlassert(Driver); nlassert(ID); - nlassert(Driver->_CurrentOcclusionQuery != this) // can't query result between a begin/end pair! + nlassert(Driver->_CurrentOcclusionQuery != this); // can't query result between a begin/end pair! if (getOcclusionType() == NotAvailable) return 0; return VisibleCount; } diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp index 452a7a569..2eafa4b1a 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_states.cpp @@ -923,7 +923,7 @@ void CDriverGLStates::enableVertexAttribArrayForEXTVertexShader(uint glIndex, bo nglDisableVariantClientStateEXT(variants[CDriverGL::EVSPaletteSkinVariant]); break; case 7: // empty - nlstop + nlstop; break; case 8: case 9: diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp index ecac46292..cdf4eef0d 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp @@ -1413,7 +1413,7 @@ void CDriverGL::setupGlArraysForEXTVertexShader(CVertexBufferInfo &vb) } break; case CVertexBuffer::Empty: // empty - nlstop + nlstop; break; case CVertexBuffer::TexCoord0: case CVertexBuffer::TexCoord1: @@ -1483,7 +1483,7 @@ void CDriverGL::setupGlArraysForEXTVertexShader(CVertexBufferInfo &vb) } break; case CVertexBuffer::Empty: // empty - nlstop + nlstop; break; case CVertexBuffer::TexCoord0: case CVertexBuffer::TexCoord1: diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp index f2282d4af..e02920f78 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex_program.cpp @@ -1400,7 +1400,7 @@ bool CDriverGL::setupARBVertexProgram (const CVPParser::TProgram &inParsedProgra { GLint position; glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &position); - nlassert(position != -1) // there was an error.. + nlassert(position != -1); // there was an error.. nlassert(position < (GLint) code.size()); uint line = 0; const char *lineStart = code.c_str(); diff --git a/code/nel/src/3d/packed_world.cpp b/code/nel/src/3d/packed_world.cpp index 0f75ee394..8a3acbb7c 100644 --- a/code/nel/src/3d/packed_world.cpp +++ b/code/nel/src/3d/packed_world.cpp @@ -34,7 +34,7 @@ void CPackedWorld::build(std::vector &packedZones) _Zones.clear(); if (packedZones.empty()) return; CAABBox box; - nlassert(packedZones[0]) + nlassert(packedZones[0]); box = packedZones[0]->Box; for(uint k = 1; k < packedZones.size(); ++k) { diff --git a/code/nel/src/3d/particle_system.cpp b/code/nel/src/3d/particle_system.cpp index 0c020a5bd..4e9eeff29 100644 --- a/code/nel/src/3d/particle_system.cpp +++ b/code/nel/src/3d/particle_system.cpp @@ -2127,7 +2127,7 @@ void CParticleSystem::addRefForUserSysCoordInfo(uint numRefs) { _UserCoordSystemInfo = new CUserCoordSystemInfo; } - nlassert(_UserCoordSystemInfo) + nlassert(_UserCoordSystemInfo); _UserCoordSystemInfo->NumRef += numRefs; } @@ -2138,7 +2138,7 @@ void CParticleSystem::releaseRefForUserSysCoordInfo(uint numRefs) NL_PS_FUNC_MAIN(CParticleSystem_releaseRefForUserSysCoordInfo) if (!numRefs) return; nlassert(_UserCoordSystemInfo); - nlassert(numRefs <= _UserCoordSystemInfo->NumRef) + nlassert(numRefs <= _UserCoordSystemInfo->NumRef); _UserCoordSystemInfo->NumRef -= numRefs; if (_UserCoordSystemInfo->NumRef == 0) { diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp index 55b50a219..f51ac4c71 100644 --- a/code/nel/src/misc/common.cpp +++ b/code/nel/src/misc/common.cpp @@ -107,12 +107,12 @@ void nlSleep( uint32 ms ) /* * Returns Thread Id (note: on Linux, Process Id is the same as the Thread Id) */ -uint getThreadId() +size_t getThreadId() { #ifdef NL_OS_WINDOWS return GetCurrentThreadId(); #elif defined NL_OS_UNIX - return uint(pthread_self()); + return size_t(pthread_self()); // doesnt work on linux kernel 2.6 return getpid(); #endif diff --git a/code/nel/src/misc/polygon.cpp b/code/nel/src/misc/polygon.cpp index 355e58705..8e42570d0 100644 --- a/code/nel/src/misc/polygon.cpp +++ b/code/nel/src/misc/polygon.cpp @@ -2161,7 +2161,7 @@ CPolygon2D::CPolygon2D(const CTriangle &tri, const CMatrix &projMat) // ******************************************************************************* void CPolygon2D::getBoundingRect(CVector2f &minCorner, CVector2f &maxCorner) const { - nlassert(!Vertices.empty()) + nlassert(!Vertices.empty()); minCorner = maxCorner = Vertices[0]; uint numVertices = Vertices.size(); for(uint k = 0; k < numVertices; ++k) diff --git a/code/nel/src/net/unified_network.cpp b/code/nel/src/net/unified_network.cpp index a15f12fbb..5e3e4689c 100644 --- a/code/nel/src/net/unified_network.cpp +++ b/code/nel/src/net/unified_network.cpp @@ -34,7 +34,7 @@ using namespace NLMISC; namespace NLNET { -static uint ThreadCreator = 0; +static size_t ThreadCreator = 0; static const uint64 AppIdDeadConnection = 0xDEAD; diff --git a/code/nel/src/sound/driver/openal/stdopenal.h b/code/nel/src/sound/driver/openal/stdopenal.h index 4bd9fd2a3..4ee7036bc 100644 --- a/code/nel/src/sound/driver/openal/stdopenal.h +++ b/code/nel/src/sound/driver/openal/stdopenal.h @@ -35,8 +35,13 @@ #include #include -#include -#include +#ifdef NL_OS_MAC +# include +# include +#else +# include +# include +#endif #include #include diff --git a/code/ryzom/client/src/fog_map.cpp b/code/ryzom/client/src/fog_map.cpp index b0941cfb9..bd1e47978 100644 --- a/code/ryzom/client/src/fog_map.cpp +++ b/code/ryzom/client/src/fog_map.cpp @@ -132,7 +132,7 @@ void CFogMap::getFogParams(float startDist, float endDist, float x, float y, flo NLMISC::CRGBAF CFogMap::getMapValue(TMapType type, float x, float y, NLMISC::CRGBAF defaultValue) const { H_AUTO_USE(RZ_FogMap) - nlassert(type < CFogMapBuild::NumMap) + nlassert(type < CFogMapBuild::NumMap); if (_Map[type].getWidth() == 0) return defaultValue; float mx, my; worldPosToMapPos(x, y, mx, my); @@ -143,7 +143,7 @@ NLMISC::CRGBAF CFogMap::getMapValue(TMapType type, float x, float y, NLMISC::CRG NLMISC::CRGBAF CFogMap::getMapValueFromMapCoord(TMapType type, float x, float y, NLMISC::CRGBAF defaultValue) const { H_AUTO_USE(RZ_FogMap) - nlassert(type < CFogMapBuild::NumMap) + nlassert(type < CFogMapBuild::NumMap); if (_Map[type].getWidth() == 0) return defaultValue; return _Map[type].getColor(x, y); } diff --git a/code/ryzom/client/src/interface_v3/group_list.cpp b/code/ryzom/client/src/interface_v3/group_list.cpp index ca303d8e6..43e6df6c7 100644 --- a/code/ryzom/client/src/interface_v3/group_list.cpp +++ b/code/ryzom/client/src/interface_v3/group_list.cpp @@ -900,7 +900,7 @@ bool CGroupList::addChildAtIndex(CViewBase *child, uint index, bool deleteOn addView (pVB, (sint) index); return true; } - nlstop + nlstop; return false; } return false; diff --git a/code/ryzom/client/src/interface_v3/group_paragraph.cpp b/code/ryzom/client/src/interface_v3/group_paragraph.cpp index a71f0ae1f..04bdc4033 100644 --- a/code/ryzom/client/src/interface_v3/group_paragraph.cpp +++ b/code/ryzom/client/src/interface_v3/group_paragraph.cpp @@ -1074,7 +1074,7 @@ bool CGroupParagraph::addChildAtIndex(CViewBase *child, uint index, bool deleteO addView (pVB, (sint) index); return true; } - nlstop + nlstop; return false; } return false; diff --git a/code/ryzom/client/src/login_xdelta.cpp b/code/ryzom/client/src/login_xdelta.cpp index 7a0c6e459..12df6a500 100644 --- a/code/ryzom/client/src/login_xdelta.cpp +++ b/code/ryzom/client/src/login_xdelta.cpp @@ -626,7 +626,7 @@ CXDeltaPatch::TApplyResult CXDeltaPatch::apply(const std::string &sFileToPatch, if (_Ctrl.SourceInfo.size() == 2) { // _Ctrl.SourceInfo[0].IsData must be true - nlassert(_Ctrl.SourceInfo[0].IsData) + nlassert(_Ctrl.SourceInfo[0].IsData); // index 0 == Data from patch file if (!XDFR[0].init(_FileName, _HeaderOffset, _CtrlOffset, isPatchCompressed())) { diff --git a/code/ryzom/client/src/r2/dmc/client_edition_module.cpp b/code/ryzom/client/src/r2/dmc/client_edition_module.cpp index 1972d3da1..7a92e575f 100644 --- a/code/ryzom/client/src/r2/dmc/client_edition_module.cpp +++ b/code/ryzom/client/src/r2/dmc/client_edition_module.cpp @@ -1762,7 +1762,7 @@ uint32 CClientEditionModule::getCurrentMaxId() return 1000; std::string eid = getEid(); sint32 currentId = _Factory->getMaxId(eid); - nlassert(currentId >= -1) + nlassert(currentId >= -1); return static_cast(currentId + 1); } diff --git a/code/ryzom/client/src/r2/editor.cpp b/code/ryzom/client/src/r2/editor.cpp index f147680d9..732699bf5 100644 --- a/code/ryzom/client/src/r2/editor.cpp +++ b/code/ryzom/client/src/r2/editor.cpp @@ -5599,7 +5599,7 @@ void CEditor::onAttrModified(const CObject *value) { CInstance *parentInstance = getInstanceFromObject(parent); sint32 indexInParent = parent->findIndex(son); - nlassert(indexInParent != -1) + nlassert(indexInParent != -1); if (parentInstance) { // we are in an instance (a CObjectTable with an instance id) diff --git a/code/ryzom/client/src/r2/tool_choose_pos_lua.cpp b/code/ryzom/client/src/r2/tool_choose_pos_lua.cpp index b22058e8a..467cb60f7 100644 --- a/code/ryzom/client/src/r2/tool_choose_pos_lua.cpp +++ b/code/ryzom/client/src/r2/tool_choose_pos_lua.cpp @@ -55,7 +55,7 @@ CToolChoosePosLua::CToolChoosePosLua(uint ghostSlot, void CToolChoosePosLua::commit(const NLMISC::CVector &createPosition, float /* createAngle */) { //H_AUTO(R2_CToolChoosePosLua_commit) - nlassert(!_Commited) + nlassert(!_Commited); if (_ValidFunc.isFunction()) { CLuaState &lua = *_ValidFunc.getLuaState(); diff --git a/code/ryzom/common/src/game_share/server_edition_module.cpp b/code/ryzom/common/src/game_share/server_edition_module.cpp index fb70c4fdc..29c0351cc 100644 --- a/code/ryzom/common/src/game_share/server_edition_module.cpp +++ b/code/ryzom/common/src/game_share/server_edition_module.cpp @@ -1168,7 +1168,7 @@ void CServerEditionModule::init(NLNET::IModuleSocket* gateway, CDynamicMapServic void CServerEditionModule::updateRSMGR() { - nlassert(!_SessionManager.isNull()) + nlassert(!_SessionManager.isNull()); nlassert(!_WaitingForBS); RSMGR::CRingSessionManagerProxy rsm(_SessionManager); @@ -5131,7 +5131,7 @@ void CServerEditionModule::wakeUpSessionImpl(CEditionSession* session) { CEditionSession* previous = found->second ; - nlassert( session != previous) + nlassert( session != previous); sessionPtr->swap( *previous); session = previous; } diff --git a/code/ryzom/server/src/ai_service/ai.cpp b/code/ryzom/server/src/ai_service/ai.cpp index a3e16e3fe..b51f1279c 100644 --- a/code/ryzom/server/src/ai_service/ai.cpp +++ b/code/ryzom/server/src/ai_service/ai.cpp @@ -418,7 +418,7 @@ void CAIS::update() // send agglomerated hp changes if (!_CreatureChangeHPList.Entities.empty()) { - nlassert(_CreatureChangeHPList.Entities.size()==_CreatureChangeHPList.DeltaHp.size()) + nlassert(_CreatureChangeHPList.Entities.size()==_CreatureChangeHPList.DeltaHp.size()); _CreatureChangeHPList.send("EGS"); _CreatureChangeHPList.Entities.clear(); _CreatureChangeHPList.DeltaHp.clear(); diff --git a/code/ryzom/server/src/ai_service/ai_logic_action.h b/code/ryzom/server/src/ai_service/ai_logic_action.h index dd2eb551a..631f9f620 100644 --- a/code/ryzom/server/src/ai_service/ai_logic_action.h +++ b/code/ryzom/server/src/ai_service/ai_logic_action.h @@ -58,7 +58,7 @@ public: {} // attach a group family to the action if it supports it (assert otherwise) - virtual void addGroupFamily(CGroupFamily *gf) { nlassert(0) } + virtual void addGroupFamily(CGroupFamily *gf) { nlassert(0); } }; // Code use by native functions and LogicAction diff --git a/code/ryzom/server/src/ai_service/group_profile.cpp b/code/ryzom/server/src/ai_service/group_profile.cpp index 0e2b81f34..0d05625ce 100644 --- a/code/ryzom/server/src/ai_service/group_profile.cpp +++ b/code/ryzom/server/src/ai_service/group_profile.cpp @@ -74,7 +74,7 @@ void CGrpProfileDynFollowPath::calcPath() _FollowRoute.setAIProfile(new CGrpProfileFollowRoute(_Grp, _CurrentRoad->coords(), _CurrentRoad->verticalPos(), true)); CGrpProfileFollowRoute*const fr = static_cast(_FollowRoute.getAIProfile()); - nlassert(_CurrentZone==_CurrentRoad->startZone() || _CurrentZone==_CurrentRoad->endZone()) + nlassert(_CurrentZone==_CurrentRoad->startZone() || _CurrentZone==_CurrentRoad->endZone()); fr->setDirection(_CurrentRoad->startZone()==_CurrentZone); } diff --git a/code/ryzom/server/src/ai_service/script_compiler.cpp b/code/ryzom/server/src/ai_service/script_compiler.cpp index 29ed4b777..9a7a2bfb6 100644 --- a/code/ryzom/server/src/ai_service/script_compiler.cpp +++ b/code/ryzom/server/src/ai_service/script_compiler.cpp @@ -1146,7 +1146,7 @@ void CCompiler::dumpByteCode (const string &sourceCode, const string &fullName, fclose (file); } else - nlstop ("can't open %s for writing", tmp.c_str ()); + nlstopex(("can't open %s for writing", tmp.c_str ())); } CSmartPtr CCompiler::compileCodeOld (const string &sourceCode, const string &fullName, bool debug) const diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_kill.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_kill.cpp index 53daf0788..ec4b609e7 100644 --- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_kill.cpp +++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_kill.cpp @@ -864,7 +864,7 @@ class CMissionStepKillByName : public IMissionStepTemplate retParams[0].Type = STRING_MANAGER::bot_name; retParams[0].Identifier = TargetName; retParams[1].Type = STRING_MANAGER::integer; - nlassert( subStepStates.size() == 1 ) + nlassert( subStepStates.size() == 1 ); retParams[1].Int = subStepStates[0]; if ( Place != 0xFFFF ) { diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/combat_attacker.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/combat_attacker.cpp index d8b3f06d5..f4cd49618 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/combat_attacker.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/combat_attacker.cpp @@ -278,7 +278,7 @@ void CCombatAttackerAI::initFromRowId( const TDataSetRow &rowId ) return; #if !FINAL_VERSION - nlassert(entity->getId().getType() == RYZOMID::creature) + nlassert(entity->getId().getType() == RYZOMID::creature); #endif const CStaticCreatures * form = entity->getForm(); @@ -400,7 +400,7 @@ void CCombatAttackerNpc::initFromRowId( const TDataSetRow &rowId ) return; #if !FINAL_VERSION - nlassert(entity->getId().getType() == RYZOMID::npc) + nlassert(entity->getId().getType() == RYZOMID::npc); #endif const CStaticCreatures * form = entity->getForm(); diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/combat_attacker.h b/code/ryzom/server/src/entities_game_service/phrase_manager/combat_attacker.h index 2b26d428b..8e015b77a 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/combat_attacker.h +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/combat_attacker.h @@ -212,7 +212,7 @@ public: } #if !FINAL_VERSION - nlassert(character->getId().getType() == RYZOMID::player) + nlassert(character->getId().getType() == RYZOMID::player); #endif _Character = character; diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/combat_defender.h b/code/ryzom/server/src/entities_game_service/phrase_manager/combat_defender.h index 11d25d9c8..4178eec7e 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/combat_defender.h +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/combat_defender.h @@ -95,7 +95,7 @@ public: if ( !TheDataset.isAccessible(rowId)) { nlwarning(" ERROR Get an invalid row id as param for the constructor, should never happens"); - nlstop(""); + nlstop; return; } diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/pvp_faction_reward_manager.cpp b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/pvp_faction_reward_manager.cpp index 71ecc118d..1099b247e 100644 --- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/pvp_faction_reward_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/pvp_faction_reward_manager.cpp @@ -212,7 +212,7 @@ void CPVPFactionRewardManager::init() } else { - nlstop("Pointer null in map of totem base found !!!!"); + nlstopex(("Pointer null in map of totem base found !!!!")); } } diff --git a/code/ryzom/server/src/logger_service/log_query.h b/code/ryzom/server/src/logger_service/log_query.h index 0a3800767..2eccb17a5 100644 --- a/code/ryzom/server/src/logger_service/log_query.h +++ b/code/ryzom/server/src/logger_service/log_query.h @@ -846,7 +846,7 @@ struct TPredicateNode : public TQueryNode } } else - nlstop + nlstop; } else { diff --git a/code/ryzom/server/src/server_share/msg_ai_service.h b/code/ryzom/server/src/server_share/msg_ai_service.h index a39fbccda..777c208cd 100644 --- a/code/ryzom/server/src/server_share/msg_ai_service.h +++ b/code/ryzom/server/src/server_share/msg_ai_service.h @@ -653,7 +653,7 @@ struct COutpostCreateSquadMsg static uint32 const s_version = 1; uint32 version = s_version; s.serial(version); - nlassert(version==s_version) + nlassert(version==s_version); s.serial(Outpost); s.serial(Group); s.serial(Zone); diff --git a/code/ryzom/server/src/shard_unifier_service/ring_session_manager.cpp b/code/ryzom/server/src/shard_unifier_service/ring_session_manager.cpp index 0154c15d5..7dc259524 100644 --- a/code/ryzom/server/src/shard_unifier_service/ring_session_manager.cpp +++ b/code/ryzom/server/src/shard_unifier_service/ring_session_manager.cpp @@ -3910,7 +3910,7 @@ endOfWelcomeUserResult: { nldebug("RSM : setScenarioInfo char %u set scenario info for session %u", charId, sessionId.asInt()); - nlstop("Deprecated"); + nlstopex(("Deprecated")); // // load the user // CCharacterPtr character = CCharacter::load(_RingDb, charId, __FILE__, __LINE__);