Got it to run.

6 files changed, 28 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index c04a7bc..1fa7676 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,19 @@
 SRC_DIR ?= src
 BIN_DIR ?= ebin
 CONF_DIR ?= conf
+INCLUDE_DIR ?= include
+UNUSED_WWW_DIR ?= www
 
 YAWS_CONF ?= $(CONF_DIR)/yaws.conf
+YAWS_API_HEADER ?= /my/src/yaws/include/yaws_api.hrl
 
 ## Binaries
 YAWS ?= yaws
 ERLC ?= erlc
 
 ################################################################################
+REQUIRED_HEADERS = $(INCLUDE_DIR)/yaws_api.hrl
+
 SRC_FILES = $(wildcard $(SRC_DIR)/*.erl)
 MODULES = $(patsubst %.erl,%,$(SRC_FILES))
 SUB_DIRS = $(filter-out $(MODULES),$(sort $(dir $(wildcard $(SRC_DIR)/*/))))
@@ -23,17 +28,27 @@ all:
 		$(MAKE) build SRC_DIR=$$subdir || exit 1;\
 	done
 
-build: $(BIN_DIR) $(BIN_FILES)
+build: $(BIN_DIR) $(REQUIRED_HEADERS) $(BIN_FILES)
 
-run: $(BIN_FILES)
+run: all $(UNUSED_WWW_DIR)
 	$(YAWS) --conf $(YAWS_CONF)
 
 clean:
 	rm -rf $(BIN_DIR)/*
 
+
+$(INCLUDE_DIR)/yaws_api.hrl: $(INCLUDE_DIR) $(YAWS_API_HEADER)
+	cp $^ $@
+
+$(BIN_DIR):
+	mkdir -p $@
+
+$(UNUSED_WWW_DIR):
+	mkdir -p $@
+
+$(INCLUDE_DIR):
+	mkdir -p $@
+
 .SECONDEXPANSION:
 $(BIN_FILES): $(BIN_DIR)/%.beam : $(SRC_DIR)/%.erl $$(wildcard $$(SRC_DIR)/%/.)
 	$(ERLC) -o $(BIN_DIR) $<
-
-$(BIN_DIR):
-	mkdir -p $(BIN_DIR)
diff --git a/conf/yaws.conf b/conf/yaws.conf
index 6b9603b..6127741 100644
--- a/conf/yaws.conf
+++ b/conf/yaws.conf
@@ -108,8 +108,8 @@ keepalive_timeout = 30000
 <server *>
         port = 8000
         listen = 0.0.0.0
-        docroot = /my/src/tacticians-server/www/
+         docroot = /my/src/tacticians-server/www/
         auth_log = true
-        appmods = <cgi-bin, yaws_appmod_cgi>
+        appmods = character_turn load_state
         start_mod = handler
 </server>
diff --git a/src/io/database_shim.erl b/src/io/database_shim.erl
index 243051b..d4f80cb 100644
--- a/src/io/database_shim.erl
+++ b/src/io/database_shim.erl
@@ -41,7 +41,7 @@ generate_char_instances (Battlemap, Characters) ->
                (rand:uniform(2) - 1), % team,
                {
                   rand:uniform(battlemap:get_width(Battlemap) - 1), % X
-                  rand:uniform(battlemap:get_heigth(Battlemap) - 1)  % Y
+                  rand:uniform(battlemap:get_height(Battlemap) - 1)  % Y
                }
             )
          }
diff --git a/src/query/character_turn.erl b/src/query/character_turn.erl
index cf55585..7af2d6d 100644
--- a/src/query/character_turn.erl
+++ b/src/query/character_turn.erl
@@ -26,6 +26,7 @@
       target_char_inst
    }
 ).
+-include("../../include/yaws_api.hrl").
 -export([out/1]).
 
 parse_input (Req) ->
diff --git a/src/query/load_state.erl b/src/query/load_state.erl
index f2818bd..94cacda 100644
--- a/src/query/load_state.erl
+++ b/src/query/load_state.erl
@@ -1,5 +1,6 @@
 -module(load_state).
 -record(input, {session_token, player_id, battlemap_id, instance_id}).
+-include("../../include/yaws_api.hrl").
 -export([out/1]).
 
 parse_input (Req) ->
diff --git a/src/type/battlemap_instance.erl b/src/type/battlemap_instance.erl
index 26ca5b1..28db509 100644
--- a/src/type/battlemap_instance.erl
+++ b/src/type/battlemap_instance.erl
@@ -14,6 +14,7 @@
 -export
 (
    [
+      get_id/1,
       list_characters/1
    ]
 ).
@@ -28,6 +29,8 @@
    ]
 ).
 
+get_id (BattlemapInstance) -> BattlemapInstance#battlemap_instance.id.
+
 list_characters (BattlemapInstance) ->
    dict:to_list(BattlemapInstance#battlemap_instance.chars).