4 files changed, 15 insertions, 3 deletions

diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index 72630d57..5aa419b1 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -1360,7 +1360,7 @@ CStreaming::StreamZoneModels(const CVector &pos)
 
 		// unload pevious group
 		if(ms_currentPedGrp != -1)
-			for(i = 0; i < 8; i++){
+			for(i = 0; i < NUMMODELSPERPEDGROUP; i++){
 				if(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i] == -1)
 					break;
 				SetModelIsDeletable(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i]);
@@ -1369,7 +1369,7 @@ CStreaming::StreamZoneModels(const CVector &pos)
 
 		ms_currentPedGrp = info.pedGroup;
 
-		for(i = 0; i < 8; i++){
+		for(i = 0; i < NUMMODELSPERPEDGROUP; i++){
 			if(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i] == -1)
 				break;
 			RequestModel(CPopulation::ms_pPedGroups[ms_currentPedGrp].models[i], STREAMFLAGS_DONT_REMOVE);
diff --git a/src/core/templates.h b/src/core/templates.h
index 921b109a..69844fa4 100644
--- a/src/core/templates.h
+++ b/src/core/templates.h
@@ -17,6 +17,16 @@ public:
 	void clear(void){
 		this->allocPtr = 0;
 	}
+	int getIndex(T *item){
+		assert(item >= &this->store[0]);
+		assert(item < &this->store[n]);
+		return item - this->store;
+	}
+	T *getItem(int index){
+		assert(index >= 0);
+		assert(index < n);
+		return &this->store[index];
+	}
 };
 
 template<typename T, typename U = T>
diff --git a/src/modelinfo/BaseModelInfo.h b/src/modelinfo/BaseModelInfo.h
index 9f828e7f..fdf1efb6 100644
--- a/src/modelinfo/BaseModelInfo.h
+++ b/src/modelinfo/BaseModelInfo.h
@@ -48,7 +48,7 @@ public:
 		m_type == MITYPE_MLO || m_type == MITYPE_XTRACOMPS;	// unused but what the heck
 	}
 	char *GetName(void) { return m_name; }
-	void SetName(const char *name) { strncpy(m_name, name, 24); }
+	void SetName(const char *name) { strncpy(m_name, name, MAX_MODEL_NAME); }
 	void SetColModel(CColModel *col, bool owns = false){
 		m_colModel = col; m_bOwnsColModel = owns; }
 	CColModel *GetColModel(void) { return m_colModel; }
diff --git a/src/render/2dEffect.h b/src/render/2dEffect.h
index b0615e4d..a24a3f4f 100644
--- a/src/render/2dEffect.h
+++ b/src/render/2dEffect.h
@@ -1,3 +1,5 @@
+#pragma once
+
 enum {
 	EFFECT_LIGHT,
 	EFFECT_PARTICLE,