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