From e4884c3e181b48c06e29eea381ae3cf0a3ec8597 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Thu, 29 Aug 2013 20:35:02 +1000 Subject: [PATCH] Added more placeholder files --- client/makefile | 36 ++++++++++++++++++++++++++++++++++++ common/makefile | 36 ++++++++++++++++++++++++++++++++++++ editor/makefile | 36 ++++++++++++++++++++++++++++++++++++ server/combat_room.cpp | 21 +++++++++++++++++++++ server/combat_room.hpp | 21 +++++++++++++++++++++ server/world_room.cpp | 21 +++++++++++++++++++++ server/world_room.hpp | 22 ++++++++++++++++++++++ 7 files changed, 193 insertions(+) create mode 100644 client/makefile create mode 100644 common/makefile create mode 100644 editor/makefile create mode 100644 server/combat_room.cpp create mode 100644 server/combat_room.hpp create mode 100644 server/world_room.cpp create mode 100644 server/world_room.hpp diff --git a/client/makefile b/client/makefile new file mode 100644 index 0000000..fc62440 --- /dev/null +++ b/client/makefile @@ -0,0 +1,36 @@ +#config +LIB=-lmingw32 -lSDLmain -lSDL -llua +CXXFLAGS+=-std=c++11 -DDEBUG + +#source +SRC=$(wildcard *.cpp) + +#objects +OBJDIR=obj +OBJ=$(addprefix $(OBJDIR)/,$(SRC:.cpp=.o)) + +#output +OUTDIR=../out +OUT=$(addprefix $(OUTDIR)/,server) + +#targets +all: $(OBJ) $(OUT) + $(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIB) + +$(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 diff --git a/common/makefile b/common/makefile new file mode 100644 index 0000000..fc62440 --- /dev/null +++ b/common/makefile @@ -0,0 +1,36 @@ +#config +LIB=-lmingw32 -lSDLmain -lSDL -llua +CXXFLAGS+=-std=c++11 -DDEBUG + +#source +SRC=$(wildcard *.cpp) + +#objects +OBJDIR=obj +OBJ=$(addprefix $(OBJDIR)/,$(SRC:.cpp=.o)) + +#output +OUTDIR=../out +OUT=$(addprefix $(OUTDIR)/,server) + +#targets +all: $(OBJ) $(OUT) + $(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIB) + +$(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 diff --git a/editor/makefile b/editor/makefile new file mode 100644 index 0000000..fc62440 --- /dev/null +++ b/editor/makefile @@ -0,0 +1,36 @@ +#config +LIB=-lmingw32 -lSDLmain -lSDL -llua +CXXFLAGS+=-std=c++11 -DDEBUG + +#source +SRC=$(wildcard *.cpp) + +#objects +OBJDIR=obj +OBJ=$(addprefix $(OBJDIR)/,$(SRC:.cpp=.o)) + +#output +OUTDIR=../out +OUT=$(addprefix $(OUTDIR)/,server) + +#targets +all: $(OBJ) $(OUT) + $(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIB) + +$(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 diff --git a/server/combat_room.cpp b/server/combat_room.cpp new file mode 100644 index 0000000..e1bbfc5 --- /dev/null +++ b/server/combat_room.cpp @@ -0,0 +1,21 @@ +#include "combat_room.hpp" + +CombatRoom::CombatRoom() { + // +} + +CombatRoom::~CombatRoom() { + // +} + +void CombatRoom::Init() { + // +} + +void CombatRoom::Loop() { + // +} + +void CombatRoom::Quit() { + // +} diff --git a/server/combat_room.hpp b/server/combat_room.hpp new file mode 100644 index 0000000..563e7c2 --- /dev/null +++ b/server/combat_room.hpp @@ -0,0 +1,21 @@ +#ifndef COMBATROOM_HPP_ +#define COMBATROOM_HPP_ + +#include "base_room.hpp" + +class CombatRoom : public BaseRoom { +public: + CombatRoom(); + ~CombatRoom(); + + void Init(); + void Loop(); + void Quit(); + +private: + //parent room index + //combatants + //monsters +}; + +#endif \ No newline at end of file diff --git a/server/world_room.cpp b/server/world_room.cpp new file mode 100644 index 0000000..c485b52 --- /dev/null +++ b/server/world_room.cpp @@ -0,0 +1,21 @@ +#include "world_room.hpp" + +WorldRoom::WorldRoom() { + // +} + +WorldRoom::~WorldRoom() { + // +} + +void WorldRoom::Init() { + // +} + +void WorldRoom::Loop() { + // +} + +void WorldRoom::Quit() { + // +} diff --git a/server/world_room.hpp b/server/world_room.hpp new file mode 100644 index 0000000..db496ca --- /dev/null +++ b/server/world_room.hpp @@ -0,0 +1,22 @@ +#ifndef WORLDROOM_HPP_ +#define WORLDROOM_HPP_ + +#include "base_room.hpp" + +class WorldRoom : public BaseRoom { +public: + WorldRoom(); + ~WorldRoom(); + + void Init(); + void Loop(); + void Quit(); + +private: + //collision map + //map metadata + //player list + //combat portals +}; + +#endif \ No newline at end of file