Moved sql_utility.*pp to server/ directory

Also padded setup_server.sql's formatting, for readability.

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

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)
 

rsc/scripts/setup_server.sql

@@ -1,23 +1,26 @@
 CREATE TABLE IF NOT EXISTS Accounts (
-	uid INTEGER PRIMARY KEY AUTOINCREMENT,
+	uid			INTEGER PRIMARY KEY AUTOINCREMENT,
-	username varchar(100) UNIQUE,
+	username	varchar(100) UNIQUE,
+
 	--TODO: server-client security
---	passhash varchar(100),
+--	passhash	varchar(100),
---	passsalt varchar(100),
+--	passsalt	varchar(100),
-	blacklisted BIT DEFAULT 0,
+
-	whitelisted BIT DEFAULT 1,
+	--server controls
-	mod BIT DEFAULT 0,
+	blacklisted	BIT DEFAULT 0,
-	admin 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),
+	owner		INTEGER REFERENCES Accounts(uid),
-	handle varchar(100) UNIQUE,
+	handle		varchar(100) UNIQUE,
-	avatar varchar(100),
+	avatar		varchar(100),
-	birth timestamp NOT NULL DEFAULT (datetime()),
+	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,
+	uid			INTEGER PRIMARY KEY AUTOINCREMENT,
-	owner INTEGER REFERENCES Characters(uid),
+	itemType	INTEGER,
-	itemType INTEGER,
+
+	--position in the world
+	roomIndex	INTEGER DEFAULT 0,
+	originX		INTEGER DEFAULT 0,
+	originY		INTEGER DEFAULT 0,
 
 	--unique information
-	stackSize INTEGER DEFAULT 0,
+	stackSize	INTEGER DEFAULT 0,
-	durability INTEGER DEFAULT 0,
+	durability	INTEGER DEFAULT 0,
-	stats INTEGER REFERENCES StatisticSets(uid)
+	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,
+	uid			INTEGER PRIMARY KEY AUTOINCREMENT,
-	owner INTEGER REFERENCES Characters(uid),
+	owner		INTEGER REFERENCES Characters(uid),
-	itemType INTEGER,
+	itemType	INTEGER,
 
 	--unique information
-	durability INTEGER DEFAULT 0,
+	durability	INTEGER DEFAULT 0,
-	stats INTEGER REFERENCES StatisticSets(uid)
+	stats		INTEGER REFERENCES StatisticSets(uid)
 	--TODO: attached script?
 );

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)

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