src/dehacked.c

@@ -539,8 +539,11 @@ static void readfreeslots(MYFILE *f)
 				{
 					if (used_spr[(i-SPR_FIRSTFREESLOT)/8] & (1<<(i%8)))
 					{
-						if (!sprnames[i][4] && memcmp(sprnames[i],word,4)==0)
-							sprnames[i][4] = (char)f->wad;
+						if (memcmp(sprnames[i],word,4)==0)
+						{
+							deh_warning("Freeslots: Sprite 'SPR_%s' already exists", word);
+							break; // don't continue
+						}
 						continue; // Already allocated, next.
 					}
 					// Found a free slot!
@@ -552,21 +555,31 @@ static void readfreeslots(MYFILE *f)
 			}
 			else if (fastcmp(type, "S"))
 			{
-				for (i = 0; i < NUMSTATEFREESLOTS; i++)
+				for (i = 0; i < NUMSTATEFREESLOTS; i++) {
 					if (!FREE_STATES[i]) {
 						FREE_STATES[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
 						strcpy(FREE_STATES[i],word);
 						break;
 					}
+					else if (fastcmp(word, FREE_STATES[i])) {
+						deh_warning("Freeslots: State 'S_%s' already exists", word);
+						break; // don't continue
+					}
+				}
 			}
 			else if (fastcmp(type, "MT"))
 			{
-				for (i = 0; i < NUMMOBJFREESLOTS; i++)
+				for (i = 0; i < NUMMOBJFREESLOTS; i++) {
 					if (!FREE_MOBJS[i]) {
 						FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
 						strcpy(FREE_MOBJS[i],word);
 						break;
 					}
+					else if (fastcmp(word, FREE_MOBJS[i])) {
+						deh_warning("Freeslots: MobjType 'MT_%s' already exists", word);
+						break; // don't continue
+					}
+				}
 			}
 			else if (fastcmp(type, "SKINCOLOR"))
 			{
@@ -577,13 +590,20 @@ static void readfreeslots(MYFILE *f)
 						M_AddMenuColor(numskincolors++);
 						break;
 					}
+					else if (fastcmp(word, FREE_SKINCOLORS[i])) {
+						deh_warning("Freeslots: Skincolor 'SKINCOLOR_%s' already exists", word);
+						break; // don't continue
+					}
 			}
 			else if (fastcmp(type, "SPR2"))
 			{
 				// Search if we already have an SPR2 by that name...
 				for (i = SPR2_FIRSTFREESLOT; i < (int)free_spr2; i++)
 					if (memcmp(spr2names[i],word,4) == 0)
+					{
+						deh_warning("Freeslots: Player sprite 'SPR2_%s' already exists", word);
 						break;
+					}
 				// We found it? (Two mods using the same SPR2 name?) Then don't allocate another one.
 				if (i < (int)free_spr2)
 					continue;
@@ -10155,8 +10175,14 @@ static spritenum_t get_sprite(const char *word)
 	if (fastncmp("SPR_",word,4))
 		word += 4; // take off the SPR_
 	for (i = 0; i < NUMSPRITES; i++)
-		if (!sprnames[i][4] && memcmp(word,sprnames[i],4)==0)
+	{
+		if (i >= SPR_FIRSTFREESLOT) {
+			if (!(used_spr[(i-SPR_FIRSTFREESLOT)/8] & (1<<(i%8))))
+				break;
+		}
+		if (memcmp(word,sprnames[i],4)==0)
 			return i;
+	}
 	deh_warning("Couldn't find sprite named 'SPR_%s'",word);
 	return SPR_NULL;
 }
@@ -10628,17 +10654,15 @@ static inline int lib_freeslot(lua_State *L)
 		}
 		else if (fastcmp(type, "SPR"))
 		{
-			char wad;
 			spritenum_t j;
-			lua_getfield(L, LUA_REGISTRYINDEX, "WAD");
-			wad = (char)lua_tointeger(L, -1);
-			lua_pop(L, 1);
 			for (j = SPR_FIRSTFREESLOT; j <= SPR_LASTFREESLOT; j++)
 			{
 				if (used_spr[(j-SPR_FIRSTFREESLOT)/8] & (1<<(j%8)))
 				{
-					if (!sprnames[j][4] && memcmp(sprnames[j],word,4)==0)
-						sprnames[j][4] = wad;
+					if (memcmp(sprnames[j],word,4)==0) {
+						CONS_Printf("Sprite SPR_%s already exists.\n", word);
+						break; // don't continue
+					}
 					continue; // Already allocated, next.
 				}
 				// Found a free slot!
@@ -10656,7 +10680,7 @@ static inline int lib_freeslot(lua_State *L)
 		else if (fastcmp(type, "S"))
 		{
 			statenum_t i;
-			for (i = 0; i < NUMSTATEFREESLOTS; i++)
+			for (i = 0; i < NUMSTATEFREESLOTS; i++) {
 				if (!FREE_STATES[i]) {
 					CONS_Printf("State S_%s allocated.\n",word);
 					FREE_STATES[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
@@ -10665,13 +10689,18 @@ static inline int lib_freeslot(lua_State *L)
 					r++;
 					break;
 				}
+				else if (fastcmp(word, FREE_STATES[i])) {
+					CONS_Printf("State S_%s already exists.\n", word);
+					break;
+				}
+			}
 			if (i == NUMSTATEFREESLOTS)
 				CONS_Alert(CONS_WARNING, "Ran out of free State slots!\n");
 		}
 		else if (fastcmp(type, "MT"))
 		{
 			mobjtype_t i;
-			for (i = 0; i < NUMMOBJFREESLOTS; i++)
+			for (i = 0; i < NUMMOBJFREESLOTS; i++) {
 				if (!FREE_MOBJS[i]) {
 					CONS_Printf("MobjType MT_%s allocated.\n",word);
 					FREE_MOBJS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
@@ -10680,13 +10709,18 @@ static inline int lib_freeslot(lua_State *L)
 					r++;
 					break;
 				}
+				else if (fastcmp(word, FREE_MOBJS[i])) {
+					CONS_Printf("MobjType MT_%s already exists.\n", word);
+					break;
+				}
+			}
 			if (i == NUMMOBJFREESLOTS)
 				CONS_Alert(CONS_WARNING, "Ran out of free MobjType slots!\n");
 		}
 		else if (fastcmp(type, "SKINCOLOR"))
 		{
 			skincolornum_t i;
-			for (i = 0; i < NUMCOLORFREESLOTS; i++)
+			for (i = 0; i < NUMCOLORFREESLOTS; i++) {
 				if (!FREE_SKINCOLORS[i]) {
 					CONS_Printf("Skincolor SKINCOLOR_%s allocated.\n",word);
 					FREE_SKINCOLORS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
@@ -10696,6 +10730,11 @@ static inline int lib_freeslot(lua_State *L)
 					r++;
 					break;
 				}
+				else if (fastcmp(word, FREE_SKINCOLORS[i])) {
+					CONS_Printf("Skincolor SKINCOLOR_%s already exists.\n", word);
+					break;
+				}
+			}
 			if (i == NUMCOLORFREESLOTS)
 				CONS_Alert(CONS_WARNING, "Ran out of free skincolor slots!\n");
 		}
@@ -10705,7 +10744,10 @@ static inline int lib_freeslot(lua_State *L)
 			playersprite_t i;
 			for (i = SPR2_FIRSTFREESLOT; i < free_spr2; i++)
 				if (memcmp(spr2names[i],word,4) == 0)
+				{
+					CONS_Printf("Player sprite SPR2_%s already exists.\n", word);
 					break;
+				}
 			// We don't, so allocate a new one.
 			if (i >= free_spr2) {
 				if (free_spr2 < NUMPLAYERSPRITES)
@@ -10713,9 +10755,9 @@ static inline int lib_freeslot(lua_State *L)
 					CONS_Printf("Sprite SPR2_%s allocated.\n",word);
 					strncpy(spr2names[free_spr2],word,4);
 					spr2defaults[free_spr2] = 0;
-					lua_pushinteger(L, free_spr2);
+					spr2names[free_spr2][4] = 0;
+					lua_pushinteger(L, free_spr2++);
 					r++;
-					spr2names[free_spr2++][4] = 0;
 				} else
 					CONS_Alert(CONS_WARNING, "Ran out of free SPR2 slots!\n");
 			}
@@ -10927,11 +10969,16 @@ static inline int lib_getenum(lua_State *L)
 	}
 	else if (fastncmp("SPR_",word,4)) {
 		p = word+4;
-		for (i = 0; i < NUMSPRITES; i++)
-			if (!sprnames[i][4] && fastncmp(p,sprnames[i],4)) {
+		for (i = 0; i < NUMSPRITES; i++) {
+			if (i >= SPR_FIRSTFREESLOT) {
+				if (!(used_spr[(i-SPR_FIRSTFREESLOT)/8] & (1<<(i%8))))
+					break;
+			}
+			if (fastncmp(p,sprnames[i],4)) {
 				lua_pushinteger(L, i);
 				return 1;
 			}
+		}
 		if (mathlib) return luaL_error(L, "sprite '%s' could not be found.\n", word);
 		return 0;
 	}

src/lua_script.c

@@ -480,8 +480,6 @@ static inline void LUA_LoadFile(MYFILE *f, char *name, boolean noresults)
 	CONS_Printf("Loading Lua script from %s\n", name);
 	if (!gL) // Lua needs to be initialized
 		LUA_ClearState();
-	lua_pushinteger(gL, f->wad);
-	lua_setfield(gL, LUA_REGISTRYINDEX, "WAD");
 
 	lua_lumploading++; // turn on loading flag