diff --git a/src/m_aatree.c b/src/m_aatree.c index ece4f0acb..b14361421 100644 --- a/src/m_aatree.c +++ b/src/m_aatree.c @@ -20,7 +20,6 @@ typedef struct aatree_node_s { - INT32 level; INT32 key; void* value; @@ -56,40 +55,51 @@ void M_AATreeFree(aatree_t *aatree) Z_Free(aatree); } -static aatree_node_t *M_AATreeSkew(aatree_node_t *node) +static aatree_node_t *M_AATreeRotateRight(aatree_node_t *node) { - if (node && node->left && node->left->level == node->level) - { - // Not allowed: horizontal left-link. Reverse the - // horizontal link and hook the orphan back in. - aatree_node_t *oldleft = node->left; - node->left = oldleft->right; - oldleft->right = node; - - return oldleft; - } - - // No change needed. - return node; + aatree_node_t *newnode = node->left; + newnode->right = node; + node->left = NULL; + return newnode; } -static aatree_node_t *M_AATreeSplit(aatree_node_t *node) +static aatree_node_t *M_AATreeRotateLeft(aatree_node_t *node) { - if (node && node->right && node->right->right && node->level == node->right->right->level) + aatree_node_t *newnode = node->right; + newnode->left = node; + node->right = NULL; + return newnode; +} + +static aatree_node_t *M_AATreeRebalance(aatree_node_t *node) +{ + if (node->right && !node->left) { - // Not allowed: two consecutive horizontal right-links. - // The middle one becomes the new root at this point, - // with suitable adjustments below. + if (node->right->left && !node->right->right) + { + node->right = M_AATreeRotateRight(node->right); + return M_AATreeRotateLeft(node); + } - aatree_node_t *oldright = node->right; - node->right = oldright->left; - oldright->left = node; - oldright->level++; + if (node->right->right && !node->right->left) + { + return M_AATreeRotateLeft(node); + } + } + else if (node->left && !node->right) + { + if (node->left->right && !node->left->left) + { + node->left = M_AATreeRotateLeft(node->left); + return M_AATreeRotateRight(node); + } - return oldright; + if (node->left->left && !node->left->right) + { + return M_AATreeRotateRight(node); + } } - // No change needed. return node; } @@ -98,9 +108,7 @@ static aatree_node_t *M_AATreeSet_Node(aatree_node_t *node, UINT32 flags, INT32 if (!node) { // Nothing here, so just add where we are - node = Z_Malloc(sizeof (aatree_node_t), PU_STATIC, NULL); - node->level = 1; node->key = key; if (value && (flags & AATREE_ZUSER)) Z_SetUser(value, &node->value); else node->value = value; @@ -118,8 +126,7 @@ static aatree_node_t *M_AATreeSet_Node(aatree_node_t *node, UINT32 flags, INT32 else node->value = value; } - node = M_AATreeSkew(node); - node = M_AATreeSplit(node); + node = M_AATreeRebalance(node); } return node; @@ -152,7 +159,6 @@ void *M_AATreeGet(aatree_t *aatree, INT32 key) return M_AATreeGet_Node(aatree->root, key); } - static void M_AATreeIterate_Node(aatree_node_t *node, aatree_iter_t callback) { if (node->left) M_AATreeIterate_Node(node->left, callback); diff --git a/src/w_wad.c b/src/w_wad.c index 571b79c17..53944bf21 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -124,6 +124,9 @@ void W_Shutdown(void) Z_Free(wad->lumpinfo[wad->numlumps].longname); Z_Free(wad->lumpinfo[wad->numlumps].fullname); } + M_AATreeFree(wad->startfolders); + M_AATreeFree(wad->endfolders); + Z_Free(wad->lumpinfo); Z_Free(wad); } @@ -816,6 +819,8 @@ UINT16 W_InitFile(const char *filename, boolean local) fseek(handle, 0, SEEK_END); wadfile->filesize = (unsigned)ftell(handle); wadfile->type = type; + wadfile->startfolders = M_AATreeAlloc(0); + wadfile->endfolders = M_AATreeAlloc(0); // already generated, just copy it over M_Memcpy(&wadfile->md5sum, &md5sum, 16); @@ -895,7 +900,7 @@ INT32 W_InitMultipleFiles(char **filenames, boolean addons) int n = 0; int i; - + INT32 rc = 1; INT32 overallrc = 1; @@ -1081,6 +1086,12 @@ UINT16 W_CheckNumForFolderStartPK3(const char *name, UINT16 wad, UINT16 startlum INT32 i; lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump; name_length = strlen(name); + UINT32 hash = quickncasehash(name, name_length); + + void *val = M_AATreeGet(wadfiles[wad]->startfolders, hash); + if (val != NULL) + return (uintptr_t)val; + for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++) { if (strnicmp(name, lump_p->fullname, name_length) == 0) @@ -1088,10 +1099,12 @@ UINT16 W_CheckNumForFolderStartPK3(const char *name, UINT16 wad, UINT16 startlum /* SLADE is special and puts a single directory entry. Skip that. */ if (strlen(lump_p->fullname) == name_length) i++; - break; + M_AATreeSet(wadfiles[wad]->startfolders, hash, (void *)(uintptr_t)i); + return i; } } - return i; + M_AATreeSet(wadfiles[wad]->startfolders, hash, (void *)INT16_MAX); + return INT16_MAX; } // In a PK3 type of resource file, it looks for the next lumpinfo entry that doesn't share the specified pathfile. @@ -1102,11 +1115,18 @@ UINT16 W_CheckNumForFolderEndPK3(const char *name, UINT16 wad, UINT16 startlump) INT32 i; lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump; size_t name_length = strlen(name); + UINT32 hash = quickncasehash(name, name_length); + + void *val = M_AATreeGet(wadfiles[wad]->endfolders, hash); + if (val != NULL) + return (uintptr_t)val; + for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++) { if (strnicmp(name, lump_p->fullname, name_length)) break; } + M_AATreeSet(wadfiles[wad]->endfolders, hash, (void *)(uintptr_t)i); return i; } @@ -1356,15 +1376,15 @@ UINT8 W_LumpExists(const char *name) return false; } -UINT8 W_CheckMultipleLumps(const char* lump, ...) +UINT8 W_CheckMultipleLumps(const char* lump, ...) { va_list lumps; va_start(lumps, lump); const char* lumpname = lump; - while (lumpname != NULL) + while (lumpname != NULL) { - if (!W_LumpExists(lumpname)) + if (!W_LumpExists(lumpname)) { va_end(lumps); return false; diff --git a/src/w_wad.h b/src/w_wad.h index c3292eaad..d8f03253c 100644 --- a/src/w_wad.h +++ b/src/w_wad.h @@ -18,6 +18,8 @@ #include "hardware/hw_data.h" #endif +#include "m_aatree.h" + #ifdef __GNUG__ #pragma interface #endif @@ -132,6 +134,8 @@ typedef struct wadfile_s #ifdef ROTSPRITE aatree_t *rotcache; // Cache rotsprites for rotating patches. #endif + aatree_t *startfolders; + aatree_t *endfolders; UINT16 numlumps; // this wad's number of resources FILE *handle; UINT32 filesize; // for network