From e7403be508490aad516dbc1c24bb5fa986690dfa Mon Sep 17 00:00:00 2001
From: Kayne Ruse <ratstail91@yahoo.com.au>
Date: Sat, 17 May 2014 02:33:02 +1000
Subject: [PATCH] Minor tweak to CombatInstance

---
 server/combat_instance.hpp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/server/combat_instance.hpp b/server/combat_instance.hpp
index 2507bb3..30257ca 100644
--- a/server/combat_instance.hpp
+++ b/server/combat_instance.hpp
@@ -22,23 +22,29 @@
 #ifndef COMBATINSTANCE_HPP_
 #define COMBATINSTACNE_HPP_
 
+#include "vector2.hpp"
+#include "bbox.hpp"
+
 #include "character_data.hpp"
 #include "enemy_data.hpp"
 
+#include <chrono>
 #include <list>
 
 struct CombatInstance {
-	//TODO: metadata
-
-	//world position
-	int mapIndex = 0;
-	Vector2 position = {0.0,0.0};
-	Vector2 motion = {0.0,0.0};
-
+	//combatants
 	std::list<CharacterData*> characterList;
 	std::list<EnemyData> enemyList;
 
-	//TODO: more?
+	//world interaction
+	int mapIndex = 0;
+	Vector2 position = {0.0,0.0};
+	BBox bbox = {0,0,0,0};
+
+	//time interval
+	std::chrono::time_point<std::chrono:steady_clock> lastTick;
+
+	void Update();
 };
 
 #endif