Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaned up mapreg dirty-marking code to only mark the mapreg as dirty when it actually is. (bugreport:3735)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14158 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Paradox924X
2009-11-21 04:07:53 +00:00
parent 995268398a
commit 31c237c225
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2009/11/20
* Cleaned up mapreg dirty-marking code to only mark the mapreg as dirty when it actually is. (bugreport:3735) [Paradox924X]
2009/11/19
* Applied the renewal client support patch from Diablo (eA forum topic 222623).
By default eA still supports sakexe/ragexe clients. In order to support the

15
src/map/mapreg_sql.c
View File

@@ -43,11 +43,8 @@ bool mapreg_setreg(int uid, int val)
if( val != 0 )
{
if( idb_put(mapreg_db,uid,(void*)val) )
; // already exists, delay write
else
if( name[1] == '@' )
; // nothing more to do
else
mapreg_dirty = true; // already exists, delay write
else if(name[1] != '@') {
{// write new wariable to database
char tmp_str[32*2+1];
Sql_EscapeStringLen(mmysql_handle, tmp_str, name, strnlen(name, 32));
@@ -59,16 +56,13 @@ bool mapreg_setreg(int uid, int val)
{
idb_remove(mapreg_db,uid);
if( name[1] == '@' )
; // nothing more to do
else
if( name[1] != '@' )
{// Remove from database because it is unused.
if( SQL_ERROR == Sql_Query(mmysql_handle, "DELETE FROM `%s` WHERE `varname`='%s' AND `index`='%d'", mapreg_table, name, i) )
Sql_ShowDebug(mmysql_handle);
}
}
mapreg_dirty = true;
return true;
}
@@ -90,7 +84,7 @@ bool mapreg_setregstr(int uid, const char* str)
else
{
if (idb_put(mapregstr_db,uid, aStrdup(str)))
;
mapreg_dirty = true;
else if(name[1] != '@') { //put returned null, so we must insert.
// Someone is causing a database size infinite increase here without name[1] != '@' [Lance]
char tmp_str[32*2+1];
@@ -102,7 +96,6 @@ bool mapreg_setregstr(int uid, const char* str)
}
}
mapreg_dirty = true;
return true;
}