warnings_v4.diff
| b/code/ryzom/client/src/client_sheets/attack_id_sheet.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 113 | 113 |
case CAttackIDSheet::Magic: return lhs.SpellInfo == rhs.SpellInfo; |
| 114 | 114 |
case CAttackIDSheet::Creature: return lhs.CreatureAttackIndex == rhs.CreatureAttackIndex; |
| 115 | 115 |
case CAttackIDSheet::DamageShield: return lhs.DamageShieldType == rhs.DamageShieldType; |
| 116 |
default: return false; |
|
| 116 | 117 |
} |
| 117 |
return false; |
|
| 118 | 118 |
} |
| 119 | 119 |
|
| 120 | 120 |
//***************************************************************************************** |
| ... | ... | |
| 128 | 128 |
case CAttackIDSheet::Magic: return lhs.SpellInfo < rhs.SpellInfo; |
| 129 | 129 |
case CAttackIDSheet::Creature: return lhs.CreatureAttackIndex < rhs.CreatureAttackIndex; |
| 130 | 130 |
case CAttackIDSheet::DamageShield: return lhs.DamageShieldType < rhs.DamageShieldType; |
| 131 |
default: return false; |
|
| 131 | 132 |
} |
| 132 |
return false; |
|
| 133 | 133 |
} |
| 134 | 134 |
|
| 135 | 135 |
//***************************************************************************************** |
| b/code/ryzom/client/src/client_sheets/body_to_bone_sheet.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 86 | 86 |
case BODY::HHands: return ClientSheetsStrings.get(side == BODY::Left ? LeftHand : RightHand); |
| 87 | 87 |
case BODY::HLegs: return ClientSheetsStrings.get(side == BODY::Left ? LeftLeg : RightLeg); |
| 88 | 88 |
case BODY::HFeet: return ClientSheetsStrings.get(side == BODY::Left ? LeftFoot : RightFoot); |
| 89 |
default: return NULL; |
|
| 89 | 90 |
} |
| 90 |
return NULL; |
|
| 91 | 91 |
} |
| b/code/ryzom/client/src/client_sheets/item_sheet.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 742 | 742 |
return Tool.Skill; |
| 743 | 743 |
case ITEMFAMILY::CRAFTING_TOOL: |
| 744 | 744 |
return SKILLS::SC; |
| 745 |
default: return SKILLS::unknown; |
|
| 745 | 746 |
} |
| 746 |
return SKILLS::unknown; |
|
| 747 | 747 |
} |
| 748 | 748 |
|
| 749 | 749 |
// *************************************************************************** |
| b/code/ryzom/client/src/connection.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 440 | 440 |
{
|
| 441 | 441 |
case AUTO_LOGIN: |
| 442 | 442 |
InterfaceState = autoLogin (cookie, fsaddr, firstConnection); |
| 443 |
break; |
|
| 443 |
break;
|
|
| 444 | 444 |
|
| 445 | 445 |
case GLOBAL_MENU: |
| 446 | 446 |
if (!ClientCfg.Local) |
| ... | ... | |
| 451 | 451 |
} |
| 452 | 452 |
} |
| 453 | 453 |
InterfaceState = globalMenu(); |
| 454 |
break; |
|
| 454 |
break; |
|
| 455 |
case GOGOGO_IN_THE_GAME: |
|
| 456 |
break; |
|
| 457 |
case QUIT_THE_GAME: |
|
| 458 |
break; |
|
| 455 | 459 |
} |
| 456 | 460 |
} |
| 457 | 461 |
|
| b/code/ryzom/client/src/continent_manager.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 397 | 397 |
CContinent *pCont = it->second; |
| 398 | 398 |
nlinfo("Looking into %s", pCont->SheetName.c_str());
|
| 399 | 399 |
if (pCont->Zone.VPoints.size() > 0) // Patch because some continent have not been done yet |
| 400 |
if (pCont->Zone.contains(fPos)) |
|
| 401 | 400 |
{
|
| 402 |
// load the continent selected. |
|
| 403 |
select (it->first, pos, progress); |
|
| 404 |
return; |
|
| 405 |
} |
|
| 406 |
else |
|
| 407 |
{
|
|
| 408 |
/* |
|
| 409 |
nlwarning("**********************************************");
|
|
| 410 |
nlwarning("Start position (%s) not found in continent %s", NLMISC::toString(pos.asVector()).c_str(), it->first.c_str());
|
|
| 411 |
for(uint k = 0; k < pCont->Zone.VPoints.size(); ++k) |
|
| 401 |
if (pCont->Zone.contains(fPos)) |
|
| 412 | 402 |
{
|
| 413 |
nlwarning("zone point %d = %s", (int)k, NLMISC::toString(pCont->Zone.VPoints[k]).c_str());
|
|
| 403 |
// load the continent selected. |
|
| 404 |
select (it->first, pos, progress); |
|
| 405 |
return; |
|
| 414 | 406 |
} |
| 415 |
*/ |
|
| 407 |
else |
|
| 408 |
{
|
|
| 409 |
/* |
|
| 410 |
nlwarning("**********************************************");
|
|
| 411 |
nlwarning("Start position (%s) not found in continent %s", NLMISC::toString(pos.asVector()).c_str(), it->first.c_str());
|
|
| 412 |
for(uint k = 0; k < pCont->Zone.VPoints.size(); ++k) |
|
| 413 |
{
|
|
| 414 |
nlwarning("zone point %d = %s", (int)k, NLMISC::toString(pCont->Zone.VPoints[k]).c_str());
|
|
| 415 |
} |
|
| 416 |
*/ |
|
| 417 |
} |
|
| 416 | 418 |
} |
| 417 | 419 |
it++; |
| 418 | 420 |
} |
| b/code/ryzom/client/src/debug_client.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 22 | 22 |
///////////// |
| 23 | 23 |
#include "stdpch.h" // First include for pre-compiled headers. |
| 24 | 24 |
|
| 25 |
#include <limits> |
|
| 26 |
|
|
| 25 | 27 |
// OS. |
| 26 | 28 |
#ifdef NL_OS_WINDOWS |
| 27 | 29 |
# include <windows.h> |
| ... | ... | |
| 249 | 251 |
nlwarning("There are %*lx free %sbytes of virtual memory.\n", WIDTH, stat.dwAvailVirtual/DIV, divisor);
|
| 250 | 252 |
*/ |
| 251 | 253 |
#endif |
| 254 |
return std::numeric_limits<double>::quiet_NaN(); |
|
| 252 | 255 |
} |
| 253 | 256 |
|
| 254 | 257 |
|
| b/code/ryzom/client/src/entity_cl.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 233 | 233 |
void sheetId(const NLMISC::CSheetId &id) {_SheetId = id;}
|
| 234 | 234 |
|
| 235 | 235 |
/// Return the persistent NPC alias of entity (0 if N/A). |
| 236 |
const uint32 npcAlias() const {return _NPCAlias; }
|
|
| 236 |
uint32 npcAlias() const {return _NPCAlias; }
|
|
| 237 | 237 |
/// Set the persistent NPC alias of the entity. |
| 238 | 238 |
void npcAlias(uint32 alias) {_NPCAlias = alias; }
|
| 239 | 239 |
|
| ... | ... | |
| 411 | 411 |
|
| 412 | 412 |
|
| 413 | 413 |
/// Return the entity current behaviour. |
| 414 |
const MBEHAV::EBehaviour behaviour() const {return _CurrentBehaviour.Behaviour;}
|
|
| 414 |
MBEHAV::EBehaviour behaviour() const {return _CurrentBehaviour.Behaviour;}
|
|
| 415 | 415 |
|
| 416 | 416 |
/** |
| 417 | 417 |
* Show or Hide the entity. |
| b/code/ryzom/client/src/far_tp.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 636 | 636 |
SM_EVENT(ev_quit, st_end); |
| 637 | 637 |
SM_END_EVENT_TABLE |
| 638 | 638 |
break; |
| 639 |
default: |
|
| 640 |
break; |
|
| 639 | 641 |
} |
| 640 | 642 |
} |
| 641 | 643 |
} |
| ... | ... | |
| 747 | 749 |
throw "Protocol error"; |
| 748 | 750 |
if (sb._LastJoinSessionResult == 16) |
| 749 | 751 |
{
|
| 750 |
#pragma message (NL_LOC_WRN "inform the player that he is banned from the ring") |
|
| 752 |
#ifdef NL_OS_WINDOWS |
|
| 753 |
#pragma message (NL_LOC_WRN "inform the player that he is banned from the ring") |
|
| 754 |
#endif // NL_OS_WINDOWS |
|
| 751 | 755 |
throw "User ban from the ring"; |
| 752 | 756 |
} |
| 753 | 757 |
if (sb._LastJoinSessionResult != 0) |
| b/code/ryzom/client/src/forage_source_cl.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 47 | 47 |
* Constructor |
| 48 | 48 |
*/ |
| 49 | 49 |
CForageSourceCL::CForageSourceCL() : |
| 50 |
CFxCL(), _IsExtractionInProgress( false ), |
|
| 50 |
CFxCL(), |
|
| 51 |
_InSceneUserInterface( NULL ), |
|
| 52 |
_IconFilename( NULL ), |
|
| 53 |
_IsExtractionInProgress( false ), |
|
| 51 | 54 |
_SafeSource( false ), |
| 52 | 55 |
_KnowledgeLevel( 0 ), |
| 53 |
_InSceneUserInterface( NULL ), |
|
| 54 | 56 |
_LastExplosionSwitch( 0 ), |
| 55 | 57 |
_ProspectorSlot( 255 ), |
| 56 |
_IconFilename( NULL ), |
|
| 57 | 58 |
_ExtraTime(0), |
| 58 | 59 |
_InclBonusExtraTime(0), |
| 59 | 60 |
_InitialQuantity(BarNotInit), |
| b/code/ryzom/client/src/game_context_menu.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 955 | 955 |
} |
| 956 | 956 |
|
| 957 | 957 |
// Don't enable anything if index not found (e.g. the character is not the owner of the animal) |
| 958 |
if ( (index == -1) || (!UserEntity) ) |
|
| 958 |
if ( (index == (uint)-1) || (!UserEntity) )
|
|
| 959 | 959 |
return false; |
| 960 | 960 |
|
| 961 | 961 |
// Get animal status and type |
| b/code/ryzom/client/src/graph.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 93 | 93 |
NLMISC::TTime quantum, |
| 94 | 94 |
float maxValue, uint page, |
| 95 | 95 |
bool lineMode = false) |
| 96 |
: Name(name), X(x), Y(y), Width(width), Height(height), BackColor(backColor), Quantum(quantum),
|
|
| 97 |
CurrentQuantumStart(ryzomGetLocalTime ()), MaxValue(maxValue), Peak(0.0f), LineMode(lineMode), PrevY(y), Page(page)
|
|
| 96 |
: Name(name), X(x), Y(y), Width(width), Height(height), BackColor(backColor), MaxValue(maxValue),
|
|
| 97 |
Peak(0.0f), LineMode(lineMode), PrevY(y), Page(page), Quantum(quantum), CurrentQuantumStart(ryzomGetLocalTime ())
|
|
| 98 | 98 |
{
|
| 99 | 99 |
if (_Graphs == NULL) |
| 100 | 100 |
{
|
| b/code/ryzom/client/src/ground_fx_manager.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 60 | 60 |
using namespace NLMISC; |
| 61 | 61 |
|
| 62 | 62 |
//***************************************************************************** |
| 63 |
CGroundFXManager::CGroundFXManager() : _MaxDist(50.f), |
|
| 64 |
_MaxNumFX(10), |
|
| 65 |
_NumFX(0), |
|
| 66 |
_MaxNumCachedFX(10), |
|
| 67 |
_NumCachedFX(0), |
|
| 68 |
_NumInstances(0), |
|
| 69 |
_Scene(NULL), |
|
| 70 |
_MinSpeed(1.5f), |
|
| 71 |
_MaxSpeed(6.f), |
|
| 72 |
_SpeedWaterWalkFast(3.f), |
|
| 73 |
_SpeedWaterSwimFast(3.f) |
|
| 63 |
CGroundFXManager::CGroundFXManager() : |
|
| 64 |
_MinSpeed(1.5f), |
|
| 65 |
_MaxSpeed(6.f), |
|
| 66 |
_SpeedWaterWalkFast(3.f), |
|
| 67 |
_SpeedWaterSwimFast(3.f), |
|
| 68 |
_MaxDist(50.f), |
|
| 69 |
_MaxNumFX(10), |
|
| 70 |
_NumFX(0), |
|
| 71 |
_MaxNumCachedFX(10), |
|
| 72 |
_NumCachedFX(0), |
|
| 73 |
_NumInstances(0), |
|
| 74 |
_Scene(NULL) |
|
| 74 | 75 |
{
|
| 75 | 76 |
H_AUTO_USE(RZ_GroundFXManager) |
| 76 | 77 |
// Construct |
| b/code/ryzom/client/src/hair_set.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 116 | 116 |
case EGSPD::CPeople::Matis: return Matis; |
| 117 | 117 |
case EGSPD::CPeople::Tryker: return Tryker; |
| 118 | 118 |
case EGSPD::CPeople::Zorai: return Zorai; |
| 119 |
default: return DontKnow; |
|
| 119 | 120 |
} |
| 120 |
return DontKnow; |
|
| 121 | 121 |
} |
| 122 | 122 |
|
| 123 | 123 |
//========================================================================= |
| b/code/ryzom/client/src/interface_v3/chat_filter.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 81 | 81 |
virtual void chatWindowRemoved(CChatWindow *cw); |
| 82 | 82 |
// |
| 83 | 83 |
// copy not supported |
| 84 |
CChatInputFilter(const CChatInputFilter &/* other */) { nlassert(0); }
|
|
| 85 |
CChatInputFilter &operator=(const CChatInputFilter &/* other */) { nlassert(0); return *this; }
|
|
| 84 |
CChatInputFilter(const CChatInputFilter &/* other */);
|
|
| 85 |
CChatInputFilter &operator=(const CChatInputFilter &/* other */);
|
|
| 86 | 86 |
|
| 87 | 87 |
}; |
| 88 | 88 |
|
| ... | ... | |
| 157 | 157 |
void chatWindowRemoved(CChatWindow *cw); |
| 158 | 158 |
void msgEntered(const ucstring &msg, CChatWindow *chatWindow); |
| 159 | 159 |
// copy not supported |
| 160 |
CChatTargetFilter(const CChatTargetFilter &/* other */) { nlassert(0); }
|
|
| 161 |
CChatTargetFilter& operator=(const CChatTargetFilter &/* other */) { nlassert(0); return *this; }
|
|
| 160 |
CChatTargetFilter(const CChatTargetFilter &/* other */);
|
|
| 161 |
CChatTargetFilter& operator=(const CChatTargetFilter &/* other */);
|
|
| 162 | 162 |
}; |
| 163 | 163 |
|
| 164 | 164 |
#endif |
| b/code/ryzom/client/src/interface_v3/inventory_manager.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 452 | 452 |
class CDBForageQQObs : public ICDBNode::IPropertyObserver |
| 453 | 453 |
{
|
| 454 | 454 |
public: |
| 455 |
CDBForageQQObs() : WhichOne(~0), FullValue(0.0f), ICDBNode::IPropertyObserver() {}
|
|
| 455 |
CDBForageQQObs() : ICDBNode::IPropertyObserver(), WhichOne(~0), FullValue(0.0f) {}
|
|
| 456 | 456 |
virtual void update(ICDBNode *node); |
| 457 | 457 |
uint WhichOne; |
| 458 | 458 |
float FullValue; |
| b/code/ryzom/client/src/interface_v3/lua_helper.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 354 | 354 |
|
| 355 | 355 |
private: |
| 356 | 356 |
// this object isn't intended to be copied |
| 357 |
CLuaState(const CLuaState &/* other */) { nlassert(0); }
|
|
| 358 |
CLuaState &operator=(const CLuaState &/* other */) { nlassert(0); return *this; }
|
|
| 357 |
CLuaState(const CLuaState &/* other */);
|
|
| 358 |
CLuaState &operator=(const CLuaState &/* other */);
|
|
| 359 | 359 |
|
| 360 | 360 |
void executeScriptInternal(const std::string &code, const std::string &dbgSrc, int numRet = 0); |
| 361 | 361 |
|
| b/code/ryzom/client/src/interface_v3/obs_huge_list.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 158 | 158 |
SlotType(NULL), |
| 159 | 159 |
Quality(NULL), |
| 160 | 160 |
SheetIDOrSkill(NULL), |
| 161 |
Price(NULL), |
|
| 162 | 161 |
LogicTextID(NULL), |
| 163 | 162 |
DescTextID(NULL), |
| 163 |
Price(NULL), |
|
| 164 |
MissionText(NULL), |
|
| 164 | 165 |
MissionDetailText(NULL), |
| 165 |
MissionText(NULL), |
|
| 166 | 166 |
MissionIcon(NULL), |
| 167 | 167 |
MissionPreReqState(NULL), |
| 168 | 168 |
Weight(NULL), |
| b/code/ryzom/client/src/interface_v3/people_list.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 136 | 136 |
private: |
| 137 | 137 |
struct CPeople |
| 138 | 138 |
{
|
| 139 |
CPeople() : Online(ccs_offline), Blocked(false), Container(NULL), Chat(NULL), ContactId(0) {}
|
|
| 139 |
CPeople() : Container(NULL), Chat(NULL), Online(ccs_offline), Blocked(false), ContactId(0) {}
|
|
| 140 | 140 |
NLMISC::CRefPtr<CGroupContainer> Container; // todo : replace this with a CChatWindow one day, for consistency |
| 141 | 141 |
NLMISC::CRefPtr<CGroupContainer> Chat; |
| 142 | 142 |
uint GlobalID; |
| b/code/ryzom/client/src/libwww.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 55 | 55 |
// Here, modify the DTD table to change the HTML parser (add new tags for examples) |
| 56 | 56 |
|
| 57 | 57 |
#undef HTML_ATTR |
| 58 |
#define HTML_ATTR(a,b) { #b }
|
|
| 58 |
#define HTML_ATTR(a,b) { (char*) #b }
|
|
| 59 | 59 |
|
| 60 | 60 |
HTAttr a_attr[] = |
| 61 | 61 |
{
|
| ... | ... | |
| 551 | 551 |
// HTCacheInit(NULL, 20); |
| 552 | 552 |
|
| 553 | 553 |
/* Setup up transfer coders */ |
| 554 |
HTFormat_addTransferCoding("chunked", HTChunkedEncoder, HTChunkedDecoder, 1.0);
|
|
| 554 |
HTFormat_addTransferCoding((char*)"chunked", HTChunkedEncoder, HTChunkedDecoder, 1.0);
|
|
| 555 | 555 |
|
| 556 | 556 |
/* Setup MIME stream converters */ |
| 557 | 557 |
HTFormat_addConversion("message/rfc822", "*/*", HTMIMEConvert, 1.0, 0.0, 0.0);
|
| ... | ... | |
| 630 | 630 |
{"authentication-info", &HTMIME_authenticationInfo},
|
| 631 | 631 |
{"proxy-authentication-info", &HTMIME_proxyAuthenticationInfo}
|
| 632 | 632 |
}; |
| 633 |
int i; |
|
| 634 |
for (i = 0; i < sizeof(fixedHandlers)/sizeof(fixedHandlers[0]); i++) |
|
| 633 |
|
|
| 634 |
for (uint i = 0; i < sizeof(fixedHandlers)/sizeof(fixedHandlers[0]); i++)
|
|
| 635 | 635 |
HTHeader_addParser(fixedHandlers[i].string, NO, fixedHandlers[i].pHandler); |
| 636 | 636 |
|
| 637 | 637 |
/* Set up default event loop */ |
| b/code/ryzom/client/src/light_cycle_manager.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 96 | 96 |
} |
| 97 | 97 |
|
| 98 | 98 |
//----------------------------------------------- |
| 99 |
CLightCycleManager::CLightCycleManager() : _Touched(true), |
|
| 100 |
_ValidDesc(false), |
|
| 101 |
_LightLevel(0), |
|
| 102 |
_WeatherLighting(0), |
|
| 103 |
_LastWeatherLighting(0), |
|
| 104 |
_Hour(0), |
|
| 105 |
_UpdateFreq(0), |
|
| 106 |
_State(StateUnknown), |
|
| 107 |
_PrevState(StateUnknown) |
|
| 99 |
CLightCycleManager::CLightCycleManager() : |
|
| 100 |
_Hour(0), |
|
| 101 |
_Touched(true), |
|
| 102 |
_ValidDesc(false), |
|
| 103 |
_LightLevel(0), |
|
| 104 |
_WeatherLighting(0), |
|
| 105 |
_LastWeatherLighting(0), |
|
| 106 |
_UpdateFreq(0), |
|
| 107 |
_State(StateUnknown), |
|
| 108 |
_PrevState(StateUnknown) |
|
| 108 | 109 |
{
|
| 109 | 110 |
H_AUTO_USE(RZ_LightCycleManager) |
| 110 | 111 |
} |
| b/code/ryzom/client/src/login_patch.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 64 | 64 |
public: |
| 65 | 65 |
CInstallThreadEntry(){ Timestamp = 0; }
|
| 66 | 66 |
CInstallThreadEntry(const char* patchName, const char* sourceName, uint32 timestamp, const char* extractPath, uint32 size, uint32 sZipFileSize) |
| 67 |
:PatchName(patchName), SourceName(sourceName), Timestamp(timestamp),ExtractPath(extractPath), Size(size),SZipFileSize(sZipFileSize){}
|
|
| 67 |
:PatchName(patchName), SourceName(sourceName), Timestamp(timestamp),Size(size),SZipFileSize(sZipFileSize),ExtractPath(extractPath) {}
|
|
| 68 | 68 |
std::string PatchName; |
| 69 | 69 |
std::string SourceName; |
| 70 | 70 |
uint32 Timestamp; |
| b/code/ryzom/client/src/login_progress_post_thread.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 192 | 192 |
} |
| 193 | 193 |
if (newStep) |
| 194 | 194 |
{
|
| 195 |
if (loginStep.Step == LoginStep_Stop) |
|
| 195 |
if (loginStep.Step == (uint)LoginStep_Stop)
|
|
| 196 | 196 |
{
|
| 197 | 197 |
break; |
| 198 | 198 |
} |
| b/code/ryzom/client/src/main_loop.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 2568 | 2568 |
screenShotPNG(); |
| 2569 | 2569 |
ScreenshotRequest = ScreenshotRequestNone; |
| 2570 | 2570 |
break; |
| 2571 |
case ScreenshotRequestNone: |
|
| 2572 |
break; |
|
| 2571 | 2573 |
} |
| 2572 | 2574 |
|
| 2573 | 2575 |
// TMP TMP |
| b/code/ryzom/client/src/misc.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 656 | 656 |
case SLOTTYPE::FEET_SLOT: return isUserColorSupported(playerSheet.Feet); |
| 657 | 657 |
case SLOTTYPE::RIGHT_HAND_SLOT: return isUserColorSupported(playerSheet.ObjectInRightHand); |
| 658 | 658 |
case SLOTTYPE::LEFT_HAND_SLOT: return isUserColorSupported(playerSheet.ObjectInLeftHand); |
| 659 |
default: return false; |
|
| 659 | 660 |
} |
| 660 |
return false; |
|
| 661 | 661 |
}// isUserColorSupported // |
| 662 | 662 |
|
| 663 | 663 |
|
| ... | ... | |
| 1081 | 1081 |
} |
| 1082 | 1082 |
} |
| 1083 | 1083 |
break; |
| 1084 |
case CaseNormal: |
|
| 1085 |
break; |
|
| 1086 |
case CaseCount: |
|
| 1087 |
break; |
|
| 1084 | 1088 |
} |
| 1085 | 1089 |
} |
| 1086 | 1090 |
|
| b/code/ryzom/client/src/npc_icon.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 41 | 41 |
// #pragma optimize ("", off)
|
| 42 | 42 |
|
| 43 | 43 |
|
| 44 |
CNPCIconCache::CNPCIconCache() : _LastTimerUpdateTimestamp(0), _LastRequestTimestamp(0), _Enabled(true)
|
|
| 44 |
CNPCIconCache::CNPCIconCache() : _LastRequestTimestamp(0), _LastTimerUpdateTimestamp(0), _Enabled(true)
|
|
| 45 | 45 |
{
|
| 46 | 46 |
_Icons[NPC_ICON::IconNone].init("", "");
|
| 47 | 47 |
_Icons[NPC_ICON::IconNotAMissionGiver].init("", "");
|
| b/code/ryzom/client/src/precipitation.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 35 | 35 |
|
| 36 | 36 |
|
| 37 | 37 |
//============================================================ |
| 38 |
CPrecipitation::CPrecipitation() : _Strenght(0), _XSize(0), _YSize(0), _ClipGrid(NULL), _Touched(false), _OldX(0), _OldY(0), _TimeOut(0.f)
|
|
| 38 |
CPrecipitation::CPrecipitation() : _ClipGrid(NULL), _Strenght(0), _TimeOut(0.f), _XSize(0), _YSize(0), _OldX(0), _OldY(0), _Touched(false)
|
|
| 39 | 39 |
{
|
| 40 | 40 |
H_AUTO_USE(RZ_Precipitation) |
| 41 | 41 |
} |
| b/code/ryzom/client/src/property_decoder.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 53 | 53 |
class CEntityEntry |
| 54 | 54 |
{
|
| 55 | 55 |
public: |
| 56 |
CEntityEntry() : EntryUsed(false), PosIsRelative(false), AssociationBits(0) {}
|
|
| 56 |
CEntityEntry() : AssociationBits(0), EntryUsed(false), PosIsRelative(false) {}
|
|
| 57 | 57 |
CLFECOMMON::TSheetId Sheet; |
| 58 | 58 |
uint16 AssociationBits; |
| 59 | 59 |
bool EntryUsed; |
| ... | ... | |
| 87 | 87 |
uint16& associationBits( CLFECOMMON::TCLEntityId entity ) { return _Entities[entity].AssociationBits; }
|
| 88 | 88 |
|
| 89 | 89 |
bool isUsed(CLFECOMMON::TCLEntityId entity) const { return _Entities[entity].EntryUsed; }
|
| 90 |
const CLFECOMMON::TSheetId sheet(CLFECOMMON::TCLEntityId entity) const { return _Entities[entity].Sheet; }
|
|
| 90 |
CLFECOMMON::TSheetId sheet(CLFECOMMON::TCLEntityId entity) const { return _Entities[entity].Sheet; }
|
|
| 91 | 91 |
|
| 92 | 92 |
|
| 93 | 93 |
/** Receives actions from the front end. Actually transmits actions received |
| b/code/ryzom/client/src/r2/instance.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 241 | 241 |
// For editor : Create this object from the CObjectTable it materialize in the editor |
| 242 | 242 |
CInstance(const CObjectTable *objectTable, CLuaState &ls); |
| 243 | 243 |
// copy not supported |
| 244 |
CInstance(const CInstance &/* other */) { nlassert(0); }
|
|
| 245 |
CInstance &operator = (const CInstance &/* other */) { nlassert(0); return *this; }
|
|
| 244 |
CInstance(const CInstance &/* other */);
|
|
| 245 |
CInstance &operator = (const CInstance &/* other */);
|
|
| 246 | 246 |
// |
| 247 | 247 |
void executeHandler(const CLuaString &name, int numArgs); |
| 248 | 248 |
// |
| b/code/ryzom/client/src/rosace.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 242 | 242 |
case DirectMode: |
| 243 | 243 |
directMode(x, y); |
| 244 | 244 |
break; |
| 245 |
case NbRosaceMode: |
|
| 246 |
break; |
|
| 245 | 247 |
} |
| 246 | 248 |
}// update // |
| 247 | 249 |
|
| b/code/ryzom/client/src/seven_zip/7zMain.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 95 | 95 |
} |
| 96 | 96 |
if (numargs < 3) |
| 97 | 97 |
{
|
| 98 |
PrintError("incorrect command");
|
|
| 98 |
PrintError((char*)"incorrect command");
|
|
| 99 | 99 |
return 1; |
| 100 | 100 |
} |
| 101 | 101 |
|
| 102 | 102 |
archiveStream.File = fopen(args[2], "rb"); |
| 103 | 103 |
if (archiveStream.File == 0) |
| 104 | 104 |
{
|
| 105 |
PrintError("can not open input file");
|
|
| 105 |
PrintError((char*)"can not open input file");
|
|
| 106 | 106 |
return 1; |
| 107 | 107 |
} |
| 108 | 108 |
|
| ... | ... | |
| 192 | 192 |
outputHandle = fopen(fileName, "wb+"); |
| 193 | 193 |
if (outputHandle == 0) |
| 194 | 194 |
{
|
| 195 |
PrintError("can not open output file");
|
|
| 195 |
PrintError((char*)"can not open output file");
|
|
| 196 | 196 |
res = SZE_FAIL; |
| 197 | 197 |
break; |
| 198 | 198 |
} |
| 199 | 199 |
processedSize = fwrite(outBuffer + offset, 1, outSizeProcessed, outputHandle); |
| 200 | 200 |
if (processedSize != outSizeProcessed) |
| 201 | 201 |
{
|
| 202 |
PrintError("can not write output file");
|
|
| 202 |
PrintError((char*)"can not write output file");
|
|
| 203 | 203 |
res = SZE_FAIL; |
| 204 | 204 |
break; |
| 205 | 205 |
} |
| 206 | 206 |
if (fclose(outputHandle)) |
| 207 | 207 |
{
|
| 208 |
PrintError("can not close output file");
|
|
| 208 |
PrintError((char*)"can not close output file");
|
|
| 209 | 209 |
res = SZE_FAIL; |
| 210 | 210 |
break; |
| 211 | 211 |
} |
| ... | ... | |
| 216 | 216 |
} |
| 217 | 217 |
else |
| 218 | 218 |
{
|
| 219 |
PrintError("incorrect command");
|
|
| 219 |
PrintError((char*)"incorrect command");
|
|
| 220 | 220 |
res = SZE_FAIL; |
| 221 | 221 |
} |
| 222 | 222 |
} |
| ... | ... | |
| 229 | 229 |
return 0; |
| 230 | 230 |
} |
| 231 | 231 |
if (res == SZE_OUTOFMEMORY) |
| 232 |
PrintError("can not allocate memory");
|
|
| 232 |
PrintError((char*)"can not allocate memory");
|
|
| 233 | 233 |
else |
| 234 | 234 |
printf("\nERROR #%d\n", res);
|
| 235 | 235 |
return 1; |
| b/code/ryzom/client/src/seven_zip/LzmaDecode.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 126 | 126 |
if (prop0 >= (9 * 5 * 5)) |
| 127 | 127 |
return LZMA_RESULT_DATA_ERROR; |
| 128 | 128 |
{
|
| 129 |
for (propsRes->pb = 0; prop0 >= (9 * 5); propsRes->pb++, prop0 -= (9 * 5)); |
|
| 130 |
for (propsRes->lp = 0; prop0 >= 9; propsRes->lp++, prop0 -= 9); |
|
| 129 |
for (propsRes->pb = 0; prop0 >= (9 * 5); propsRes->pb++, prop0 -= (9 * 5)) ;
|
|
| 130 |
for (propsRes->lp = 0; prop0 >= 9; propsRes->lp++, prop0 -= 9) ;
|
|
| 131 | 131 |
propsRes->lc = prop0; |
| 132 | 132 |
/* |
| 133 | 133 |
unsigned char remainder = (unsigned char)(prop0 / 9); |
| b/code/ryzom/client/src/sound_manager.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 116 | 116 |
// constructor |
| 117 | 117 |
//----------------------------------------------- |
| 118 | 118 |
CSoundManager::CSoundManager(IProgressCallback * /* progressCallBack */) |
| 119 |
: _UserEntitySoundLevel(1.0f),
|
|
| 120 |
_AudioMixer(NULL),
|
|
| 121 |
_EnvSoundRoot(NULL)
|
|
| 119 |
: _AudioMixer(NULL),
|
|
| 120 |
_EnvSoundRoot(NULL),
|
|
| 121 |
_UserEntitySoundLevel(1.0f)
|
|
| 122 | 122 |
{
|
| 123 | 123 |
_EnableBackgroundMusicAtTime= 0; |
| 124 | 124 |
_GameMusicVolume= 1.f; |
| ... | ... | |
| 1288 | 1288 |
_BackgroundFlags.Flags[MORNING] = false; |
| 1289 | 1289 |
_BackgroundFlags.Flags[DUSK] = true; |
| 1290 | 1290 |
break; |
| 1291 |
case CLightCycleManager::StateUnknown: |
|
| 1292 |
break; |
|
| 1291 | 1293 |
} |
| 1292 | 1294 |
|
| 1293 | 1295 |
// update the filter for season. |
| ... | ... | |
| 1318 | 1320 |
_BackgroundFlags.Flags[AUTUMN] = false; |
| 1319 | 1321 |
_BackgroundFlags.Flags[WINTER] = true; |
| 1320 | 1322 |
break; |
| 1323 |
default: |
|
| 1324 |
break; |
|
| 1321 | 1325 |
} |
| 1322 | 1326 |
// TODO : update the filter state for weather effet |
| 1323 | 1327 |
CWeatherState weatherState = WeatherManager.getCurrWeatherState(); |
| b/code/ryzom/client/src/string_manager_client.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 787 | 787 |
move = dynInfo.String.begin()+param.ReplacementPoint+2; |
| 788 | 788 |
} |
| 789 | 789 |
break; |
| 790 |
default: |
|
| 791 |
break; |
|
| 790 | 792 |
} |
| 791 | 793 |
} |
| 792 | 794 |
// append the rest of the string |
| ... | ... | |
| 1245 | 1247 |
while(strFindReplace(_SpecItem_TempMap[keyStr].Name, "\\n", "\n")); |
| 1246 | 1248 |
|
| 1247 | 1249 |
// insert in map of Women Name if OK. |
| 1248 |
if(womenNameColIndex!=(~0)) |
|
| 1250 |
if(womenNameColIndex!=((uint)~0))
|
|
| 1249 | 1251 |
{
|
| 1250 | 1252 |
const ucstring &womenName= ws.getData(j, womenNameColIndex); |
| 1251 | 1253 |
_SpecItem_TempMap[keyStr].WomenName= womenName; |
| ... | ... | |
| 1254 | 1256 |
} |
| 1255 | 1257 |
|
| 1256 | 1258 |
// insert in map of Description if OK. |
| 1257 |
if(descColIndex!=(~0)) |
|
| 1259 |
if(descColIndex!=((uint)~0))
|
|
| 1258 | 1260 |
{
|
| 1259 | 1261 |
const ucstring &desc= ws.getData(j, descColIndex); |
| 1260 | 1262 |
_SpecItem_TempMap[keyStr].Desc= desc; |
| ... | ... | |
| 1263 | 1265 |
} |
| 1264 | 1266 |
|
| 1265 | 1267 |
// insert in map of Description2 if OK. |
| 1266 |
if(descColIndex2!=(~0)) |
|
| 1268 |
if(descColIndex2!=((uint)~0))
|
|
| 1267 | 1269 |
{
|
| 1268 | 1270 |
const ucstring &desc= ws.getData(j, descColIndex2); |
| 1269 | 1271 |
_SpecItem_TempMap[keyStr].Desc2= desc; |
| b/code/ryzom/client/src/timed_fx_manager.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 336 | 336 |
{
|
| 337 | 337 |
case CManagedFX::InAddList: _FXToAdd.erase(fi.SetHandle); break; |
| 338 | 338 |
case CManagedFX::InRemoveList: _FXToRemove.erase(fi.SetHandle); break; |
| 339 |
default: break; |
|
| 339 | 340 |
} |
| 340 | 341 |
fi.unlinkFromCandidateFXList(); |
| 341 | 342 |
fi.unlinkFromInstanciatedFXList(); |
| ... | ... | |
| 848 | 849 |
case CManagedFX::Permanent: color = (!mf.Instance.empty()) ? CRGBA::Magenta : CRGBA::Cyan; break; |
| 849 | 850 |
case CManagedFX::InAddList: color = CRGBA::Blue; break; |
| 850 | 851 |
case CManagedFX::InRemoveList: color = (!mf.Instance.empty()) ? CRGBA::Red : CRGBA::Yellow; break; |
| 852 |
case CManagedFX::Unknown: break; |
|
| 851 | 853 |
} |
| 852 | 854 |
drawBox(CVector(- size, - size, - size), |
| 853 | 855 |
CVector(size, size, size), |
| b/code/ryzom/client/src/timed_fx_manager.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 49 | 49 |
bool FromIG; // true if the fx comes from an ig, or false if it was generated dynamically |
| 50 | 50 |
#endif |
| 51 | 51 |
public: |
| 52 |
CTimedFX() : FXSheet(NULL), SpawnPosition(0.f, 0.f, 0.f)
|
|
| 52 |
CTimedFX() : SpawnPosition(0.f, 0.f, 0.f), FXSheet(NULL)
|
|
| 53 | 53 |
{
|
| 54 | 54 |
#if !FINAL_VERSION |
| 55 | 55 |
FromIG = true; |
| b/code/ryzom/client/src/user_entity.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 745 | 745 |
return true; |
| 746 | 746 |
} |
| 747 | 747 |
break; |
| 748 |
default: |
|
| 749 |
break; |
|
| 748 | 750 |
} |
| 749 | 751 |
|
| 750 | 752 |
// Reset Parent, unless we stay in mount mode |
| ... | ... | |
| 1324 | 1326 |
if(_MoveToAction==CUserEntity::CombatPhrase || _MoveToAction==CUserEntity::ExtractRM) |
| 1325 | 1327 |
{
|
| 1326 | 1328 |
// the clientExecute has not been called in case of "ExtractRM autoFind" |
| 1327 |
bool autoFindExtractRM= _MoveToAction==CUserEntity::ExtractRM && _MoveToPhraseMemoryLine == ~0; |
|
| 1329 |
bool autoFindExtractRM= _MoveToAction==CUserEntity::ExtractRM && _MoveToPhraseMemoryLine == (uint)~0;
|
|
| 1328 | 1330 |
if(!autoFindExtractRM) |
| 1329 | 1331 |
{
|
| 1330 | 1332 |
CSPhraseManager *pPM= CSPhraseManager::getInstance(); |
| ... | ... | |
| 1644 | 1646 |
case CUserEntity::BuildTotem: |
| 1645 | 1647 |
buildTotem(); |
| 1646 | 1648 |
break; |
| 1649 |
// Move To Done. |
|
| 1650 |
default: |
|
| 1651 |
resetAnyMoveTo(); |
|
| 1652 |
break; |
|
| 1647 | 1653 |
} |
| 1648 |
// Move To Done. |
|
| 1649 |
resetAnyMoveTo(); |
|
| 1650 | 1654 |
}// moveToAction // |
| 1651 | 1655 |
|
| 1652 | 1656 |
|
| ... | ... | |
| 3519 | 3523 |
if ( ((CLFECOMMON::TClientDataSetIndex)uidLeaf->getValue32()) == mountEntity->dataSetId() ) |
| 3520 | 3524 |
{
|
| 3521 | 3525 |
CCDBNodeLeaf *hungerLeaf = safe_cast<CCDBNodeLeaf*>(beastNode->getNode( ICDBNode::CTextId( "HUNGER" ) )); |
| 3522 |
return (hungerLeaf->getValue32() != ANIMAL_TYPE::DbHungryValue); |
|
| 3526 |
return (hungerLeaf->getValue32() != (sint)ANIMAL_TYPE::DbHungryValue);
|
|
| 3523 | 3527 |
} |
| 3524 | 3528 |
} |
| 3525 | 3529 |
return false; |
| ... | ... | |
| 3751 | 3755 |
CSPhraseManager *pm = CSPhraseManager::getInstance(); |
| 3752 | 3756 |
uint index; |
| 3753 | 3757 |
uint memoryLine; |
| 3754 |
bool autoFindPhrase = (_MoveToPhraseMemoryLine == ~0); |
|
| 3758 |
bool autoFindPhrase = (_MoveToPhraseMemoryLine == (uint)~0);
|
|
| 3755 | 3759 |
if ( ! autoFindPhrase ) |
| 3756 | 3760 |
{
|
| 3757 | 3761 |
// Use clicked phrase |
| ... | ... | |
| 3781 | 3785 |
} |
| 3782 | 3786 |
} |
| 3783 | 3787 |
|
| 3784 |
if ( memoryLine != ~0 ) |
|
| 3788 |
if ( memoryLine != (uint)~0 )
|
|
| 3785 | 3789 |
{
|
| 3786 | 3790 |
// Open the forage (but not for care actions). Necessary for the case of redoing an extraction after a Drop All on the same source. |
| 3787 | 3791 |
uint32 phraseId = pm->getMemorizedPhrase( memoryLine, index ); |
| b/code/ryzom/client/src/water_env_map_rdr.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 47 | 47 |
NL3D::TGlobalAnimationTime CurrTime; |
| 48 | 48 |
CSky *Sky; |
| 49 | 49 |
public: |
| 50 |
CWaterEnvMapRdr() : _LastRenderStartTime(-1), CurrTime(-1)
|
|
| 50 |
CWaterEnvMapRdr() : CurrTime(-1), _LastRenderStartTime(-1)
|
|
| 51 | 51 |
{
|
| 52 | 52 |
_CurrCanopyCamPos = CVector::Null; |
| 53 | 53 |
} |
| b/code/ryzom/common/src/game_share/bg_downloader_msg.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 24 | 24 |
namespace BGDownloader |
| 25 | 25 |
{
|
| 26 | 26 |
|
| 27 |
extern const char *DownloaderMutexName = "RyzomBgDownloader";
|
|
| 27 |
const char *DownloaderMutexName = "RyzomBgDownloader"; |
|
| 28 | 28 |
|
| 29 | 29 |
ucstring getWrittenSize(uint32 nSize) |
| 30 | 30 |
{
|
| b/code/ryzom/common/src/game_share/bnp_patch.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 190 | 190 |
PROP(uint32,_PatchSize) \ |
| 191 | 191 |
PROP_VECT(uint32,_HashKey) |
| 192 | 192 |
|
| 193 |
#pragma message( PERSISTENT_GENERATION_MESSAGE ) |
|
| 193 |
#ifdef NL_OS_WINDOWS |
|
| 194 |
# pragma message( PERSISTENT_GENERATION_MESSAGE ) |
|
| 195 |
#endif // NL_OS_WINDOWS |
|
| 194 | 196 |
#include "persistent_data_template.h" |
| 195 | 197 |
|
| 196 | 198 |
#undef PERSISTENT_CLASS |
| ... | ... | |
| 340 | 342 |
PROP(std::string,_FileName)\ |
| 341 | 343 |
STRUCT_VECT(_Versions) |
| 342 | 344 |
|
| 343 |
#pragma message( PERSISTENT_GENERATION_MESSAGE ) |
|
| 345 |
#ifdef NL_OS_WINDOWS |
|
| 346 |
# pragma message( PERSISTENT_GENERATION_MESSAGE ) |
|
| 347 |
#endif // NL_OS_WINDOWS |
|
| 344 | 348 |
#include "persistent_data_template.h" |
| 345 | 349 |
|
| 346 | 350 |
#undef PERSISTENT_CLASS |
| ... | ... | |
| 453 | 457 |
#define PERSISTENT_CLASS CBNPFileSet |
| 454 | 458 |
#define PERSISTENT_DATA\ |
| 455 | 459 |
STRUCT_VECT(_Files) |
| 456 |
|
|
| 457 |
#pragma message( PERSISTENT_GENERATION_MESSAGE ) |
|
| 460 |
#ifdef NL_OS_WINDOWS |
|
| 461 |
# pragma message( PERSISTENT_GENERATION_MESSAGE ) |
|
| 462 |
#endif // NL_OS_WINDOWS |
|
| 458 | 463 |
#include "persistent_data_template.h" |
| 459 | 464 |
|
| 460 | 465 |
#undef PERSISTENT_CLASS |
| ... | ... | |
| 574 | 579 |
LPROP(bool, _Hidden, if(_Hidden))\ |
| 575 | 580 |
PROP_VECT(std::string, _Files)\ |
| 576 | 581 |
|
| 577 |
#pragma message( PERSISTENT_GENERATION_MESSAGE ) |
|
| 582 |
#ifdef NL_OS_WINDOWS |
|
| 583 |
# pragma message( PERSISTENT_GENERATION_MESSAGE ) |
|
| 584 |
#endif // NL_OS_WINDOWS |
|
| 578 | 585 |
#include "persistent_data_template.h" |
| 579 | 586 |
|
| 580 | 587 |
#undef PERSISTENT_CLASS |
| ... | ... | |
| 724 | 731 |
#define PERSISTENT_CLASS CBNPCategorySet |
| 725 | 732 |
#define PERSISTENT_DATA\ |
| 726 | 733 |
STRUCT_VECT(_Category) |
| 727 |
|
|
| 728 |
#pragma message( PERSISTENT_GENERATION_MESSAGE ) |
|
| 734 |
#ifdef NL_OS_WINDOWS |
|
| 735 |
# pragma message( PERSISTENT_GENERATION_MESSAGE ) |
|
| 736 |
#endif // NL_OS_WINDOWS |
|
| 729 | 737 |
#include "persistent_data_template.h" |
| 730 | 738 |
|
| 731 | 739 |
#undef PERSISTENT_CLASS |
| ... | ... | |
| 814 | 822 |
STRUCT(_Files)\ |
| 815 | 823 |
STRUCT(_Categories) |
| 816 | 824 |
|
| 817 |
#pragma message( PERSISTENT_GENERATION_MESSAGE ) |
|
| 825 |
#ifdef NL_OS_WINDOWS |
|
| 826 |
# pragma message( PERSISTENT_GENERATION_MESSAGE ) |
|
| 827 |
#endif //NL_OS_WINDOWS |
|
| 818 | 828 |
#include "persistent_data_template.h" |
| 819 | 829 |
|
| 820 | 830 |
#undef PERSISTENT_CLASS |
| b/code/ryzom/common/src/game_share/crypt.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 403 | 403 |
|
| 404 | 404 |
static unsigned char S[8][64] = { /* 48->32 bit substitution tables */
|
| 405 | 405 |
/* S[1] */ |
| 406 |
14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7, |
|
| 407 |
0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8, |
|
| 408 |
4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0, |
|
| 409 |
15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13,
|
|
| 406 |
{14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
|
|
| 407 |
0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
|
|
| 408 |
4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
|
|
| 409 |
15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13},
|
|
| 410 | 410 |
/* S[2] */ |
| 411 |
15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10, |
|
| 412 |
3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5, |
|
| 413 |
0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15, |
|
| 414 |
13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9,
|
|
| 411 |
{15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
|
|
| 412 |
3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
|
|
| 413 |
0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
|
|
| 414 |
13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9},
|
|
| 415 | 415 |
/* S[3] */ |
| 416 |
10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8, |
|
| 417 |
13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1, |
|
| 418 |
13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7, |
|
| 419 |
1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12,
|
|
| 416 |
{10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8,
|
|
| 417 |
13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1,
|
|
| 418 |
13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7,
|
|
| 419 |
1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12},
|
|
| 420 | 420 |
/* S[4] */ |
| 421 |
7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15, |
|
| 422 |
13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9, |
|
| 423 |
10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4, |
|
| 424 |
3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14,
|
|
| 421 |
{ 7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15,
|
|
| 422 |
13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9,
|
|
| 423 |
10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4,
|
|
| 424 |
3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14},
|
|
| 425 | 425 |
/* S[5] */ |
| 426 |
2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9, |
|
| 427 |
14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6, |
|
| 428 |
4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14, |
|
| 429 |
11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3,
|
|
| 426 |
{ 2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9,
|
|
| 427 |
14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6,
|
|
| 428 |
4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14,
|
|
| 429 |
11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3},
|
|
| 430 | 430 |
/* S[6] */ |
| 431 |
12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11, |
|
| 432 |
10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8, |
|
| 433 |
9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6, |
|
| 434 |
4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13,
|
|
| 431 |
{12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11,
|
|
| 432 |
10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8,
|
|
| 433 |
9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6,
|
|
| 434 |
4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13},
|
|
| 435 | 435 |
/* S[7] */ |
| 436 |
4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1, |
|
| 437 |
13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
|
|
| 438 |
1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2, |
|
| 439 |
6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12,
|
|
| 436 |
{ 4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1,
|
|
| 437 |
13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
|
|
| 438 |
1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2,
|
|
| 439 |
6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12},
|
|
| 440 | 440 |
/* S[8] */ |
| 441 |
13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7, |
|
| 442 |
1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2, |
|
| 443 |
7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8, |
|
| 444 |
2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11,
|
|
| 441 |
{13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7,
|
|
| 442 |
1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2,
|
|
| 443 |
7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8,
|
|
| 444 |
2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11}
|
|
| 445 | 445 |
}; |
| 446 | 446 |
|
| 447 | 447 |
static unsigned char P32Tr[] = { /* 32-bit permutation function */
|
| b/code/ryzom/common/src/game_share/dir_light_setup.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 26 | 26 |
|
| 27 | 27 |
//----------------------------------------------- |
| 28 | 28 |
CDirLightSetup::CDirLightSetup() : Ambiant(0, 0, 0), |
| 29 |
Diffuse(255, 255, 255), |
|
| 29 | 30 |
Specular(0, 0, 0), |
| 30 |
Diffuse(255, 255, 255), |
|
| 31 |
Direction(1.f, 0.f, 0.f) |
|
| 31 |
Direction(1.f, 0.f, 0.f) |
|
| 32 | 32 |
{
|
| 33 |
// |
|
| 34 | 33 |
} |
| 35 | 34 |
|
| 36 | 35 |
//----------------------------------------------- |
| b/code/ryzom/common/src/game_share/dms.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 80 | 80 |
public: |
| 81 | 81 |
virtual ~IServerEditionModule(){}
|
| 82 | 82 |
virtual void createSessionWithoutSu(uint32 charId, NLMISC::CEntityId clientEid) = 0; |
| 83 |
virtual TPioneersSessionsAllowed * const getSessionAllowedForChar(TCharId charId) const = 0;
|
|
| 83 |
virtual TPioneersSessionsAllowed * getSessionAllowedForChar(TCharId charId) const = 0; |
|
| 84 | 84 |
virtual CScenario* getScenarioById(TSessionId sessionId) const = 0; |
| 85 | 85 |
// getEditing position (use AdminModule::getPosition for having a position in editing and animation mode) |
| 86 | 86 |
virtual bool getPosition(TSessionId sessionId, double& x, double& y, double& orient, uint8& season, uint32 locationIndex = 0) = 0; |
| b/code/ryzom/common/src/game_share/generic_xml_msg_mngr.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 177 | 177 |
/* |
| 178 | 178 |
* Constructor |
| 179 | 179 |
*/ |
| 180 |
CGenericXmlMsgHeaderManager::CNode::CNode(xmlNodePtr xmlNode, uint32 value) : Value(value), NbBits(0), Callback(NULL), UseCycle(false)
|
|
| 180 |
CGenericXmlMsgHeaderManager::CNode::CNode(xmlNodePtr xmlNode, uint32 value) : Value(value), UseCycle(false), NbBits(0), Callback(NULL)
|
|
| 181 | 181 |
{
|
| 182 | 182 |
UserData[0] = 0; |
| 183 | 183 |
UserData[1] = 0; |
| b/code/ryzom/common/src/game_share/mirror.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 30 | 30 |
using namespace NLNET; |
| 31 | 31 |
using namespace std; |
| 32 | 32 |
|
| 33 |
|
|
| 34 |
#ifdef FAST_MIRROR |
|
| 35 |
# pragma message(NL_LOC_MSG "Using **** FAST_MIRROR ****") |
|
| 36 |
#else |
|
| 37 |
# pragma message(NL_LOC_MSG "Not using FAST_MIRROR") |
|
| 38 |
#endif |
|
| 33 |
#ifdef NL_OS_WINDOWS |
|
| 34 |
# ifdef FAST_MIRROR |
|
| 35 |
# pragma message(NL_LOC_MSG "Using **** FAST_MIRROR ****") |
|
| 36 |
# else |
|
| 37 |
# pragma message(NL_LOC_MSG "Not using FAST_MIRROR") |
|
| 38 |
# endif |
|
| 39 |
#endif // NL_OS_WINDOWS |
|
| 39 | 40 |
|
| 40 | 41 |
|
| 41 | 42 |
const string MirrorVersion = string("1.10-")+string(ListRowSizeString); // ADDED: Unidirectional Mode (don't wait for delta)
|
| ... | ... | |
| 841 | 842 |
for ( istfar=smidsToFindAndRemove.begin(); istfar!=smidsToFindAndRemove.end(); ++istfar ) |
| 842 | 843 |
{
|
| 843 | 844 |
if ( (*istfar) != InvalidSMId ) |
| 845 |
{
|
|
| 844 | 846 |
MIRROR_INFO( "MIRROR: Need to remove tracker with smid %d", (*istfar) ); |
| 847 |
} |
|
| 845 | 848 |
} |
| 846 | 849 |
#endif |
| 847 | 850 |
|
| b/code/ryzom/common/src/game_share/mirror_prop_value.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 1296 | 1296 |
protected: |
| 1297 | 1297 |
|
| 1298 | 1298 |
/// Default constructor |
| 1299 |
CMirrorPropValueList() : _PtFront(NULL), _Container(NULL), _PropLocation() {}
|
|
| 1299 |
CMirrorPropValueList() : _Container(NULL), _PtFront(NULL), _PropLocation() {}
|
|
| 1300 | 1300 |
|
| 1301 | 1301 |
TSharedListRow allocateNewCell(); |
| 1302 | 1302 |
|
| b/code/ryzom/common/src/game_share/mode_and_behaviour.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 318 | 318 |
} |
| 319 | 319 |
|
| 320 | 320 |
/// Cons cast into behaviour enum |
| 321 |
operator const EBehaviour () const
|
|
| 321 |
operator EBehaviour () const |
|
| 322 | 322 |
{
|
| 323 | 323 |
return (EBehaviour)Behaviour8; |
| 324 | 324 |
} |
| b/code/ryzom/common/src/game_share/rm_family.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 640 | 640 |
bool isMagicResistStat(TRMStatType fs) |
| 641 | 641 |
{
|
| 642 | 642 |
// should have 5 magic resistances. Desert should be the 1st, and PrimRoot the last |
| 643 |
const uint startMResist= DesertResistance;
|
|
| 644 |
const uint endMResist= PrimaryRootResistance+1;
|
|
| 643 |
const int startMResist= DesertResistance; |
|
| 644 |
const int endMResist= PrimaryRootResistance+1; |
|
| 645 | 645 |
nlctassert(endMResist - startMResist == 5); |
| 646 | 646 |
|
| 647 | 647 |
return fs>=startMResist && fs<endMResist; |
| ... | ... | |
| 651 | 651 |
bool isMagicProtectStat(TRMStatType fs) |
| 652 | 652 |
{
|
| 653 | 653 |
// should have 7 magic protection. Acid should be the 1st, and Electricity the last |
| 654 |
const uint startMProt= AcidProtection;
|
|
| 655 |
const uint endMProt= ElectricityProtection+1;
|
|
| 654 |
const int startMProt= AcidProtection; |
|
| 655 |
const int endMProt= ElectricityProtection+1; |
|
| 656 | 656 |
nlctassert(endMProt - startMProt == 7); |
| 657 | 657 |
|
| 658 | 658 |
return fs>=startMProt && fs<endMProt; |
| b/code/ryzom/common/src/game_share/season.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 21 | 21 |
namespace EGSPD |
| 22 | 22 |
{
|
| 23 | 23 |
|
| 24 |
static const struct { char* Name; CSeason::TSeason Value; } TSeasonConvert[] =
|
|
| 24 |
static const struct { const char* Name; CSeason::TSeason Value; } TSeasonConvert[] =
|
|
| 25 | 25 |
{
|
| 26 | 26 |
{ "Spring", CSeason::Spring },
|
| 27 | 27 |
{ "Summer", CSeason::Summer },
|
| b/code/ryzom/common/src/game_share/server_edition_module.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 141 | 141 |
public: |
| 142 | 142 |
|
| 143 | 143 |
CCurrentChar(TCharId charId, uint32 editSlotId, const R2::TUserRole& userRole = R2::TUserRole::ur_editor) |
| 144 |
:_CharId(charId), _EditSlotId(editSlotId), _UserRole(userRole){}
|
|
| 144 |
:_EditSlotId(editSlotId), _CharId(charId), _UserRole(userRole){}
|
|
| 145 | 145 |
|
| 146 | 146 |
void setUserRole(const R2::TUserRole& userRole) |
| 147 | 147 |
{
|
| ... | ... | |
| 256 | 256 |
{
|
| 257 | 257 |
public: |
| 258 | 258 |
CTaskUpdateScenarioVision(NLMISC::TTime now, CServerEditionModule* module, TSessionId sessionId) |
| 259 |
:CTask<NLMISC::TTime>(now), _Module(module),_SessionId(sessionId){}
|
|
| 259 |
:CTask<NLMISC::TTime>(now), _SessionId(sessionId), _Module(module){}
|
|
| 260 | 260 |
virtual void doOperation() |
| 261 | 261 |
{
|
| 262 | 262 |
_Module->updateScenarioVision(_SessionId); |
| ... | ... | |
| 340 | 340 |
|
| 341 | 341 |
public: |
| 342 | 342 |
CKickPlayerIfStillConnected(NLMISC::TTime taskDate, CServerEditionModule* serverEditionModule, TSessionId sessionId, TCharId charId) |
| 343 |
: CTask<NLMISC::TTime>(taskDate),_ServerEditionModule(serverEditionModule), _SessionId(sessionId), _CharId(charId)
|
|
| 343 |
: CTask<NLMISC::TTime>(taskDate),_ServerEditionModule(serverEditionModule), _CharId(charId), _SessionId(sessionId)
|
|
| 344 | 344 |
{
|
| 345 | 345 |
} |
| 346 | 346 |
|
| ... | ... | |
| 374 | 374 |
typedef uint32 TCharId; |
| 375 | 375 |
public: |
| 376 | 376 |
CVerifyRingAccess(NLMISC::TTime taskDate, CServerEditionModule* serverEditionModule, TSessionId sessionId, TCharId charId) |
| 377 |
:CTask<NLMISC::TTime>(taskDate),_ServerEditionModule(serverEditionModule), _SessionId(sessionId), _CharId(charId)
|
|
| 377 |
:CTask<NLMISC::TTime>(taskDate),_ServerEditionModule(serverEditionModule), _CharId(charId), _SessionId(sessionId)
|
|
| 378 | 378 |
{
|
| 379 | 379 |
} |
| 380 | 380 |
|
| ... | ... | |
| 764 | 764 |
|
| 765 | 765 |
|
| 766 | 766 |
CEditionSession::CEditionSession(RSMGR::TSessionType sessionType, TSessionId sessionId, CEditionSession* edit) |
| 767 |
:_EditSlotIdMaker(1), SessionId(sessionId)
|
|
| 767 |
: SessionId(sessionId), _EditSlotIdMaker(1)
|
|
| 768 | 768 |
{
|
| 769 | 769 |
IsAnimationStopped = false; |
| 770 | 770 |
DateSinceNoPlayer = 0; |
| ... | ... | |
| 2572 | 2572 |
} |
| 2573 | 2573 |
|
| 2574 | 2574 |
|
| 2575 |
TPioneersSessionsAllowed * const CServerEditionModule::getSessionAllowedForChar(TCharId charId) const
|
|
| 2575 |
TPioneersSessionsAllowed * CServerEditionModule::getSessionAllowedForChar(TCharId charId) const |
|
| 2576 | 2576 |
{
|
| 2577 | 2577 |
TPioneersSessionsAlloweds::const_iterator found = _PioneersSessionsAllowed.find(charId); |
| 2578 | 2578 |
if (found == _PioneersSessionsAllowed.end()) return NULL; |
| b/code/ryzom/common/src/game_share/server_edition_module.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 474 | 474 |
TUserRole getRoleByCharId(TCharId charId) const; |
| 475 | 475 |
|
| 476 | 476 |
// get the session that is about to be joined by a client, or NULL if not found |
| 477 |
TPioneersSessionsAllowed * const getSessionAllowedForChar(TCharId charId) const;
|
|
| 477 |
TPioneersSessionsAllowed * getSessionAllowedForChar(TCharId charId) const; |
|
| 478 | 478 |
// get the scenario use by the user |
| 479 | 479 |
|
| 480 | 480 |
CScenario* getScenarioByCharId(TCharId charId) const; |
| b/code/ryzom/common/src/game_share/sp_type.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 21 | 21 |
namespace EGSPD |
| 22 | 22 |
{
|
| 23 | 23 |
|
| 24 |
static const struct { char* Name; CSPType::TSPType Value; } TSPTypeConvert[] =
|
|
| 24 |
static const struct { const char* Name; CSPType::TSPType Value; } TSPTypeConvert[] =
|
|
| 25 | 25 |
{
|
| 26 | 26 |
{ "Fight", CSPType::Fight },
|
| 27 | 27 |
{ "Magic", CSPType::Magic },
|
| b/code/ryzom/common/src/game_share/time_weather_season/weather_function_params_sheet_base.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 26 | 26 |
|
| 27 | 27 |
|
| 28 | 28 |
//======================================================================= |
| 29 |
CWeatherFunctionParamsSheetBase::CWeatherFunctionParamsSheetBase() : CycleLenght(25), |
|
| 30 |
DayLenght(24), |
|
| 31 |
MinThunderPeriod(1.f), |
|
| 32 |
ThunderLenght(0.5f), |
|
| 33 |
CloudWindSpeedFactor(1.f), |
|
| 34 |
CloudMinSpeed(0.f) |
|
| 29 |
CWeatherFunctionParamsSheetBase::CWeatherFunctionParamsSheetBase() |
|
| 30 |
: DayLenght(24), |
|
| 31 |
CycleLenght(25), |
|
| 32 |
MinThunderPeriod(1.f), |
|
| 33 |
ThunderLenght(0.5f), |
|
| 34 |
CloudWindSpeedFactor(1.f), |
|
| 35 |
CloudMinSpeed(0.f) |
|
| 35 | 36 |
{
|
| 36 | 37 |
} |
| 37 | 38 |
|
| b/code/ryzom/common/src/game_share/time_weather_season/weather_setup_sheet_base.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 39 | 39 |
FogColorDay(NLMISC::CRGBA::Black), |
| 40 | 40 |
FogColorDusk(NLMISC::CRGBA::Black), |
| 41 | 41 |
FogColorNight(NLMISC::CRGBA::Black), |
| 42 |
FogGradientFactor(1.f), |
|
| 42 | 43 |
Lighting(1.f), |
| 43 | 44 |
WindIntensity(0), |
| 44 |
ThunderIntensity(0), |
|
| 45 |
FogGradientFactor(1.f) |
|
| 45 |
ThunderIntensity(0) |
|
| 46 | 46 |
|
| 47 | 47 |
{
|
| 48 | 48 |
for(uint k = 0; k < NumFogType; ++k) |
| b/code/ryzom/common/src/game_share/type_skill_mod.cpp Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 43 | 43 |
PROP(sint32, Modifier)\ |
| 44 | 44 |
PROP2(Type, std::string, EGSPD::CClassificationType::toString(Type), Type=EGSPD::CClassificationType::fromString(val))\ |
| 45 | 45 |
|
| 46 |
#pragma message( PERSISTENT_GENERATION_MESSAGE ) |
|
| 46 |
#ifdef NL_OS_WINDOWS |
|
| 47 |
#pragma message( PERSISTENT_GENERATION_MESSAGE ) |
|
| 48 |
#endif // NL_OS_WINDOWS |
|
| 49 |
|
|
| 47 | 50 |
#include "persistent_data_template.h" |
| b/code/ryzom/common/src/game_share/xml_auto_ptr.h Sat May 15 15:30:30 2010 +0300 | ||
|---|---|---|
| 34 | 34 |
operator std::string() const { return std::string(_Value); }
|
| 35 | 35 |
bool operator ! () const { return _Value == NULL; }
|
| 36 | 36 |
operator const unsigned char *() const { return (const unsigned char *) _Value; }
|
| 37 |
const char operator * () const { nlassert(_Value); return *_Value; }
|
|
| 37 |
char operator * () const { nlassert(_Value); return *_Value; }
|
|
| 38 | 38 |
/// NB : This remove previous owned pointer with xmlFree |
| 39 | 39 |
CXMLAutoPtr &operator = (const char *other); |
| 40 | 40 |
CXMLAutoPtr &operator = (const unsigned char *other) |