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

merge

Browse source
This commit is contained in:
Matt Raykowski 2010-05-14 07:48:59 -05:00
commit 5c7ef59e8b
6 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/CMakeModules/nel.cmake
View file

@ -75,7 +75,7 @@ MACRO(NL_SETUP_BUILD)
SET(NL_RELEASE_CFLAGS "/Ox /Ob2 /Oi /Ot /Oy /GT /GF") SET(NL_RELEASE_CFLAGS "/Ox /Ob2 /Oi /Ot /Oy /GT /GF")
SET(NL_RELEASEDEBUG_CFLAGS "/DNL_RELEASE_DEBUG /Ob2 /GF") SET(NL_RELEASEDEBUG_CFLAGS "/DNL_RELEASE_DEBUG /Ob2 /GF")
ELSE(WIN32) ELSE(WIN32)
SET(PLATFORM_CFLAGS "-ftemplate-depth-48 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused") SET(PLATFORM_CFLAGS "-ftemplate-depth-48 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused -fno-strict-aliasing")
IF(WITH_COVERAGE) IF(WITH_COVERAGE)
SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}") SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
ENDIF(WITH_COVERAGE) ENDIF(WITH_COVERAGE)

38
code/ryzom/common/src/game_share/dyn_chat.cpp
View file

@ -29,10 +29,10 @@ uint CDynChatSession::_NumSessions = 0;
///////////////////// /////////////////////
//================================================================ //================================================================
CDynChatSession::CDynChatSession(CDynChatClient *client, CDynChatChan *channel) CDynChatSession::CDynChatSession(CDynChatClient *client, CDynChatChan *channel)
: _Client(client), : StringID(0),
_Channel(channel), WriteRight(false),
StringID(0), _Client(client),
WriteRight(false) _Channel(channel)
{ {
nlassert(client); nlassert(client);
nlassert(channel); nlassert(channel);
@ -102,7 +102,7 @@ CDynChatSession::~CDynChatSession()
// CDynChatClient // // CDynChatClient //
//////////////////// ////////////////////
//================================================================ //================================================================
CDynChatClient::CDynChatClient(const TDataSetRow &client) : _ID(client), _FirstSession(NULL) CDynChatClient::CDynChatClient(const TDataSetRow &client) : _FirstSession(NULL), _ID(client)
{ {
} }
@ -136,26 +136,26 @@ CDynChatSession *CDynChatClient::getSession(TChanID chan) const
// CDynChatChan // // CDynChatChan //
////////////////// //////////////////
CDynChatChan::CDynChatChan() CDynChatChan::CDynChatChan()
: _ID(CEntityId::Unknown), : HistoricSize(0),
_FirstSession(NULL), HideBubble(false),
HistoricSize(0), _FirstSession(NULL),
_DontBroadcastPlayerInputs(false), _ID(CEntityId::Unknown),
_ForwardPlayerIntputToOwnerService(false), _DontBroadcastPlayerInputs(false),
_UnifyChannel(false), _ForwardPlayerIntputToOwnerService(false),
HideBubble(false) _UnifyChannel(false)
{ {
} }
//================================================================ //================================================================
//CDynChatChan::CDynChatChan(TChanID id) : _ID(id), _FirstSession(NULL), HistoricSize(0) //CDynChatChan::CDynChatChan(TChanID id) : _ID(id), _FirstSession(NULL), HistoricSize(0)
CDynChatChan::CDynChatChan(TChanID id, bool noBroadcast, bool forwardInput, bool unified) CDynChatChan::CDynChatChan(TChanID id, bool noBroadcast, bool forwardInput, bool unified)
: _ID(id), : HistoricSize(0),
_FirstSession(NULL), HideBubble(false),
HistoricSize(0), _FirstSession(NULL),
_DontBroadcastPlayerInputs(noBroadcast), _ID(id),
_ForwardPlayerIntputToOwnerService(forwardInput), _DontBroadcastPlayerInputs(noBroadcast),
_UnifyChannel(unified), _ForwardPlayerIntputToOwnerService(forwardInput),
HideBubble(false) _UnifyChannel(unified)
{ {
} }

6
code/ryzom/common/src/game_share/effect_families.cpp
View file

@ -214,6 +214,9 @@ namespace EFFECT_FAMILIES
case DMGTYPE::POISON : return DebuffResistPoison; case DMGTYPE::POISON : return DebuffResistPoison;
case DMGTYPE::ELECTRICITY : return DebuffResistElectricity; case DMGTYPE::ELECTRICITY : return DebuffResistElectricity;
case DMGTYPE::SHOCK : return DebuffResistSchock; case DMGTYPE::SHOCK : return DebuffResistSchock;
default:
return Unknown;
break;
} }
return Unknown; return Unknown;
} }
@ -229,6 +232,9 @@ namespace EFFECT_FAMILIES
case DMGTYPE::POISON : return CombatDoTPoison; case DMGTYPE::POISON : return CombatDoTPoison;
case DMGTYPE::ELECTRICITY : return CombatDoTElectricity; case DMGTYPE::ELECTRICITY : return CombatDoTElectricity;
case DMGTYPE::SHOCK : return CombatDoTShock; case DMGTYPE::SHOCK : return CombatDoTShock;
default:
return Unknown;
break;
} }
return Unknown; return Unknown;
} }

6
code/ryzom/common/src/game_share/mirror.cpp
View file

@ -1485,17 +1485,17 @@ void CMirror::changeValue( const NLMISC::CEntityId& entityId, const std::string&
*/ */
CMirror::CMirror() : CMirror::CMirror() :
_PendingEntityTypesRanges(0), _PendingEntityTypesRanges(0),
_MirrorAllReady(false),
_ReadyL1Callback(NULL), _ReadyL1Callback(NULL),
_NotificationCallback(NULL), _NotificationCallback(NULL),
_UserSyncCallback(NULL),
_MirrorAllReady(false),
_MirrorGotReadyLevel1(false), _MirrorGotReadyLevel1(false),
_MirrorGotReadyLevel2(false), _MirrorGotReadyLevel2(false),
_ListOfOtherPropertiesReceived(false), _ListOfOtherPropertiesReceived(false),
_AwaitingAllMirrorsOnline(false), _AwaitingAllMirrorsOnline(false),
_IsExecutingSynchronizedCode(false), _IsExecutingSynchronizedCode(false),
MonitoredEntity(CEntityId::Unknown),
_ClosureRequested(false), _ClosureRequested(false),
_UserSyncCallback(NULL) MonitoredEntity(CEntityId::Unknown)
{ {
nlassert( ! MirrorInstance ); // singleton check nlassert( ! MirrorInstance ); // singleton check
MirrorInstance = this; MirrorInstance = this;

2
code/ryzom/common/src/game_share/mode_and_behaviour.h
View file

@ -453,7 +453,7 @@ namespace MBEHAV
sint16 DeltaHP; sint16 DeltaHP;
uint16 Unused; /// Keep it, used to make the class size = 64 bits (sizeof(CBehaviour) MUST return 8 (bytes)) uint16 Unused; /// Keep it, used to make the class size = 64 bits (sizeof(CBehaviour) MUST return 8 (bytes))
inline CBehaviour() : Behaviour(UNKNOWN_BEHAVIOUR), Data(0), Data2(0), DeltaHP(0), Unused(0) {} inline CBehaviour() : Data(0), Data2(0), Behaviour(UNKNOWN_BEHAVIOUR), DeltaHP(0), Unused(0) {}
inline CBehaviour( EBehaviour behaviour ) inline CBehaviour( EBehaviour behaviour )
{ {

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

@ -95,7 +95,7 @@ inline ucstring capitalize(const ucstring & s)
nldebug("Dumping callstack :"); \ nldebug("Dumping callstack :"); \
for (uint i=0; i<contexts.size(); ++i) \ for (uint i=0; i<contexts.size(); ++i) \
nldebug(" %3u : %s", i, contexts[i].c_str()); nldebug(" %3u : %s", i, contexts[i].c_str());
#define nlassertd(a) if (0) ; else #define nlassertd(a) if (0) { } else { }
#endif #endif
// the following set of definess can be undefined and re-defined to add user code to execute // the following set of definess can be undefined and re-defined to add user code to execute