Minor cleanup. DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@5586 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2016-01-27 07:16:45 +00:00
parent 9bdac4d868
commit f8e1d814ce

View file

@ -1263,6 +1263,8 @@ static hashtable_t * const tables_free [] ={
&h_projectile, &h_player, &h_input, &h_actor, &h_tsprite, &h_tiledata, &h_paldata &h_projectile, &h_player, &h_input, &h_actor, &h_tsprite, &h_tiledata, &h_paldata
}; };
#define STRUCT_HASH_SETUP(table, labels) do { for (i=0; labels[i].lId >= 0; i++) hash_add(&table, labels[i].name, i, 0); } while (0)
void C_InitHashes() void C_InitHashes()
{ {
uint32_t i; uint32_t i;
@ -1273,20 +1275,23 @@ void C_InitHashes()
inithashnames(); inithashnames();
initsoundhashnames(); initsoundhashnames();
for (i=0; i<NUMKEYWORDS; i++) hash_add(&h_keywords,keyw[i],i,0); for (i=0; i<NUMKEYWORDS; i++) hash_add(&h_keywords, keyw[i], i, 0);
for (i=0; i<NUMALTKEYWORDS; i++) hash_add(&h_keywords, altkeyw[i].token, altkeyw[i].val, 0); for (i=0; i<NUMALTKEYWORDS; i++) hash_add(&h_keywords, altkeyw[i].token, altkeyw[i].val, 0);
for (i=0; SectorLabels[i].lId >= 0; i++) hash_add(&h_sector,SectorLabels[i].name,i,0);
for (i=0; WallLabels[i].lId >= 0; i++) hash_add(&h_wall,WallLabels[i].name,i,0); STRUCT_HASH_SETUP(h_sector, SectorLabels);
for (i=0; UserdefsLabels[i].lId >= 0; i++) hash_add(&h_userdef,UserdefsLabels[i].name,i,0); STRUCT_HASH_SETUP(h_wall, WallLabels);
for (i=0; ProjectileLabels[i].lId >= 0; i++) hash_add(&h_projectile,ProjectileLabels[i].name,i,0); STRUCT_HASH_SETUP(h_userdef, UserdefsLabels);
for (i=0; PlayerLabels[i].lId >= 0; i++) hash_add(&h_player,PlayerLabels[i].name,i,0); STRUCT_HASH_SETUP(h_projectile, ProjectileLabels);
for (i=0; InputLabels[i].lId >= 0; i++) hash_add(&h_input,InputLabels[i].name,i,0); STRUCT_HASH_SETUP(h_player, PlayerLabels);
for (i=0; ActorLabels[i].lId >= 0; i++) hash_add(&h_actor,ActorLabels[i].name,i,0); STRUCT_HASH_SETUP(h_input, InputLabels);
for (i=0; TsprLabels[i].lId >= 0; i++) hash_add(&h_tsprite,TsprLabels[i].name,i,0); STRUCT_HASH_SETUP(h_actor, ActorLabels);
for (i=0; TileDataLabels[i].lId >= 0; i++) hash_add(&h_tiledata,TileDataLabels[i].name,i,0); STRUCT_HASH_SETUP(h_tsprite, TsprLabels);
for (i=0; PalDataLabels[i].lId >= 0; i++) hash_add(&h_paldata,PalDataLabels[i].name,i,0); STRUCT_HASH_SETUP(h_tiledata, TileDataLabels);
STRUCT_HASH_SETUP(h_paldata, PalDataLabels);
} }
#undef STRUCT_HASH_SETUP
// "magic" number for { and }, overrides line number in compiled code for later detection // "magic" number for { and }, overrides line number in compiled code for later detection
#define IFELSE_MAGIC 31337 #define IFELSE_MAGIC 31337
static int32_t g_ifElseAborted; static int32_t g_ifElseAborted;