Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure hash table is re-initialized properly after closed 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2052 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2007-07-10 21:23:43 +00:00
parent 2de32d08ba
commit 2063d578c3
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/gamelib/animobj.c
View File

@ -55,8 +55,8 @@
/***************************************************************************/
/* global variables */
static HASHTABLE *g_pAnimObjTable;
static ANIMOBJDIEDTESTFUNC g_pDiedFunc;
static HASHTABLE *g_pAnimObjTable = NULL;
static ANIMOBJDIEDTESTFUNC g_pDiedFunc = NULL;
/***************************************************************************/
/* local functions */
@ -81,8 +81,7 @@ animObj_Init( ANIMOBJDIEDTESTFUNC pDiedFunc )
/* set local hash table functions */
hashTable_SetHashFunction( g_pAnimObjTable, animObj_HashFunction );
hashTable_SetFreeElementFunction( g_pAnimObjTable,
animObj_HashFreeElementFunc );
hashTable_SetFreeElementFunction(g_pAnimObjTable, animObj_HashFreeElementFunc);
/* set global died test function */
g_pDiedFunc = pDiedFunc;
@ -97,6 +96,8 @@ animObj_Shutdown( void )
{
/* destroy hash table */
hashTable_Destroy( g_pAnimObjTable );
g_pAnimObjTable = NULL;
g_pDiedFunc = NULL;
return TRUE;
}
@ -208,15 +209,12 @@ animObj_Add( void *pParentObj, int iAnimID,
ASSERT( psAnim != NULL,
"anim_AddAnimObject: anim id %i not found\n", iAnimID );
/* get object from table */
psObj = (ANIM_OBJECT*)hashTable_GetElement( g_pAnimObjTable );
if (psObj==NULL)
{
debug( LOG_ERROR, "animObj_Add: No room in hash table\n" );
abort();
debug(LOG_ERROR, "animObj_Add: No room in hash table");
return(NULL);
}
@ -254,8 +252,7 @@ animObj_Add( void *pParentObj, int iAnimID,
}
/* insert object in table by parent */
hashTable_InsertElement( g_pAnimObjTable, psObj,
(int) pParentObj, iAnimID );
hashTable_InsertElement(g_pAnimObjTable, psObj, (int) pParentObj, iAnimID);
return psObj;
}