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

- Fixed an issue with the instance variable storage system never being initialised (since unknown revision)

Browse Source 
- Combined both string and integer instance variables into a single DBMap* structure
- Fixed a missing new-line at the end of src/common/conf.h causing warnings

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15998 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
epoque11
2012-04-28 22:15:18 +00:00
parent 02e4daf67d
commit ab8f7490a0
4 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/map/instance.c
View File

@@ -82,8 +82,7 @@ int instance_create(int party_id, const char *name)
instance[i].progress_timeout = 0;
instance[i].users = 0;
instance[i].party_id = party_id;
instance[i].ivar = NULL;
instance[i].svar = NULL;
instance[i].vars = idb_alloc(DB_OPT_RELEASE_DATA);
safestrncpy( instance[i].name, name, sizeof(instance[i].name) );
memset( instance[i].map, 0x00, sizeof(instance[i].map) );
@@ -298,14 +297,6 @@ void instance_del_map(int m)
memset(&map[m], 0x00, sizeof(map[0]));
}
/*--------------------------------------
* Used for instance variables. Clean each variable from memory.
*--------------------------------------*/
void instance_destroy_freesvar(void *key, void *data, va_list args)
{
if( data ) aFree(data);
}
/*--------------------------------------
* Timer to destroy instance by process or idle
*--------------------------------------*/
@@ -342,19 +333,15 @@ void instance_destroy(int instance_id)
instance_del_map( instance[instance_id].map[0] );
}
if( instance[instance_id].ivar )
db_destroy(instance[instance_id].ivar);
if( instance[instance_id].svar )
db_destroy(instance[instance_id].svar);
if( instance[instance_id].vars )
db_destroy(instance[instance_id].vars);
if( instance[instance_id].progress_timer != INVALID_TIMER )
delete_timer( instance[instance_id].progress_timer, instance_destroy_timer);
if( instance[instance_id].idle_timer != INVALID_TIMER )
delete_timer( instance[instance_id].idle_timer, instance_destroy_timer);
instance[instance_id].ivar = NULL;
instance[instance_id].svar = NULL;
instance[instance_id].vars = NULL;
if( instance[instance_id].party_id && (p = party_search(instance[instance_id].party_id)) != NULL )
p->instance_id = 0; // Update Party information