Changed: Disabled some useless temporary files
This commit is contained in:
parent
2c5d5a3bcd
commit
518a30ee6c
5 changed files with 28 additions and 19 deletions
|
@ -104,8 +104,8 @@ static CTcpSock CrashCounterSock;
|
||||||
|
|
||||||
void quitCrashReport ()
|
void quitCrashReport ()
|
||||||
{
|
{
|
||||||
if (NLMISC::CFile::fileExists(getLogDirectory() + "ryzom_started"))
|
//if (NLMISC::CFile::fileExists(getLogDirectory() + "ryzom_started"))
|
||||||
CFile::deleteFile (getLogDirectory() + "ryzom_started");
|
//CFile::deleteFile (getLogDirectory() + "ryzom_started");
|
||||||
// must disconnect now, else could crash at dtor time because nldebug -> access a new INelContext()
|
// must disconnect now, else could crash at dtor time because nldebug -> access a new INelContext()
|
||||||
contReset(CrashCounterSock);
|
contReset(CrashCounterSock);
|
||||||
}
|
}
|
||||||
|
@ -148,7 +148,7 @@ INT_PTR CALLBACK MyDialogProc(
|
||||||
|
|
||||||
HWND SlashScreen = NULL;
|
HWND SlashScreen = NULL;
|
||||||
HINSTANCE HInstance;
|
HINSTANCE HInstance;
|
||||||
|
/*
|
||||||
static bool connect()
|
static bool connect()
|
||||||
{
|
{
|
||||||
string server = "crashcounter.nevrax.com";
|
string server = "crashcounter.nevrax.com";
|
||||||
|
@ -354,7 +354,7 @@ void initCrashReport ()
|
||||||
#ifdef TEST_CRASH_COUNTER
|
#ifdef TEST_CRASH_COUNTER
|
||||||
MessageBox (NULL, res.c_str(), res.c_str(), MB_OK);
|
MessageBox (NULL, res.c_str(), res.c_str(), MB_OK);
|
||||||
#endif // TEST_CRASH_COUNTER
|
#endif // TEST_CRASH_COUNTER
|
||||||
}
|
}*/
|
||||||
|
|
||||||
int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, LPSTR cmdline, int /* nCmdShow */)
|
int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, LPSTR cmdline, int /* nCmdShow */)
|
||||||
#else
|
#else
|
||||||
|
@ -430,12 +430,12 @@ int main(int argc, char **argv)
|
||||||
// exit (0);
|
// exit (0);
|
||||||
//}
|
//}
|
||||||
|
|
||||||
initCrashReport ();
|
//initCrashReport ();
|
||||||
#endif // FINAL_VERSION
|
#endif // FINAL_VERSION
|
||||||
|
|
||||||
// Set default email value for reporting error
|
// Set default email value for reporting error
|
||||||
#ifdef TEST_CRASH_COUNTER
|
#ifdef TEST_CRASH_COUNTER
|
||||||
initCrashReport ();
|
//initCrashReport ();
|
||||||
setReportEmailFunction ((void*)sendEmail);
|
setReportEmailFunction ((void*)sendEmail);
|
||||||
setDefaultEmailParams ("smtp.nevrax.com", "", "hulud@nevrax.com");
|
setDefaultEmailParams ("smtp.nevrax.com", "", "hulud@nevrax.com");
|
||||||
|
|
||||||
|
@ -637,7 +637,7 @@ int main(int argc, char **argv)
|
||||||
//ICommand::execute("iFileAccessLogClear",*NLMISC::InfoLog);
|
//ICommand::execute("iFileAccessLogClear",*NLMISC::InfoLog);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
CFile::createEmptyFile(getLogDirectory() + "during_release");
|
//CFile::createEmptyFile(getLogDirectory() + "during_release");
|
||||||
|
|
||||||
#ifdef TEST_CRASH_COUNTER
|
#ifdef TEST_CRASH_COUNTER
|
||||||
if (string(cmdline) == "/release")
|
if (string(cmdline) == "/release")
|
||||||
|
|
|
@ -400,7 +400,6 @@ bool connection (const string &cookie, const string &fsaddr)
|
||||||
nlinfo ("PROFILE: %d seconds for connection", (uint32)(ryzomGetLocalTime ()-connStart)/1000);
|
nlinfo ("PROFILE: %d seconds for connection", (uint32)(ryzomGetLocalTime ()-connStart)/1000);
|
||||||
|
|
||||||
// Init web box
|
// Init web box
|
||||||
nlinfo("ok");
|
|
||||||
|
|
||||||
// TMP TMP
|
// TMP TMP
|
||||||
if (ClientCfg.Local)
|
if (ClientCfg.Local)
|
||||||
|
|
|
@ -179,7 +179,8 @@ void CEntityAnimationManager::load(NLMISC::IProgressCallback &/* progress */, bo
|
||||||
release();
|
release();
|
||||||
|
|
||||||
// Log in the animation file.
|
// Log in the animation file.
|
||||||
setDebugOutput(getLogDirectory() + "animation.dbg");
|
//setDebugOutput(getLogDirectory() + "animation.dbg");
|
||||||
|
setDebugOutput(""); // no log
|
||||||
|
|
||||||
// Create the animation set for all entities.
|
// Create the animation set for all entities.
|
||||||
_AnimationSet = Driver->createAnimationSet();
|
_AnimationSet = Driver->createAnimationSet();
|
||||||
|
|
|
@ -160,6 +160,7 @@ const std::string& CLoginStateMachine::toString(CLoginStateMachine::TEvent event
|
||||||
#define SM_END_EVENT_TABLE \
|
#define SM_END_EVENT_TABLE \
|
||||||
} \
|
} \
|
||||||
|
|
||||||
|
/*
|
||||||
#define SM_EVENT(eventId, stateId) \
|
#define SM_EVENT(eventId, stateId) \
|
||||||
if (ev == eventId) \
|
if (ev == eventId) \
|
||||||
{ \
|
{ \
|
||||||
|
@ -178,6 +179,14 @@ const std::string& CLoginStateMachine::toString(CLoginStateMachine::TEvent event
|
||||||
_CurrentState = stateId; \
|
_CurrentState = stateId; \
|
||||||
break; \
|
break; \
|
||||||
} \
|
} \
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define SM_EVENT(eventId, stateId) \
|
||||||
|
if (ev == eventId) \
|
||||||
|
{ \
|
||||||
|
_CurrentState = stateId; \
|
||||||
|
break; \
|
||||||
|
} \
|
||||||
|
|
||||||
extern std::string LoginLogin, LoginPassword;
|
extern std::string LoginLogin, LoginPassword;
|
||||||
extern bool noUserChar;
|
extern bool noUserChar;
|
||||||
|
@ -898,7 +907,7 @@ retryJoinEdit:
|
||||||
|
|
||||||
// Save this error (regular log file is deleted at every startup)
|
// Save this error (regular log file is deleted at every startup)
|
||||||
// res = res + "\n\n";
|
// res = res + "\n\n";
|
||||||
try
|
/* try
|
||||||
{
|
{
|
||||||
COFile outputF;
|
COFile outputF;
|
||||||
if ( outputF.open( getLogDirectory() + "error_join.log", true, true ) )
|
if ( outputF.open( getLogDirectory() + "error_join.log", true, true ) )
|
||||||
|
@ -913,7 +922,7 @@ retryJoinEdit:
|
||||||
}
|
}
|
||||||
catch (const Exception &)
|
catch (const Exception &)
|
||||||
{}
|
{}
|
||||||
|
*/
|
||||||
// If the session is not a permanent session and has vanished, pop the position
|
// If the session is not a permanent session and has vanished, pop the position
|
||||||
if ( requestRetToMainland )
|
if ( requestRetToMainland )
|
||||||
{
|
{
|
||||||
|
|
|
@ -55,8 +55,8 @@ using namespace NLGEORGES;
|
||||||
// Sheet manager.
|
// Sheet manager.
|
||||||
CSheetManager SheetMngr;
|
CSheetManager SheetMngr;
|
||||||
UFormLoader *CSheetManager::FormLoader = NULL;
|
UFormLoader *CSheetManager::FormLoader = NULL;
|
||||||
COFile fItemAssoc;
|
//COFile fItemAssoc;
|
||||||
bool ItemAssocFileOpen = false;
|
//bool ItemAssocFileOpen = false;
|
||||||
|
|
||||||
// there can be several instance of CSheetManager (for reload operations) -> ctruct the loader here rather than in CSheetManager ctor
|
// there can be several instance of CSheetManager (for reload operations) -> ctruct the loader here rather than in CSheetManager ctor
|
||||||
class CFormLoaderInit
|
class CFormLoaderInit
|
||||||
|
@ -598,17 +598,17 @@ void CSheetManager::release()
|
||||||
void CSheetManager::load(NLMISC::IProgressCallback &callBack, bool updatePackedSheet, bool needComputeVS, bool dumpVSIndex)
|
void CSheetManager::load(NLMISC::IProgressCallback &callBack, bool updatePackedSheet, bool needComputeVS, bool dumpVSIndex)
|
||||||
{
|
{
|
||||||
// Open The Item Association File
|
// Open The Item Association File
|
||||||
if(!fItemAssoc.open(getLogDirectory() + "item_association.dbg", false, true))
|
// if(!fItemAssoc.open(getLogDirectory() + "item_association.dbg", false, true))
|
||||||
nlwarning("CSheetManager::load: Cannot Open the 'item_association.txt'.");
|
// nlwarning("CSheetManager::load: Cannot Open the 'item_association.txt'.");
|
||||||
else
|
// else
|
||||||
ItemAssocFileOpen = true;
|
// ItemAssocFileOpen = true;
|
||||||
|
|
||||||
// Initialize the Sheet DB.
|
// Initialize the Sheet DB.
|
||||||
loadAllSheet(callBack, updatePackedSheet, needComputeVS, dumpVSIndex);
|
loadAllSheet(callBack, updatePackedSheet, needComputeVS, dumpVSIndex);
|
||||||
|
|
||||||
// Close the Item Association File.
|
// Close the Item Association File.
|
||||||
fItemAssoc.close();
|
// fItemAssoc.close();
|
||||||
ItemAssocFileOpen = false;
|
// ItemAssocFileOpen = false;
|
||||||
|
|
||||||
// Optimize memory taken by all strings of all sheets
|
// Optimize memory taken by all strings of all sheets
|
||||||
ClientSheetsStrings.memoryCompress();
|
ClientSheetsStrings.memoryCompress();
|
||||||
|
|
Loading…
Reference in a new issue