and entity types to entities and add mutators for entity types

src/lib/state.cpp

@@ -19,6 +19,10 @@ int32_t entity::get_property(const string& name, int32_t val) const {
 	}
 }
 
+void state::add_entity(entity entity){
+	entities.push_back(entity);
+}
+
 state::state() {
 	this->turn = 0;
 }

src/lib/state.h

@@ -26,15 +26,30 @@ struct data {
 	int resource;
 };
 
+class entity_type {
+
+	private:
+		entity_type* parent;
+		property_map properties;
+};
+
 class entity {
 
 	public:
-		entity(): tag(0), pos(Hex(0,0,0)) {}
-		entity(entity const& rhs): tag(rhs.tag), pos(Hex(0,0,0)) {}
+		entity(entity_type* type): tag(0), pos(Hex(0,0,0)) {
+			this->type = type;
+		}
+
+		entity(entity const& rhs): tag(rhs.tag), pos(Hex(0,0,0)) {
+			type = rhs.type;
+		}
+
 		int32_t get_property(string const& name) const;
 		int32_t get_property(string const& name, int32_t val) const;
+		void set_property(string const& name, int32_t val);
 
 	private:
+		entity_type* type;
 		uint64_t tag;
 		location pos;
 		property_map properties;
@@ -47,8 +62,11 @@ class state {
 
 		entity entity_at(location location);
 		vector<entity> entities_at(location location);
+		void add_entity(entity entity);
 
 		uint32_t terrain_at(location location);
+		void set_terrain(location location, uint32_t t);
+
 		uint32_t resource_at(location location);
 
 	private:

src/main.cpp

@@ -15,10 +15,14 @@ void test(const entity& test){
 }
 
 int main(int argc, char **argv){
-	cout << "test" << endl;
 
-	entity t;
-	test(t);
+	entity_type type;
+	state state;
+
+	for (int i=0; i<10; i++){
+		entity e(&type);
+		state.add_entity(e);
+	}
 
 	return 0;
 }