refactor: minor combo alias optimizations/cleanup

Author: EmilyV99

src/base/cpool.cpp

@@ -15,35 +15,11 @@ int comboa_lmasktotal(byte layermask)
 			++result;
     return result;
 }
-combo_alias::combo_alias()
-{
-	memset(this, 0, sizeof(combo_alias));
-	combos = new word[1];
-	csets = new byte[1];
-	combos[0] = 0;
-	csets[0] = 0;
-}
 bool combo_alias::valid() const
 {
 	if(combo)
 		return combobuf[combo].tile;
-	return width || height || (combos && combos[0]);
-}
-combo_alias& combo_alias::operator=(combo_alias const& other)
-{
-	width = other.width;
-	height = other.height;
-	layermask = other.layermask;
-	combo = other.combo;
-	cset = other.cset;
-	int count = (comboa_lmasktotal(layermask)+1)*(width+1)*(height+1);
-	if(combos) delete[] combos;
-	if(csets) delete[] csets;
-	combos = new word[count];
-	csets = new byte[count];
-	memcpy(combos, other.combos, sizeof(word)*count);
-	memcpy(csets, other.csets, sizeof(byte)*count);
-	return *this;
+	return width || height || (combos.size() && combos[0]);
 }
 void combo_alias::clear()
 {

src/base/cpool.h

@@ -1,25 +1,26 @@
 #ifndef _CPOOL_H_
 #define _CPOOL_H_
 
-#include <vector>
+#include "base/headers.h"
+#include "base/containers.h"
 #include "base/ints.h"
 #include "base/general.h"
 
 struct combo_alias
 {
-	combo_alias();
+	combo_alias() = default;
 
 	byte width;      // Max 15
 	byte height;     // Max 10
 	byte layermask;  // Specifies layers to be drawn
 	word combo;      // Optional thumbnail combo for the alias list
 	word cset;
-	word *combos;    // Dynamic array. Will be stored in quest.
-	byte *csets;
+	bounded_vec<word,word> combos = {16*11*7, 0};
+	bounded_vec<word,byte> csets = {16*11*7, 0};
 
 	bool valid() const;
 	void clear();
-	combo_alias& operator=(combo_alias const& other);
+	combo_alias& operator=(combo_alias const& other) = default;
 };
 
 struct cpool_entry

src/qst.cpp

@@ -143,25 +143,6 @@ enum { ssiBOMB, ssiSWORD, ssiSHIELD, ssiCANDLE, ssiLETTER, ssiPOTION, ssiLETTERP
 static byte deprecated_rules[QUESTRULES_NEW_SIZE];
 
 
-void delete_combo_aliases()
-{
-    for(int32_t j(0); j<256; j++)
-    {
-        if(combo_aliases[j].combos != NULL)
-        {
-            delete[] combo_aliases[j].combos;
-            combo_aliases[j].combos=NULL;
-        }
-        
-        if(combo_aliases[j].csets != NULL)
-        {
-            delete[] combo_aliases[j].csets;
-            combo_aliases[j].csets=NULL;
-        }
-    }
-    
-}
-
 char *byte_conversion(int32_t number, int32_t format)
 {
     static char num_str[40];
@@ -17849,21 +17830,8 @@ int32_t readcombos_old(word section_version, PACKFILE *f, zquestheader *, word v
 			combo_aliases[j].width = 0;
 			combo_aliases[j].height = 0;
 			combo_aliases[j].layermask = 0;
-			
-			if(combo_aliases[j].combos != NULL)
-			{
-				delete[] combo_aliases[j].combos;
-			}
-			
-			if(combo_aliases[j].csets != NULL)
-			{
-				delete[] combo_aliases[j].csets;
-			}
-			
-			combo_aliases[j].combos = new word[1];
-			combo_aliases[j].csets = new byte[1];
-			combo_aliases[j].combos[0] = 0;
-			combo_aliases[j].csets[0] = 0;
+			combo_aliases[j].combos.clear();
+			combo_aliases[j].csets.clear();
 		}
 	}
 
@@ -18288,21 +18256,11 @@ int32_t readcomboaliases(PACKFILE *f, zquestheader *Header, word version, word b
 
         count=(width+1)*(height+1)*(comboa_lmasktotal(mask)+1);
 
-		if(combo_aliases[j].combos != NULL)
-		{
-			delete[] combo_aliases[j].combos;
-		}
-		
-		if(combo_aliases[j].csets != NULL)
-		{
-			delete[] combo_aliases[j].csets;
-		}
-		
 		combo_aliases[j].width = width;
 		combo_aliases[j].height = height;
 		combo_aliases[j].layermask = mask;
-		combo_aliases[j].combos = new word[count];
-		combo_aliases[j].csets = new byte[count];
+		combo_aliases[j].combos.clear();
+		combo_aliases[j].csets.clear();
 
         for(int32_t k=0; k<count; k++)
         {

src/qst.h

@@ -264,7 +264,6 @@ void init_msgstr(MsgStr *str);
 int32_t get_version_and_build(PACKFILE *f, word *version, word *build);
 bool find_section(PACKFILE *f, int32_t section_id_requested);
 
-extern void delete_combo_aliases();
 void reset_subscreen(subscreen_group *tempss);
 void reset_subscreens();
 int32_t setupsubscreens();

src/zc/zelda.cpp

@@ -5629,7 +5629,6 @@ void remove_installed_timers()
 
 void delete_everything_else() //blarg.
 {
-    delete_combo_aliases();
     refresh_subscr_buttonitems();
 	kill_subscr_items();
 }

src/zq/zq_tiles.cpp

@@ -19404,11 +19404,9 @@ int32_t readcomboaliasfile(PACKFILE *f)
 				return 0;
 			}
 			//These values are flexible, and may differ in size, so we delete them 
-		//and recreate them at the correct size on the pointer. 
-		delete[] temp_alias.combos;
-		temp_alias.combos = new word[count2];
-		delete[] temp_alias.csets;
-		temp_alias.csets = new byte[count2];
+			//and recreate them at the correct size on the pointer.
+			temp_alias.combos.clear();
+			temp_alias.csets.clear();
 			for(int32_t k=0; k<count2; k++)
 			{
 				if(!p_igetw(&tempword,f))
@@ -19486,7 +19484,6 @@ int32_t readcomboaliasfile_to_location(PACKFILE *f, int32_t start)
 		al_trace("Cannot read .zalias packfile made in ZC version (%x) in this version of ZC (%x)\n", zversion, ZELDA_VERSION);
 		return 0;
 	}
-	
 	else if ( ( section_version > V_COMBOALIASES ) || ( section_version == V_COMBOALIASES && section_cversion > CV_COMBOALIASES ) )
 	{
 		al_trace("Cannot read .zalias packfile made using V_COMBOALIASES (%d) subversion (%d)\n", section_version, section_cversion);
@@ -19527,80 +19524,71 @@ int32_t readcomboaliasfile_to_location(PACKFILE *f, int32_t start)
 	{
 		memset(&temp_alias, 0, sizeof(temp_alias));
 		if(!p_igetw(&temp_alias.combo,f))
-			{
-				return 0;
-			}
+		{
+			return 0;
+		}
 
-			if(!p_getc(&temp_alias.cset,f))
-			{
-				return 0;
-			}
+		if(!p_getc(&temp_alias.cset,f))
+		{
+			return 0;
+		}
 
-			int32_t count2 = 0;
+		int32_t count2 = 0;
 
 		if(!p_igetl(&count2,f))
-			{
-				return 0;
-			}
+		{
+			return 0;
+		}
 
-			if(!p_getc(&temp_alias.width,f))
+		if(!p_getc(&temp_alias.width,f))
+		{
+			return 0;
+		}
+			
+		if(!p_getc(&temp_alias.height,f))
+		{
+			return 0;
+		}
+			
+		if(!p_getc(&temp_alias.layermask,f))
+		{
+			return 0;
+		}
+		//These values are flexible, and may differ in size, so we delete them 
+		//and recreate them at the correct size on the pointer.
+		temp_alias.combos.clear();
+		temp_alias.csets.clear();
+		
+		for(int32_t k=0; k<count2; k++)
+		{
+			if(!p_igetw(&tempword,f))
 			{
 				return 0;
 			}
-			
-			if(!p_getc(&temp_alias.height,f))
+			else
 			{
-				return 0;
+				temp_alias.combos[k] = tempword;
 			}
+		}
 
-			if(!p_getc(&temp_alias.layermask,f))
+		for(int32_t k=0; k<count2; k++)
+		{
+			if(!p_getc(&tempcset,f))
 			{
 				return 0;
 			}
-		//These values are flexible, and may differ in size, so we delete them 
-		//and recreate them at the correct size on the pointer. 
-			delete[] temp_alias.combos;
-		temp_alias.combos = new word[count2];
-		delete[] temp_alias.csets;
-		temp_alias.csets = new byte[count2];
-		
-			for(int32_t k=0; k<count2; k++)
+			else
 			{
-				if(!p_igetw(&tempword,f))
-				{
-					return 0;
-				}
-		else
-		{
-			temp_alias.combos[k] = tempword;
-		}
+				temp_alias.csets[k] = tempcset;
 			}
-			
-			for(int32_t k=0; k<count2; k++)
-			{
-				if(!p_getc(&tempcset,f))
-				{
-					return 0;
-				}
-		else
-		{
-			temp_alias.csets[k] = tempcset;
 		}
-			}
-		
 
 		if ( start+(tilect) < MAXCOMBOALIASES )
 		{
 			memcpy(&combo_aliases[start+(tilect)],&temp_alias,sizeof(temp_alias));
 		}
 	}
-	
-	
-	//::memcpy(&(newtilebuf[tile_index]),&temptile,sizeof(tiledata));
-	
-			
 	return 1;
-	
 }
 int32_t writecomboaliasfile(PACKFILE *f, int32_t index, int32_t count)
 {