Arranged server's source into directories

server/enemies/enemy_factory_generic.cpp

@@ -0,0 +1,34 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "enemy_factory_generic.hpp"
+
+EnemyFactoryGeneric::EnemyFactoryGeneric() : EnemyFactoryInterface() {
+	//EMPTY
+}
+
+EnemyFactoryGeneric::~EnemyFactoryGeneric() noexcept {
+	//EMPTY
+}
+
+void EnemyFactoryGeneric::Generate(std::list<EnemyData>* container) {
+	//TODO: fill this out
+}

server/enemies/enemy_factory_generic.hpp

@@ -0,0 +1,42 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef ENEMYFACTORYGENERIC_HPP_
+#define ENEMYFACTORYGENERIC_HPP_
+
+#include "enemy_factory_interface.hpp"
+
+#include "enemy_data.hpp"
+
+#include <list>
+
+//DOCS: Not really intended for use, but rather for copying and tweaking
+class EnemyFactoryGeneric : public EnemyFactoryInterface {
+public:
+	EnemyFactoryGeneric();
+	~EnemyFactoryGeneric() noexcept override;
+
+	void Generate(std::list<EnemyData>* container) override;
+private:
+	//TODO: hold the parameters specified by the room
+};
+
+#endif

server/enemies/enemy_factory_interface.hpp

@@ -0,0 +1,48 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef ENEMYFACTORYINTERFACE_HPP_
+#define ENEMYFACTORYINTERFACE_HPP_
+
+#include "enemy_data.hpp"
+#include "room_data.hpp"
+
+#include <list>
+
+//NOTE: Based on biome, world difficulty, etc.
+class EnemyFactoryInterface {
+public:
+	EnemyFactoryInterface() = default;
+	virtual ~EnemyFactoryInterface() = default;
+
+	virtual void Generate(std::list<EnemyData>* container) = 0;
+
+	//control the difficulty of the room
+	RoomData::RoomType SetType(RoomData::RoomType t) { return type = t; }
+	int SetDifficulty(int d) { return difficulty = d; }
+	RoomData::RoomType GetType() { return type; }
+	int GetDifficulty() { return difficulty; }
+protected:
+	RoomData::RoomType type;
+	int difficulty;
+};
+
+#endif

server/enemies/enemy_manager.cpp

@@ -0,0 +1,54 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "enemy_manager.hpp"
+
+//-------------------------
+//public access methods
+//-------------------------
+
+//TODO
+
+//-------------------------
+//accessors and mutators
+//-------------------------
+
+EnemyData* EnemyManager::GetEnemy(int uid) {
+	std::map<int, EnemyData>::iterator it = enemyMap.find(uid);
+
+	if (it == enemyMap.end()) {
+		return nullptr;
+	}
+
+	return &it->second;
+}
+
+std::map<int, EnemyData>* EnemyManager::GetContainer() {
+	return &enemyMap;
+}
+
+lua_State* EnemyManager::SetLuaState(lua_State* L) {
+	return luaState = L;
+}
+
+lua_State* EnemyManager::GetLuaState() {
+	return luaState;
+}

server/enemies/enemy_manager.hpp

@@ -0,0 +1,51 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef ENEMYMANAGER_HPP_
+#define ENEMYMANAGER_HPP_
+
+#include "enemy_data.hpp"
+
+#include "lua/lua.hpp"
+
+#include <map>
+
+class EnemyManager {
+public:
+	EnemyManager() = default;
+	~EnemyManager() = default;
+
+	//public access methods
+	//TODO
+
+	//accessors and mutators
+	EnemyData* GetEnemy(int uid);
+	std::map<int, EnemyData>* GetContainer();
+
+	lua_State* SetLuaState(lua_State*);
+	lua_State* GetLuaState();
+
+private:
+	std::map<int, EnemyData> enemyMap;
+	lua_State* luaState = nullptr;
+};
+
+#endif

server/enemies/makefile

@@ -0,0 +1,37 @@
+#config
+INCLUDES+=. ../rooms ../../common/gameplay ../../common/map ../../common/utilities
+LIBS+=
+CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES))
+
+#source
+CXXSRC=$(wildcard *.cpp)
+
+#objects
+OBJDIR=obj
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+
+#output
+OUTDIR=..
+OUT=$(addprefix $(OUTDIR)/,server.a)
+
+#targets
+all: $(OBJ) $(OUT)
+	ar -crs $(OUT) $(OBJ)
+
+$(OBJ): | $(OBJDIR)
+
+$(OUT): | $(OUTDIR)
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+$(OUTDIR):
+	mkdir $(OUTDIR)
+
+$(OBJDIR)/%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all