aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-28 01:56:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with default

Browse source 
--HG--
branch : compatibility
This commit is contained in:
kervala 2014-05-13 09:37:06 +02:00
commit a7eedeb7c7
4 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.hgtags
View file

@ -3,10 +3,6 @@ a409552f83cb55a5c20f867fd7bcae1d0083d01a ryzomcore_0_8_0
0000000000000000000000000000000000000000 ryzomcore_0_8_0 0000000000000000000000000000000000000000 ryzomcore_0_8_0
0000000000000000000000000000000000000000 ryzomcore_0_8_0 0000000000000000000000000000000000000000 ryzomcore_0_8_0
4eddbaff0c5e5d685db96ee3e8427aa0fd96ac83 ryzomcore_0_8_0 4eddbaff0c5e5d685db96ee3e8427aa0fd96ac83 ryzomcore_0_8_0
2e439cca8c3746df8ea64e1aab2d4d2ab9ca95d8 latest-default-graft
2e439cca8c3746df8ea64e1aab2d4d2ab9ca95d8 latest-default-graft 950d650ca92e6041611258d7e5131ccf661e4ec2 latest-graft-to-default
e4680cd1f1ce24747c4db73eeb4b107f6f6c45d4 latest-default-graft 950d650ca92e6041611258d7e5131ccf661e4ec2 latest-merge-from-default
e4680cd1f1ce24747c4db73eeb4b107f6f6c45d4 latest-default-graft
8162b598e9e233ce0886d3b8b41151f12a7bff01 latest-default-graft
8162b598e9e233ce0886d3b8b41151f12a7bff01 latest-default-graft
5f0b297fb908985504cef899469bfca9a9f9816c latest-default-graft

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

@ -333,8 +333,8 @@ void ExitClientError (const char *format, ...)
// Exit // Exit
extern void quitCrashReport (); extern void quitCrashReport ();
quitCrashReport (); quitCrashReport ();
NLMISC::NL3D_BlockMemoryAssertOnPurge = false; // at this point some object may remain allocated NLMISC::NL3D_BlockMemoryAssertOnPurge = false; // at this point some object may remain allocated
// so don't want to fire an assert here // so don't want to fire an assert here
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} }
@ -558,11 +558,11 @@ static std::string replaceApplicationDirToken(const std::string &dir)
{ {
#ifdef NL_OS_MAC #ifdef NL_OS_MAC
// if client_default.cfg is not in current directory, and it's not an absolute path, use application default directory // if client_default.cfg is not in current directory, and it's not an absolute path, use application default directory
if (!CFile::isExists("client_default.cfg") && dir.size()>0 && dir[0]!='/') if (!CFile::isExists("client_default.cfg") && dir.size()>0 && dir[0]!='/')
{ {
return getAppBundlePath() + "/Contents/Resources/" + dir; return getAppBundlePath() + "/Contents/Resources/" + dir;
} }
#else #else
static const std::string token = "<ApplicationDir>"; static const std::string token = "<ApplicationDir>";
std::string::size_type pos = dir.find(token); std::string::size_type pos = dir.find(token);
@ -695,7 +695,7 @@ void addPreDataPaths(NLMISC::IProgressCallback &progress)
{ {
NLMISC::TTime initPaths = ryzomGetLocalTime (); NLMISC::TTime initPaths = ryzomGetLocalTime ();
H_AUTO(InitRZAddSearchPaths) H_AUTO(InitRZAddSearchPaths)
for (uint i = 0; i < ClientCfg.PreDataPath.size(); i++) for (uint i = 0; i < ClientCfg.PreDataPath.size(); i++)
{ {
progress.progress ((float)i/(float)ClientCfg.PreDataPath.size()); progress.progress ((float)i/(float)ClientCfg.PreDataPath.size());
progress.pushCropedValues ((float)i/(float)ClientCfg.PreDataPath.size(), (float)(i+1)/(float)ClientCfg.PreDataPath.size()); progress.pushCropedValues ((float)i/(float)ClientCfg.PreDataPath.size(), (float)(i+1)/(float)ClientCfg.PreDataPath.size());
@ -771,7 +771,7 @@ void prelogInit()
NLMISC_REGISTER_CLASS(CNamedEntityPositionState); NLMISC_REGISTER_CLASS(CNamedEntityPositionState);
NLMISC_REGISTER_CLASS(CAnimalPositionState); NLMISC_REGISTER_CLASS(CAnimalPositionState);
// _CrtSetDbgFlag( _CRTDBG_CHECK_CRT_DF ); // _CrtSetDbgFlag( _CRTDBG_CHECK_CRT_DF );
// Init XML Lib allocator // Init XML Lib allocator
// Due to Bug #906, we disable the stl xml allocation // Due to Bug #906, we disable the stl xml allocation
@ -924,9 +924,9 @@ void prelogInit()
// For login phase, MUST be in windowed // For login phase, MUST be in windowed
UDriver::CMode mode; UDriver::CMode mode;
mode.Width = 1024; mode.Width = 1024;
mode.Height = 768; mode.Height = 768;
mode.Windowed = true; mode.Windowed = true;
// Disable Hardware Vertex Program. // Disable Hardware Vertex Program.
if(ClientCfg.DisableVtxProgram) if(ClientCfg.DisableVtxProgram)
@ -944,7 +944,7 @@ void prelogInit()
else else
Driver->setSwapVBLInterval(0); Driver->setSwapVBLInterval(0);
if (StereoDisplay) // VR_CONFIG // VR_DRIVER if (StereoDisplay) // VR_CONFIG // VR_DRIVER
{ {
// override mode TODO // override mode TODO
} }
@ -1000,7 +1000,7 @@ void prelogInit()
// check if an icon is present in registered paths // check if an icon is present in registered paths
if(CPath::exists("ryzom.png")) if(CPath::exists("ryzom.png"))
filenames.push_back(CPath::lookup("ryzom.png")); filenames.push_back(CPath::lookup("ryzom.png"));
vector<CBitmap> bitmaps; vector<CBitmap> bitmaps;

3
code/ryzom/tools/leveldesign/georges_dll/stdafx.cpp
View file

@ -19,6 +19,3 @@
// stdafx.obj will contain the pre-compiled type information // stdafx.obj will contain the pre-compiled type information
#include "stdafx.h" #include "stdafx.h"
void foo_std_afx_to_remove_warning() {};

1
code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php
View file

@ -56,6 +56,7 @@
if (!isset($_POST['function'])) { if (!isset($_POST['function'])) {
//require the pages that are being needed. //require the pages that are being needed.
require_once( '../config.default.php' ); require_once( '../config.default.php' );
require_once( $AMS_LIB.'/libinclude.php' );
ini_set( "display_errors", true ); ini_set( "display_errors", true );
error_reporting( E_ALL ); error_reporting( E_ALL );