Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Disabled some useless temporary files

Browse source
This commit is contained in:
kervala 2012-12-01 12:00:46 +01:00
parent af1e1e8911
commit 77e4d9a887
5 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
code/ryzom/client/src/client.cpp
View file

@ -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")

1
code/ryzom/client/src/connection.cpp
View file

@ -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)

3
code/ryzom/client/src/entity_animation_manager.cpp
View file

@ -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();

13
code/ryzom/client/src/far_tp.cpp
View file

@ -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 )
{

16
code/ryzom/client/src/sheet_manager.cpp
View file

@ -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();