mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-13 02:39:37 +00:00
Removed: flooding warning
This commit is contained in:
vl
parent
2b2b1c3748
commit
d971a9537c
12 changed files with 77 additions and 83 deletions
|
|
@ -151,7 +151,7 @@ void loadForm (const std::vector<std::string> &sheetFilters, const std::string &
|
|||
}
|
||||
// an exception will be launch if the file is not the good version or if the file is not found
|
||||
|
||||
nlinfo ("loadForm(): Loading packed file '%s'", packedFilename.c_str());
|
||||
//nlinfo ("loadForm(): Loading packed file '%s'", packedFilename.c_str());
|
||||
|
||||
// read the header
|
||||
ifile.serialCheck(PACKED_SHEET_HEADER);
|
||||
|
|
@ -223,7 +223,7 @@ void loadForm (const std::vector<std::string> &sheetFilters, const std::string &
|
|||
// if we don't want to update packed sheet, we have nothing more to do
|
||||
if (!updatePackedSheet)
|
||||
{
|
||||
nlinfo ("Don't update the packed sheet with real sheet");
|
||||
//nlinfo ("Don't update the packed sheet with real sheet");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@ bool CBigFile::add (const std::string &sBigFileName, uint32 nOptions)
|
|||
bnp.AlwaysOpened = true;
|
||||
}
|
||||
|
||||
nldebug("BigFile : added bnp '%s' to the collection", bigfilenamealone.c_str());
|
||||
//nldebug("BigFile : added bnp '%s' to the collection", bigfilenamealone.c_str());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1555,11 +1555,9 @@ void CFileContainer::memoryCompress()
|
|||
SSMext.memoryCompress();
|
||||
SSMpath.memoryCompress();
|
||||
uint nDbg = (uint)_Files.size();
|
||||
nlinfo ("PATH: Number of file : %d", nDbg);
|
||||
nDbg = SSMext.getCount();
|
||||
nlinfo ("PATH: Number of different extension : %d", nDbg);
|
||||
nDbg = SSMpath.getCount();
|
||||
nlinfo ("PATH: Number of different path : %d", nDbg);
|
||||
uint nDbg2 = SSMext.getCount();
|
||||
uint nDbg3 = SSMpath.getCount();
|
||||
nlinfo ("PATH: Number of file: %d, extension: %d, path: %d", nDbg, nDbg2, nDbg3);
|
||||
|
||||
// Convert from _Files to _MCFiles
|
||||
uint nSize = 0, nNb = 0;
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ bool CSheetId::buildSheetId(const std::string& sheetName)
|
|||
void CSheetId::loadSheetId ()
|
||||
{
|
||||
H_AUTO(CSheetIdInit);
|
||||
nldebug("Loading sheet_id.bin");
|
||||
//nldebug("Loading sheet_id.bin");
|
||||
|
||||
// Open the sheet id to sheet file name association
|
||||
CIFile file;
|
||||
|
|
|
|||
|
|
@ -401,10 +401,7 @@ void setCPUMask ()
|
|||
|
||||
void displayCPUInfo()
|
||||
{
|
||||
nlinfo("*** CPUMask Before change: %x", (uint32)Debug_OldCPUMask);
|
||||
nlinfo("*** CPUMask After change: %x", (uint32)Debug_NewCPUMask);
|
||||
nlinfo("*** CPU CPUID: %x", CSystemInfo::getCPUID());
|
||||
nlinfo("*** CPU hasHyperThreading: %s", CSystemInfo::hasHyperThreading()?"YES":"NO");
|
||||
nlinfo("CPUInfo: CPUMask before change: %x, after change: %x, CPUID: %x, hasHyperThreading: %s", (uint32)Debug_OldCPUMask, (uint32)Debug_NewCPUMask, CSystemInfo::getCPUID(), (CSystemInfo::hasHyperThreading()?"YES":"NO"));
|
||||
}
|
||||
|
||||
string getVersionString (uint64 version)
|
||||
|
|
@ -624,7 +621,7 @@ void addPreDataPaths(NLMISC::IProgressCallback &progress)
|
|||
|
||||
progress.popCropedValues ();
|
||||
}
|
||||
nlinfo ("PROFILE: %d seconds for Add search paths Predata", (uint32)(ryzomGetLocalTime ()-initPaths)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds for Add search paths Predata", (uint32)(ryzomGetLocalTime ()-initPaths)/1000);
|
||||
}
|
||||
|
||||
static void addPackedSheetUpdatePaths(NLMISC::IProgressCallback &progress)
|
||||
|
|
@ -1080,7 +1077,7 @@ void prelogInit()
|
|||
{
|
||||
addPackedSheetUpdatePaths(ProgressBar);
|
||||
}
|
||||
nlinfo ("PROFILE: %d seconds for Add search paths Data", (uint32)(ryzomGetLocalTime ()-initPaths)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds for Add search paths Data", (uint32)(ryzomGetLocalTime ()-initPaths)/1000);
|
||||
}
|
||||
|
||||
// Register the reflected classes
|
||||
|
|
@ -1197,7 +1194,7 @@ void postlogInit()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing network", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing network", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
{
|
||||
|
|
@ -1211,7 +1208,7 @@ void postlogInit()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing chat manager", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing chat manager", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
{
|
||||
|
|
@ -1228,7 +1225,7 @@ void postlogInit()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing primitive classes", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing primitive classes", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
// set the primitive context
|
||||
|
|
@ -1288,7 +1285,7 @@ void postlogInit()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing sound manager", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing sound manager", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
{
|
||||
|
|
@ -1308,7 +1305,7 @@ void postlogInit()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing sheets", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing sheets", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
{
|
||||
|
|
@ -1320,7 +1317,7 @@ void postlogInit()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing bricks", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing bricks", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
if (!ClientCfg.Light)
|
||||
|
|
@ -1355,7 +1352,7 @@ void postlogInit()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing Color Slot etc.", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing Color Slot etc.", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1380,7 +1377,7 @@ void postlogInit()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing Movie Shooter", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing Movie Shooter", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
{
|
||||
|
|
@ -1395,7 +1392,7 @@ void postlogInit()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing primitives", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing primitives", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
{
|
||||
|
|
@ -1414,7 +1411,7 @@ void postlogInit()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Executing cfg file start commands", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Executing cfg file start commands", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
// Next step will be the connection with the server.
|
||||
|
|
|
|||
|
|
@ -460,7 +460,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Uninitializing outgame", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Uninitializing outgame", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
|
||||
// Create the game interface database
|
||||
{
|
||||
|
|
@ -481,7 +481,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing XML database", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing XML database", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
// Create interface database
|
||||
|
|
@ -500,7 +500,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing interface", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing interface", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
{
|
||||
|
|
@ -511,7 +511,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Awaiting start position", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Awaiting start position", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
FPU_CHECKER_ONCE
|
||||
|
|
@ -537,7 +537,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing sound", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing sound", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
{
|
||||
|
|
@ -548,7 +548,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing Entities manager", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing Entities manager", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
{
|
||||
|
|
@ -599,7 +599,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Creating scene", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Creating scene", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
FPU_CHECKER_ONCE
|
||||
|
|
@ -616,7 +616,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing animation", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing animation", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
UCamera cam2 = SceneRoot->getCam();
|
||||
|
|
@ -668,7 +668,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing Entity Animation Manager", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing Entity Animation Manager", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
{
|
||||
|
|
@ -676,14 +676,14 @@ void initMainLoop()
|
|||
// Parse the interface InGame
|
||||
nmsg = "Building Interface ...";
|
||||
ProgressBar.newMessage ( ClientCfg.buildLoadingString(nmsg) );
|
||||
nlinfo("****** InGame Interface Parsing and Init START ******");
|
||||
//nlinfo("****** InGame Interface Parsing and Init START ******");
|
||||
pIM->initInGame(); // must be called after waitForUserCharReceived() because Ring information is used by initInGame()
|
||||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing ingame", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing ingame", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
|
||||
nlinfo("****** InGame Interface Parsing and Init END ******");
|
||||
//nlinfo("****** InGame Interface Parsing and Init END ******");
|
||||
}
|
||||
|
||||
{
|
||||
|
|
@ -698,7 +698,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing User sheet", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing User sheet", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
FPU_CHECKER_ONCE
|
||||
|
|
@ -715,7 +715,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing Weather", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing Weather", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
{
|
||||
|
|
@ -759,7 +759,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing Landscape", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing Landscape", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
if (!ClientCfg.Light)
|
||||
|
|
@ -776,7 +776,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing Cloudscape", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing Cloudscape", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
FPU_CHECKER_ONCE
|
||||
|
|
@ -792,7 +792,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing season", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing season", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
{
|
||||
|
|
@ -809,7 +809,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing Timed FX", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing Timed FX", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -824,7 +824,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Loading continent", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Loading continent", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -839,7 +839,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing collision manager", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing collision manager", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -899,7 +899,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Creating LOD managers", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Creating LOD managers", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
FPU_CHECKER_ONCE
|
||||
|
|
@ -1032,7 +1032,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Loading characters shapes", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Loading characters shapes", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
|
||||
{
|
||||
bool preloadFXTextures = true;
|
||||
|
|
@ -1079,7 +1079,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Loading FX", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Loading FX", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
{
|
||||
bool preloadObjectTextures = true;
|
||||
|
|
@ -1112,7 +1112,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Loading object shapes", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Loading object shapes", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -1135,7 +1135,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing Contextual Cursor", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing Contextual Cursor", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
TextContext->setColor( CRGBA(255,255,255) );
|
||||
|
|
@ -1148,7 +1148,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing Instances group", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing Instances group", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1196,7 +1196,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Initializing other parameters", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Initializing other parameters", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
|
||||
// Display Launching Message.
|
||||
nmsg = "Sending \"Ready\" ...";
|
||||
|
|
@ -1240,7 +1240,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Sending \"Ready\"", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Sending \"Ready\"", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
|
||||
// Display Launching Message.
|
||||
nmsg = "Launching ...";
|
||||
|
|
@ -1291,7 +1291,7 @@ void initMainLoop()
|
|||
|
||||
initLast = initCurrent;
|
||||
initCurrent = ryzomGetLocalTime();
|
||||
nlinfo ("PROFILE: %d seconds (%d total) for Launching", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
//nlinfo ("PROFILE: %d seconds (%d total) for Launching", (uint32)(initCurrent-initLast)/1000, (uint32)(initCurrent-initStart)/1000);
|
||||
|
||||
nlinfo ("PROFILE: %d seconds for init main loop", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
|
||||
|
|
|
|||
|
|
@ -71,9 +71,7 @@ class CAHDisplayInfos : public IActionHandler
|
|||
{
|
||||
// can only be used by devs and CSR or in local mode
|
||||
#if FINAL_VERSION
|
||||
# ifdef NL_OS_WINDOWS
|
||||
if( ClientCfg.Local || hasPrivilegeDEV() || hasPrivilegeSGM() || hasPrivilegeGM() || hasPrivilegeSG() || hasPrivilegeEM() || hasPrivilegeVG() )
|
||||
# endif
|
||||
#endif
|
||||
{
|
||||
ShowInfos = (ShowInfos+1)%6;
|
||||
|
|
|
|||
|
|
@ -578,33 +578,33 @@ void CInterfaceManager::uninitOutGame()
|
|||
NLSOUND::UAudioMixer *pMixer = SoundMngr->getMixer();
|
||||
pMixer->unloadSampleBank("ui_outgame");
|
||||
}
|
||||
nlinfo ("%d seconds for uninitOutGame", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
//nlinfo ("%d seconds for uninitOutGame", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
|
||||
initStart = ryzomGetLocalTime ();
|
||||
activateMasterGroup ("ui:outgame", false);
|
||||
nlinfo ("%d seconds for activateMasterGroup", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
//nlinfo ("%d seconds for activateMasterGroup", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
initStart = ryzomGetLocalTime ();
|
||||
removeAll();
|
||||
nlinfo ("%d seconds for removeAll", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
//nlinfo ("%d seconds for removeAll", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
initStart = ryzomGetLocalTime ();
|
||||
reset();
|
||||
nlinfo ("%d seconds for reset", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
//nlinfo ("%d seconds for reset", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
// reset the mouse pointer to avoid invalid pointer access
|
||||
_Pointer = NULL;
|
||||
initStart = ryzomGetLocalTime ();
|
||||
CInterfaceLink::removeAllLinks();
|
||||
nlinfo ("%d seconds for removeAllLinks", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
//nlinfo ("%d seconds for removeAllLinks", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
initStart = ryzomGetLocalTime ();
|
||||
ICDBNode::CTextId textId("UI");
|
||||
_DbRootNode->removeNode(textId);
|
||||
nlinfo ("%d seconds for removeNode", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
//nlinfo ("%d seconds for removeNode", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
|
||||
// Init the action manager
|
||||
{
|
||||
|
||||
initStart = ryzomGetLocalTime ();
|
||||
uninitActions();
|
||||
nlinfo ("%d seconds for uninitActions", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
// nlinfo ("%d seconds for uninitActions", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
}
|
||||
|
||||
// Close LUA Scripting
|
||||
|
|
@ -1686,7 +1686,7 @@ bool CInterfaceManager::saveConfig (const string &filename)
|
|||
}
|
||||
quitVisitor.BadWindowFound = false;
|
||||
|
||||
nlwarning( "#### Saving interface config : %s", filename.c_str() );
|
||||
nlinfo( "Saving interface config : %s", filename.c_str() );
|
||||
|
||||
COFile f;
|
||||
|
||||
|
|
|
|||
|
|
@ -3889,7 +3889,7 @@ void CInterfaceParser::removeAllMasterGroups()
|
|||
initStart = ryzomGetLocalTime ();
|
||||
for (i = 0; i < _MasterGroups.size(); ++i)
|
||||
unlinkAllContainers (_MasterGroups[i].Group);
|
||||
nlinfo ("%d seconds for all unlinkAllContainers", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
//nlinfo ("%d seconds for all unlinkAllContainers", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
|
||||
initStart = ryzomGetLocalTime ();
|
||||
// Yoyo: important to not Leave NULL in the array, because of CGroupHTML and LibWWW callback
|
||||
|
|
@ -3899,7 +3899,7 @@ void CInterfaceParser::removeAllMasterGroups()
|
|||
delete _MasterGroups.back().Group;
|
||||
_MasterGroups.pop_back();
|
||||
}
|
||||
nlinfo ("%d seconds for all delete _MasterGroups", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
//nlinfo ("%d seconds for all delete _MasterGroups", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
}
|
||||
|
||||
// ***************************************************************************
|
||||
|
|
@ -3908,25 +3908,25 @@ void CInterfaceParser::removeAll()
|
|||
NLMISC::TTime initStart;
|
||||
initStart = ryzomGetLocalTime ();
|
||||
removeAllLinks();
|
||||
nlinfo ("%d seconds for removeAllLinks", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
//nlinfo ("%d seconds for removeAllLinks", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
initStart = ryzomGetLocalTime ();
|
||||
removeAllOptions();
|
||||
nlinfo ("%d seconds for removeAllOptions", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
//nlinfo ("%d seconds for removeAllOptions", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
initStart = ryzomGetLocalTime ();
|
||||
removeAllProcedures();
|
||||
nlinfo ("%d seconds for removeAllProcedures", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
//nlinfo ("%d seconds for removeAllProcedures", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
initStart = ryzomGetLocalTime ();
|
||||
removeAllDefines();
|
||||
nlinfo ("%d seconds for removeAllDefines", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
//nlinfo ("%d seconds for removeAllDefines", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
initStart = ryzomGetLocalTime ();
|
||||
removeAllTemplates();
|
||||
nlinfo ("%d seconds for removeAllTemplates", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
//nlinfo ("%d seconds for removeAllTemplates", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
initStart = ryzomGetLocalTime ();
|
||||
removeAllAnims();
|
||||
nlinfo ("%d seconds for removeAllAnims", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
//nlinfo ("%d seconds for removeAllAnims", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
initStart = ryzomGetLocalTime ();
|
||||
removeAllMasterGroups();
|
||||
nlinfo ("%d seconds for removeAllMasterGroups", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
//nlinfo ("%d seconds for removeAllMasterGroups", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
|
||||
_StyleMap.clear();
|
||||
_CtrlSheetSelection.deleteGroups();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2384,7 +2384,7 @@ void CSPhraseManager::updateAllActionRegen()
|
|||
updateAllMemoryCtrlRegenTickRange();
|
||||
_RegenTickRangeTouched = false;
|
||||
TTicks endTime = CTime::getPerformanceTime();
|
||||
nldebug("***** %d ms for CSPhraseManager::updateAllActionRegen", (int) (1000 * CTime::ticksToSecond(endTime - startTime)));
|
||||
//nldebug("***** %d ms for CSPhraseManager::updateAllActionRegen", (int) (1000 * CTime::ticksToSecond(endTime - startTime)));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3006,7 +3006,7 @@ void CSPhraseManager::updateAllMemoryCtrlState()
|
|||
}
|
||||
}
|
||||
TTicks endTime = CTime::getPerformanceTime();
|
||||
nldebug("***** %d ms for CSPhraseManager::updateAllMemoryCtrlState", (int) (1000 * CTime::ticksToSecond(endTime - startTime)));
|
||||
//nldebug("***** %d ms for CSPhraseManager::updateAllMemoryCtrlState", (int) (1000 * CTime::ticksToSecond(endTime - startTime)));
|
||||
}
|
||||
|
||||
// ***************************************************************************
|
||||
|
|
|
|||
|
|
@ -1240,7 +1240,7 @@ class CAHOnLogin : public IActionHandler
|
|||
{
|
||||
virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
|
||||
{
|
||||
nlinfo("CAHOnLogin called");
|
||||
//nlinfo("CAHOnLogin called");
|
||||
|
||||
CInterfaceManager *pIM = CInterfaceManager::getInstance();
|
||||
|
||||
|
|
@ -1389,7 +1389,7 @@ REGISTER_ACTION_HANDLER (CAHShardSelect, "shard_select");
|
|||
// ***************************************************************************
|
||||
void ConnectToShard()
|
||||
{
|
||||
nlinfo("ConnectToShard called");
|
||||
//nlinfo("ConnectToShard called");
|
||||
|
||||
if (ClientCfg.R2Mode)
|
||||
{
|
||||
|
|
@ -1745,8 +1745,9 @@ class CAHAcceptEula : public IActionHandler
|
|||
{
|
||||
virtual void execute (CCtrlBase * /* pCaller */, const string &/* sParams */)
|
||||
{
|
||||
nlinfo("CAHAcceptEula called");
|
||||
CFile::deleteFile(getLogDirectory() + "show_eula");
|
||||
//nlinfo("CAHAcceptEula called");
|
||||
if(CFile::fileExists(getLogDirectory() + "show_eula"))
|
||||
CFile::deleteFile(getLogDirectory() + "show_eula");
|
||||
LoginSM.pushEvent(CLoginStateMachine::ev_accept_eula);
|
||||
|
||||
// if (ClientCfg.R2Mode)
|
||||
|
|
@ -1890,7 +1891,7 @@ class CAHInitResLod : public IActionHandler
|
|||
{
|
||||
virtual void execute (CCtrlBase * /* pCaller */, const string &/* sParams */)
|
||||
{
|
||||
nlinfo("CAHInitResLod called");
|
||||
//nlinfo("CAHInitResLod called");
|
||||
if (Driver == NULL) return;
|
||||
|
||||
// **** Init Video Modes
|
||||
|
|
@ -2110,7 +2111,7 @@ class CAHUninitResLod : public IActionHandler
|
|||
{
|
||||
virtual void execute (CCtrlBase * /* pCaller */, const string &/* sParams */)
|
||||
{
|
||||
nlinfo("CAHUninitResLod called");
|
||||
//nlinfo("CAHUninitResLod called");
|
||||
|
||||
// If the mode requested is a windowed mode do nothnig
|
||||
if (CurrentMode != 0)
|
||||
|
|
|
|||
|
|
@ -1117,11 +1117,11 @@ bool CStringManagerClient::checkWordFileDates(vector<CFileCheck> &fileChecks, co
|
|||
{
|
||||
// get the correct path name of the ref file
|
||||
std::string referenceFile= lookupReferenceFile(fileNames[i]);
|
||||
fileChecks[i].ReferenceDate= CFile::getFileModificationDate(referenceFile);
|
||||
fileChecks[i].ReferenceDate= CPath::exists(referenceFile)?CFile::getFileModificationDate(referenceFile):0;
|
||||
|
||||
// get then one of the working File (NB: 0 is a valid reponse for Final Client: no working file)
|
||||
string workingFile("./translation/work/"+CFile::getFilename(fileNames[i]));
|
||||
fileChecks[i].AdditionDate= CFile::getFileModificationDate(workingFile);
|
||||
fileChecks[i].AdditionDate= CPath::exists(workingFile)?CFile::getFileModificationDate(workingFile):0;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue