From 8c86e26997043d2ae9d440f80fa3e7c1c8a2d444 Mon Sep 17 00:00:00 2001
From: Carl Kittelberger <icedream@icedream.pw>
Date: Sun, 3 Apr 2016 13:11:54 +0200
Subject: [PATCH] modellist: Generalized initScriptModels to initFromEntArray.

---
 maps/mp/mods/_modellist.gsc | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/maps/mp/mods/_modellist.gsc b/maps/mp/mods/_modellist.gsc
index a0478ee..2f98bd0 100644
--- a/maps/mp/mods/_modellist.gsc
+++ b/maps/mp/mods/_modellist.gsc
@@ -12,28 +12,34 @@ createModel(modelname, RName)
 initModelList() {
 	initIgnoredModels();
 	initDisplayNames();
-	initScriptModels();
+	initFromEntArray("script_model", "classname");
+	//initFromEntArray("destructible", "targetname");
 }
 
-initScriptModels()
+initFromEntArray(val, key)
 {
 	if (!IsDefined(level.ModelList)) {
 		level.ModelList = [];
 	}
 
-	alreadyAdded = [];
-	for (index = 0; index < level.ModelList.size; index++) {
-		name = level.ModelList[index].name;
-		alreadyAdded[name] = true;
+	if (!IsDefined(level.EntityList)) {
+		level.EntityList = [];
 	}
 
-	ents = GetEntArray("script_model", "classname");
+	level.alreadyAddedModel = [];
+	for (index = 0; index < level.ModelList.size; index++) {
+		name = level.ModelList[index].name;
+		level.alreadyAddedModel[name] = true;
+	}
+
+	ents = GetEntArray(val, key);
 	for (index = 0; index < ents.size; index++) {
 		ent = ents[index];
 		name = ent.model;
-		if (!IsDefined(alreadyAdded[name])) {
-			alreadyAdded[name] = true;
-			if (!isIgnoredModel(name)) {
+		if (!isIgnoredModel(name)) {
+			level.EntityList[level.EntityList.size] = ent;
+			if (!IsDefined(level.alreadyAddedModel[name])) {
+				level.alreadyAddedModel[name] = true;
 				level.ModelList[level.ModelList.size] = createModel(name, getDisplayName(name));
 			}
 		}