From e452f2ecfc4a1f59f521c214101bcd1c618c698b Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Sun, 28 Sep 2014 03:36:00 +1000 Subject: [PATCH] Moved sql_utility.*pp to server/ directory Also padded setup_server.sql's formatting, for readability. --- client/client_utilities/makefile | 37 ++++++++++ client/makefile | 3 +- rsc/scripts/setup_server.sql | 71 ++++++++++++------- server/makefile | 3 +- server/server_utilities/makefile | 37 ++++++++++ .../server_utilities}/sql_utility.cpp | 0 .../server_utilities}/sql_utility.hpp | 0 7 files changed, 123 insertions(+), 28 deletions(-) create mode 100644 client/client_utilities/makefile create mode 100644 server/server_utilities/makefile rename {common/utilities => server/server_utilities}/sql_utility.cpp (100%) rename {common/utilities => server/server_utilities}/sql_utility.hpp (100%) diff --git a/client/client_utilities/makefile b/client/client_utilities/makefile new file mode 100644 index 0000000..8d12afe --- /dev/null +++ b/client/client_utilities/makefile @@ -0,0 +1,37 @@ +#config +INCLUDES+=. +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 diff --git a/client/makefile b/client/makefile index c8ca863..c46fbcb 100644 --- a/client/makefile +++ b/client/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities +INCLUDES+=. client_utilities scenes ../common/debugging ../common/gameplay ../common/graphics ../common/map ../common/network ../common/network/packet_types ../common/ui ../common/utilities LIBS+=client.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) @@ -16,6 +16,7 @@ OUT=$(addprefix $(OUTDIR)/,client) #targets all: $(OBJ) $(OUT) + $(MAKE) -C client_utilities $(MAKE) -C scenes $(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS) diff --git a/rsc/scripts/setup_server.sql b/rsc/scripts/setup_server.sql index 2484a04..80da6fe 100644 --- a/rsc/scripts/setup_server.sql +++ b/rsc/scripts/setup_server.sql @@ -1,23 +1,26 @@ CREATE TABLE IF NOT EXISTS Accounts ( - uid INTEGER PRIMARY KEY AUTOINCREMENT, - username varchar(100) UNIQUE, + uid INTEGER PRIMARY KEY AUTOINCREMENT, + username varchar(100) UNIQUE, + --TODO: server-client security --- passhash varchar(100), --- passsalt varchar(100), - blacklisted BIT DEFAULT 0, - whitelisted BIT DEFAULT 1, - mod BIT DEFAULT 0, - admin BIT DEFAULT 0 +-- passhash varchar(100), +-- passsalt varchar(100), + + --server controls + blacklisted BIT DEFAULT 0, + whitelisted BIT DEFAULT 1, + mod BIT DEFAULT 0, + admin BIT DEFAULT 0 ); CREATE TABLE IF NOT EXISTS Characters ( - uid INTEGER PRIMARY KEY AUTOINCREMENT, + uid INTEGER PRIMARY KEY AUTOINCREMENT, --metadata - owner INTEGER REFERENCES Accounts(uid), - handle varchar(100) UNIQUE, - avatar varchar(100), - birth timestamp NOT NULL DEFAULT (datetime()), + owner INTEGER REFERENCES Accounts(uid), + handle varchar(100) UNIQUE, + avatar varchar(100), + birth timestamp NOT NULL DEFAULT (datetime()), --position in the world roomIndex INTEGER DEFAULT 0, @@ -40,7 +43,7 @@ CREATE TABLE IF NOT EXISTS Characters ( CREATE TABLE IF NOT EXISTS StatisticSets ( --metadata - uid INTEGER PRIMARY KEY AUTOINCREMENT, + uid INTEGER PRIMARY KEY AUTOINCREMENT, --general use statistics level INTEGER DEFAULT 0, @@ -59,26 +62,42 @@ CREATE TABLE IF NOT EXISTS StatisticSets ( luck REAL DEFAULT 0.0 ); -CREATE TABLE IF NOT EXISTS InventoryItems ( +CREATE TABLE IF NOT EXISTS InWorldItems ( --metadata - uid INTEGER PRIMARY KEY AUTOINCREMENT, - owner INTEGER REFERENCES Characters(uid), - itemType INTEGER, + uid INTEGER PRIMARY KEY AUTOINCREMENT, + itemType INTEGER, + + --position in the world + roomIndex INTEGER DEFAULT 0, + originX INTEGER DEFAULT 0, + originY INTEGER DEFAULT 0, --unique information - stackSize INTEGER DEFAULT 0, - durability INTEGER DEFAULT 0, - stats INTEGER REFERENCES StatisticSets(uid) + stackSize INTEGER DEFAULT 0, + durability INTEGER DEFAULT 0, + stats INTEGER REFERENCES StatisticSets(uid) +); + +CREATE TABLE IF NOT EXISTS InventoryItems ( + --metadata + uid INTEGER PRIMARY KEY AUTOINCREMENT, + owner INTEGER REFERENCES Characters(uid), + itemType INTEGER, + + --unique information + stackSize INTEGER DEFAULT 0, + durability INTEGER DEFAULT 0, + stats INTEGER REFERENCES StatisticSets(uid) ); CREATE TABLE IF NOT EXISTS WornEquipment ( --metadata - uid INTEGER PRIMARY KEY AUTOINCREMENT, - owner INTEGER REFERENCES Characters(uid), - itemType INTEGER, + uid INTEGER PRIMARY KEY AUTOINCREMENT, + owner INTEGER REFERENCES Characters(uid), + itemType INTEGER, --unique information - durability INTEGER DEFAULT 0, - stats INTEGER REFERENCES StatisticSets(uid) + durability INTEGER DEFAULT 0, + stats INTEGER REFERENCES StatisticSets(uid) --TODO: attached script? ); diff --git a/server/makefile b/server/makefile index e3d7530..c8c5ef2 100644 --- a/server/makefile +++ b/server/makefile @@ -1,5 +1,5 @@ #config -INCLUDES+=. accounts characters rooms ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities +INCLUDES+=. accounts characters rooms server_utilities ../common/debugging ../common/gameplay ../common/map ../common/network ../common/network/packet_types ../common/utilities LIBS+=server.a ../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3 CXXFLAGS+=-std=c++11 $(addprefix -I,$(INCLUDES)) @@ -19,6 +19,7 @@ all: $(OBJ) $(OUT) $(MAKE) -C accounts $(MAKE) -C characters $(MAKE) -C rooms + $(MAKE) -C server_utilities $(CXX) $(CXXFLAGS) -o $(OUT) $(OBJ) $(LIBS) $(OBJ): | $(OBJDIR) diff --git a/server/server_utilities/makefile b/server/server_utilities/makefile new file mode 100644 index 0000000..f24e1ba --- /dev/null +++ b/server/server_utilities/makefile @@ -0,0 +1,37 @@ +#config +INCLUDES+=. ../../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 diff --git a/common/utilities/sql_utility.cpp b/server/server_utilities/sql_utility.cpp similarity index 100% rename from common/utilities/sql_utility.cpp rename to server/server_utilities/sql_utility.cpp diff --git a/common/utilities/sql_utility.hpp b/server/server_utilities/sql_utility.hpp similarity index 100% rename from common/utilities/sql_utility.hpp rename to server/server_utilities/sql_utility.hpp