Renamed CombatInstance to Battle, for clarity

server/barriers/barrier_api.cpp

@@ -52,15 +52,17 @@ static int getTag(lua_State* L) {
 	return 1;
 }
 
-static int setInstance(lua_State* L) {
+/*
+static int setBattleIndex(lua_State* L) {
 	BarrierData* barrier = static_cast<BarrierData*>(lua_touserdata(L, 1));
-	barrier->SetInstanceIndex(lua_tointeger(L, 2));
+	barrier->SetBattleIndex(lua_tointeger(L, 2));
 	return 0;
 }
+*/
 
-static int getInstance(lua_State* L) {
+static int getBattleIndex(lua_State* L) {
 	BarrierData* barrier = static_cast<BarrierData*>(lua_touserdata(L, 1));
-	lua_pushinteger(L, barrier->GetInstanceIndex());
+	lua_pushinteger(L, barrier->GetBattleIndex());
 	return 1;
 }
 
@@ -81,9 +83,8 @@ static const luaL_Reg barrierLib[] = {
 	{"GetScript", getScript},
 	{"SetTag", setTag},
 	{"GetTag", getTag},
-	//NOTE: Why is the instance mutable?
-	{"SetInstance", setInstance},
-	{"GetInstance", getInstance},
+//	{"SetBattleIndex", setBattleIndex},
+	{"GetBattleIndex", getBattleIndex},
 	{"SetStatus", setStatus},
 	{"GetStatus", getStatus},
 	{nullptr, nullptr}

server/barriers/barrier_data.cpp

@@ -28,7 +28,7 @@
 BarrierData::BarrierData(int i):
 	Entity::Entity("barrier")
 {
-	instanceIndex = i;
+	battleIndex = i;
 	memset(status, 0, sizeof(int) * 8);
 
 	SetBounds({
@@ -85,12 +85,12 @@ std::string BarrierData::GetTag(std::string key) {
 	return tags[key];
 }
 
-int BarrierData::SetInstanceIndex(int i) {
-	return instanceIndex = i;
+int BarrierData::SetBattleIndex(int i) {
+	return battleIndex = i;
 }
 
-int BarrierData::GetInstanceIndex() const {
-	return instanceIndex;
+int BarrierData::GetBattleIndex() const {
+	return battleIndex;
 }
 
 int BarrierData::SetStatus(int k, int v) {

server/barriers/barrier_data.hpp

@@ -31,7 +31,7 @@
 
 class BarrierData: public Entity {
 public:
-	BarrierData(int instanceIndex);
+	BarrierData(int battleIndex);
 	~BarrierData();
 
 	int Update(lua_State*);
@@ -43,8 +43,8 @@ public:
 	std::string SetTag(std::string key, std::string value);
 	std::string GetTag(std::string key);
 
-	int SetInstanceIndex(int i);
-	int GetInstanceIndex() const;
+	int SetBattleIndex(int i);
+	int GetBattleIndex() const;
 
 	int SetStatus(int k, int v);
 	int GetStatus(int k);
@@ -55,7 +55,7 @@ private:
 	int scriptRef = LUA_NOREF;
 	std::map<std::string, std::string> tags;
 
-	int instanceIndex;
+	int battleIndex;
 
 	int status[8];
 };