aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-05 23:09:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: #825 Remove all warning when compiling Ryzom on Linux (patch provided by Letto)

Browse source
This commit is contained in:
kervala 2010-06-11 11:40:43 +02:00
parent 26ed6795f4
commit bdf5fc06fa
9 changed files with 63 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
code/ryzom/client/src/continent_manager.cpp
View file

@ -397,22 +397,24 @@ void CContinentManager::select(const CVectorD &pos, NLMISC::IProgressCallback &p
CContinent *pCont = it->second;
nlinfo("Looking into %s", pCont->SheetName.c_str());
if (pCont->Zone.VPoints.size() > 0) // Patch because some continent have not been done yet
if (pCont->Zone.contains(fPos))
{
// load the continent selected.
select (it->first, pos, progress);
return;
}
else
{
/*
nlwarning("**********************************************");
nlwarning("Start position (%s) not found in continent %s", NLMISC::toString(pos.asVector()).c_str(), it->first.c_str());
for(uint k = 0; k < pCont->Zone.VPoints.size(); ++k)
if (pCont->Zone.contains(fPos))
{
nlwarning("zone point %d = %s", (int)k, NLMISC::toString(pCont->Zone.VPoints[k]).c_str());
// load the continent selected.
select (it->first, pos, progress);
return;
}
else
{
/*
nlwarning("**********************************************");
nlwarning("Start position (%s) not found in continent %s", NLMISC::toString(pos.asVector()).c_str(), it->first.c_str());
for(uint k = 0; k < pCont->Zone.VPoints.size(); ++k)
{
nlwarning("zone point %d = %s", (int)k, NLMISC::toString(pCont->Zone.VPoints[k]).c_str());
}
*/
}
*/
}
it++;
}

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

@ -192,7 +192,7 @@ public:
}
if (newStep)
{
if (loginStep.Step == LoginStep_Stop)
if (loginStep.Step == (uint)LoginStep_Stop)
{
break;
}

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

@ -245,6 +245,8 @@ void CRosacePage::update(float x, float y, TMode mode)
case NbRosaceMode:
nlwarning("Rosace Mode reached.");
break;
default:
break;
}
}// update //

2
code/ryzom/common/src/game_share/bg_downloader_msg.cpp
View file

@ -24,7 +24,7 @@
namespace BGDownloader
{
extern const char *DownloaderMutexName = "RyzomBgDownloader";
const char *DownloaderMutexName = "RyzomBgDownloader";
ucstring getWrittenSize(uint32 nSize)
{

64
code/ryzom/common/src/game_share/crypt.cpp
View file

@ -403,45 +403,45 @@ static unsigned char PC2[] = { /* permuted choice table 2 */
static unsigned char S[8][64] = { /* 48->32 bit substitution tables */
/* S[1] */
14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13,
{14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7,
0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8,
4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0,
15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13},
/* S[2] */
15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9,
{15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10,
3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5,
0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15,
13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9},
/* S[3] */
10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8,
13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1,
13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7,
1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12,
{10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8,
13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1,
13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7,
1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12},
/* S[4] */
7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15,
13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9,
10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4,
3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14,
{ 7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15,
13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9,
10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4,
3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14},
/* S[5] */
2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9,
14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6,
4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14,
11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3,
{ 2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9,
14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6,
4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14,
11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3},
/* S[6] */
12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11,
10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8,
9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6,
4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13,
{12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11,
10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8,
9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6,
4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13},
/* S[7] */
4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1,
13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2,
6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12,
{ 4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1,
13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6,
1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2,
6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12},
/* S[8] */
13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7,
1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2,
7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8,
2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11,
{13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7,
1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2,
7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8,
2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11}
};
static unsigned char P32Tr[] = { /* 32-bit permutation function */

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

@ -80,7 +80,7 @@ namespace R2
public:
virtual ~IServerEditionModule(){}
virtual void createSessionWithoutSu(uint32 charId, NLMISC::CEntityId clientEid) = 0;
virtual TPioneersSessionsAllowed * const getSessionAllowedForChar(TCharId charId) const = 0;
virtual TPioneersSessionsAllowed * getSessionAllowedForChar(TCharId charId) const = 0;
virtual CScenario* getScenarioById(TSessionId sessionId) const = 0;
// getEditing position (use AdminModule::getPosition for having a position in editing and animation mode)
virtual bool getPosition(TSessionId sessionId, double& x, double& y, double& orient, uint8& season, uint32 locationIndex = 0) = 0;

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

@ -30,12 +30,13 @@ using namespace NLMISC;
using namespace NLNET;
using namespace std;
#ifdef FAST_MIRROR
# pragma message(NL_LOC_MSG "Using **** FAST_MIRROR ****")
#else
# pragma message(NL_LOC_MSG "Not using FAST_MIRROR")
#endif
#ifdef NL_OS_WINDOWS
# ifdef FAST_MIRROR
# pragma message(NL_LOC_MSG "Using **** FAST_MIRROR ****")
# else
# pragma message(NL_LOC_MSG "Not using FAST_MIRROR")
# endif
#endif // NL_OS_WINDOWS
const string MirrorVersion = string("1.10-")+string(ListRowSizeString); // ADDED: Unidirectional Mode (don't wait for delta)
@ -841,7 +842,9 @@ void CMirror::releaseTrackers( NLNET::CMessage& msgin )
for ( istfar=smidsToFindAndRemove.begin(); istfar!=smidsToFindAndRemove.end(); ++istfar )
{
if ( (*istfar) != InvalidSMId )
{
MIRROR_INFO( "MIRROR: Need to remove tracker with smid %d", (*istfar) );
}
}
#endif

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

@ -1208,7 +1208,7 @@ public:
protected:
/// Default constructor
CMirrorPropValueList() : _PtFront(NULL), _Container(NULL), _PropLocation() {}
CMirrorPropValueList() : _Container(NULL), _PtFront(NULL), _PropLocation() {}
TSharedListRow allocateNewCell();

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

@ -474,7 +474,7 @@ namespace R2
TUserRole getRoleByCharId(TCharId charId) const;
// get the session that is about to be joined by a client, or NULL if not found
TPioneersSessionsAllowed * const getSessionAllowedForChar(TCharId charId) const;
TPioneersSessionsAllowed * getSessionAllowedForChar(TCharId charId) const;
// get the scenario use by the user
CScenario* getScenarioByCharId(TCharId charId) const;