37 changed files with 135 additions and 469 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +0,0 @@
-[submodule "engine/proclib"]
-	path = engine/proclib
-	url = ssh://eureka@atom.exoss.net:4422/srv/eureka/proclib.git
--- a/engine/main.c
+++ b/engine/main.c
@ -1,32 +1,8 @@
 #include "globals.h"
 #include "interfaces.h"
 #include "../common/fio.h"
-#ifdef __APPLE__
-  #include "CoreFoundation/CoreFoundation.h"
-#endif

 int main(int argc, char *argv[]) {
-#ifdef __APPLE__
-  char path[PATH_MAX];
-  CFURLRef res = CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle());
-  CFURLGetFileSystemRepresentation(res, TRUE, (UInt8 *)path, PATH_MAX);
-  CFRelease(res);
-  // there's likely a better way to do this!
-  size_t path_len = strlen(path);
-  int i = path_len;
-  int p_c = 0;
-  while (i > 0) {
-    if (path[i] == '/') {
-      p_c++;
-    }
-    if (p_c == 3) break;
-    i--;
-  }
-  char bundle_path[i+1];
-  memcpy(bundle_path, path, i);
-  bundle_path[i] = '\0';
-  chdir(bundle_path);
-#endif
  // let's load in our config file
  int buffer_size = 0;
  char *memory;
@ -46,12 +22,8 @@ int main(int argc, char *argv[]) {
    addTablePairInt(g_settings, "clock", 0);
  }
  // let's search for modules!
-  if ((g_modules_list = dirToLList("modules", F_DIRS)) == NULL) {
-    printf("ERR: no modules found in \"modules/\"\n");
-    if ((g_modules_list = dirToLList("../modules", F_DIRS)) == NULL) {
-      printf("ERR: no modules found in \"../modules\"\n");
-    }
-  }
+  if ((g_modules_list = dirToLList("../modules", F_DIRS)) == NULL)
+    printf("ERR: no modules found\n");
  /*printf("modules:\n");
  struct LList *llist = g_modules_list;
  while (llist) {
--- a/engine/proclib
+++ b/engine/proclib
@ -1 +0,0 @@
-Subproject commit 90a0b3b4846cd3a761acf34b900c4a0ee8848624
--- a/engine/states/state_modules.c
+++ b/engine/states/state_modules.c
@ -4,7 +4,6 @@
 #include "state_test.h"
 #include "../../common/fio.h"
 #include "../sdl/spritesheets.h" // FIXME: implicit declaration problems.
-#include <unistd.h> // access()

 /* allocate memory for menu */
 void initModulesState() {
@ -12,12 +11,6 @@ void initModulesState() {
  s_modules_elements->user = g_screen;
  s_active_element = NULL;

-  if (access("modules", F_OK) != -1) {
-    strcpy(s_modules_dir, "modules");
-  } else if (access("../modules", F_OK) != -1) {
-    strcpy(s_modules_dir, "../modules");
-  }
-
  struct Dimension dimen = { 0, 0, 128, 32};
  struct Element *element;
  struct LList *llist = g_modules_list;
@ -150,7 +143,7 @@ void ModulesState_loadModule(struct Element *element) {
  int size = 0;

  /* load module/CONF */
-  sprintf(temp, "%s/%s/CONF", s_modules_dir, module_name);
+  sprintf(temp, "../modules/%s/CONF", module_name);
  printf("attempting to load %s\n", temp);
  if (g_module_conf == NULL) {
    g_module_conf = newTable(16);
@ -175,7 +168,7 @@ void ModulesState_loadModule(struct Element *element) {
  } else {
    struct Table *sprites_conf = NULL;
    // Load our spritesheet CONF
-    sprintf(temp, "%s/%s/sprites/CONF", s_modules_dir, module_name);
+    sprintf(temp, "../modules/%s/sprites/CONF", module_name);
    printf("attempting to load %s\n", temp);
    if (sprites_conf == NULL) {
      sprites_conf = newTable(16);
@ -204,7 +197,7 @@ void ModulesState_loadModule(struct Element *element) {
    // i should be equal to spritesheet count
    g_module_spritesheets = malloc(sizeof(struct Spritesheet*)*i);
    while(i > 0) {
-      sprintf(temp, "%s/%s/sprites/%s", s_modules_dir, module_name, (char*)sprites_table->pair[i-1]->value);
+      sprintf(temp, "../modules/%s/sprites/%s", module_name, (char*)sprites_table->pair[i-1]->value);
      printf("  attempting to load %s\n", temp);
      g_module_spritesheets[i-1] = newSpritesheet();
      struct Table *sheet_conf = getTablePairValueTable(sprites_conf, (char*)sprites_table->pair[i-1]->value);
@ -229,7 +222,7 @@ void ModulesState_loadModule(struct Element *element) {
    }
  }

-  sprintf(temp, "%s/%s/%s.tsd", s_modules_dir, module_name, module_name);
+  sprintf(temp, "../modules/%s/%s.tsd", module_name, module_name);
  printf("attempting to load %s\n", temp);
  size = fileToMemory(&buffer, temp);
  if (size > 0) {
--- a/engine/states/state_modules.h
+++ b/engine/states/state_modules.h
@ -17,7 +17,6 @@ struct ElementList *s_modules_elements;

 struct Element *s_active_element;

-char s_modules_dir[128];

 /* local functions */
 void ModulesState_loadModule(struct Element *element);
--- a/modules/vashram/CONF
+++ b/modules/vashram/CONF
@ -1,9 +1,9 @@
 ; Fancy name for the module!
-name Vashram
+name Test
 ; description of the module, if it wasn't obvious enough
-description "Vashram the Stampede"
+description "Module of Testing - also maybe undead slaying"
 ; range of recommended players
-players 1
+players 1-6
 ; default sprite x scale
 scale_x 2.0
 ; default sprite y scale
@ -11,13 +11,9 @@ scale_y 2.0
 ; the list of sprites to use and tie to particular TIDs
 sprites {
  ; key = TID, value = spritesheet for that TID
-  0 capran
-  1 monsters
-  2 floors
-  3 walls
-  4 equips
-  5 items
-  6 decor
+  0 players
+  1 ground
+  2 walls
 }
 ; list of playable characters for character creation
 chars {
--- a/modules/test/sprites/CONF
+++ b/modules/test/sprites/CONF
@ -0,0 +1,25 @@
+players {
+  width 8
+  height 16
+  columns 16
+  ; sets per row
+  sets 4
+  ; frames per set
+  frame 4
+}
+
+ground {
+  width 8
+  height 16
+  columns 1
+  set 1
+  frame 1
+}
+
+walls {
+  width 8
+  height 16
+  columns 1
+  set 1
+  frame 1
+}
--- a/modules/test/sprites/ground.png
+++ b/modules/test/sprites/ground.png
--- a/modules/test/sprites/players.png
+++ b/modules/test/sprites/players.png
--- a/modules/test/sprites/walls.png
+++ b/modules/test/sprites/walls.png
--- a/modules/test/test.tsd
+++ b/modules/test/test.tsd
@ -0,0 +1,23 @@
+0 {
+  0 {
+    name gestalt
+  }
+}
+1 {
+  0 {
+    name friggin dead grass
+  }
+}
+2 {
+  0 {
+    name greh brix
+  }
+}
+3 {
+}
+4 {
+}
+5 {
+}
+6 {
+}
--- a/modules/vashram/sprites/CONF
+++ b/modules/vashram/sprites/CONF
@ -1,71 +0,0 @@
-armor {
-  width 16
-  height 32
-  columns 8
-  set 1
-  frame 1
-}
-
-weapons {
-  width 16
-  height 32
-  columns 16
-  set 1
-  frame 1
-}
-
-items {
-  width 16
-  height 32
-  columns 16
-  set 1
-  frame 1
-}
-
-floors {
-  width 16
-  height 32
-  columns 16
-  set 1
-  frame 1
-}
-
-walls {
-  width 16
-  height 32
-  columns 16
-  set 1
-  frame 1
-}
-
-doors {
-  width 16
-  height 32
-  columns 16
-  set 1
-  frame 1
-}
-
-decor {
-  width 16
-  height 32
-  columns 16
-  set 1
-  frame 1
-}
-
-monsters {
-  width 16
-  height 32
-  columns 16
-  set 1
-  frame 1
-}
-
-capran {
-  width 16
-  height 32
-  columns 6
-  set 1
-  frame 1
-}
--- a/modules/vashram/sprites/N_tunnels.png
+++ b/modules/vashram/sprites/N_tunnels.png
--- a/modules/vashram/sprites/capran.png
+++ b/modules/vashram/sprites/capran.png
--- a/modules/vashram/sprites/decor.png
+++ b/modules/vashram/sprites/decor.png
--- a/modules/vashram/sprites/doors.png
+++ b/modules/vashram/sprites/doors.png
--- a/modules/vashram/sprites/equips.png
+++ b/modules/vashram/sprites/equips.png
--- a/modules/vashram/sprites/floors.png
+++ b/modules/vashram/sprites/floors.png
--- a/modules/vashram/sprites/floors_5kings.png
+++ b/modules/vashram/sprites/floors_5kings.png
--- a/modules/vashram/sprites/items.png
+++ b/modules/vashram/sprites/items.png
--- a/modules/vashram/sprites/monsters.png
+++ b/modules/vashram/sprites/monsters.png
--- a/modules/vashram/sprites/walls.png
+++ b/modules/vashram/sprites/walls.png
--- a/modules/vashram/vashram.tsd
+++ b/modules/vashram/vashram.tsd
@ -1,131 +0,0 @@
-0 {
-0 {
-vision 16
-equipment {
-macana, 1-1, 100.000000
-}
-name warrior
-race human
-slots H1F1N2S2A2a2h2D8w2T1W1L2l2f2
-inventory {
-gold, 4-12, 80.000000
-acco leaves, 1-3, 50.000000
-}
-stats S8D8C8I8W8c8
-}
-7 {
-name medicine man
-race manitou
-slots H1F1N2S2A2a2h2D8w2T1W1L2l2f2
-stats S8D8C8I8W8c8
-}
-12 {
-equipment {
-large macana, 1-1, 100.000000
-}
-name shock trooper
-race ibexian
-slots H1F1N2S2A2a2h2D8w2T1W1L2l2o2
-stats S10D8C10I6W6c6
-}
-17 {
-equipment {
-large macana, 1-1, 100.000000
-cloth armour, 1-1, 100.000000
-}
-name barbarian
-race ibexian
-slots H1F1N2S2A2a2h2D8w2T1W1L2l2o2
-stats S12D10C10I4W4c4
-}
-18 {
-name warrior
-race quosqoy
-slots H1F1N2S2A2a2h2D8w2T1W1L2l2f2
-stats S8D8C10I8W8c8
-}
-28 {
-name gunner
-race quosqo
-slots H1F1N2S2A2a2h2D8w2T1W1L2l2f2
-stats S6D8C10I10W8c8
-}
-}
-1 {
-0 {
-party nupii
-vision 4
-behavior 0
-hp 2+1d4
-equipment {
-small macana, 1-1, 10.000000
-cloth armour, 1-1, 25.000000
-}
-name nupi
-faction chthonic
-slots T1w2
-inventory {
-gold, 1-3, 5.000000
-}
-stats S6D6C8I4W4C4
-}
-}
-2 {
-0 {
-name small macana
-required_slots w1
-damage_mod P1d4
-skill slashing
-}
-1 {
-name large macana
-required_slots w2
-damage_mod P1d8
-skill slashing
-}
-16 {
-name cloth armour
-required_slots T1
-armour_mod P1
-}
-}
-3 {
-0 {
-name small key
-type 0
-}
-1 {
-name gold
-value 1
-}
-}
-4 {
-0 {
-name wooden door
-state 0
-}
-}
-5 {
-0 {
-name stone floor
-}
-}
-6 {
-0 {
-name stone wall
-}
-1 {
-name wood wall
-}
-}
-8 {
-0 {
-  name box
-}
-1 {
-  name sphere
-}
-2 {
-  name pyramid
-}
-}
--- a/tile_editor/sdl.c
+++ b/tile_editor/sdl.c
@ -3,7 +3,6 @@
 #include <SDL/SDL_image.h>
 #else
 #include <SDL_image.h>
-#include "CoreFoundation/CoreFoundation.h" // yee apple path rubbish
 #endif

 #include <SDL/SDL_syswm.h> // for wm hints
@ -20,27 +19,6 @@
 #include "../common/fio.h"

 int interfaceInit() {
-#ifdef __APPLE__
-  char path[PATH_MAX];
-  CFURLRef res = CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle());
-  CFURLGetFileSystemRepresentation(res, TRUE, (UInt8 *)path, PATH_MAX);
-  CFRelease(res);
-  // there's likely a better way to do this!
-  size_t path_len = strlen(path);
-  int p_i = path_len;
-  int p_c = 0;
-  while (p_i > 0) {
-    if (path[p_i] == '/') {
-      p_c++;
-    }
-    if (p_c == 3) break;
-    p_i--;
-  }
-  char bundle_path[p_i+1];
-  memcpy(bundle_path, path, p_i);
-  bundle_path[p_i] = '\0';
-  chdir(bundle_path);
-#endif 
  // TODO: move to newData function
  tiles_data = malloc(sizeof(struct Data));
  tiles_data->size = SET_SIZE;
--- a/xcode/build/timesynk.build/timesynk.pbxindex/categories.pbxbtree
+++ b/xcode/build/timesynk.build/timesynk.pbxindex/categories.pbxbtree
--- a/xcode/build/timesynk.build/timesynk.pbxindex/cdecls.pbxbtree
+++ b/xcode/build/timesynk.build/timesynk.pbxindex/cdecls.pbxbtree
--- a/xcode/build/timesynk.build/timesynk.pbxindex/decls.pbxbtree
+++ b/xcode/build/timesynk.build/timesynk.pbxindex/decls.pbxbtree
--- a/xcode/build/timesynk.build/timesynk.pbxindex/files.pbxbtree
+++ b/xcode/build/timesynk.build/timesynk.pbxindex/files.pbxbtree
--- a/xcode/build/timesynk.build/timesynk.pbxindex/imports.pbxbtree
+++ b/xcode/build/timesynk.build/timesynk.pbxindex/imports.pbxbtree
--- a/xcode/build/timesynk.build/timesynk.pbxindex/pbxindex.header
+++ b/xcode/build/timesynk.build/timesynk.pbxindex/pbxindex.header
--- a/xcode/build/timesynk.build/timesynk.pbxindex/refs.pbxbtree
+++ b/xcode/build/timesynk.build/timesynk.pbxindex/refs.pbxbtree
--- a/xcode/build/timesynk.build/timesynk.pbxindex/strings.pbxstrings/control
+++ b/xcode/build/timesynk.build/timesynk.pbxindex/strings.pbxstrings/control
--- a/xcode/build/timesynk.build/timesynk.pbxindex/strings.pbxstrings/strings
+++ b/xcode/build/timesynk.build/timesynk.pbxindex/strings.pbxstrings/strings
--- a/xcode/build/timesynk.build/timesynk.pbxindex/symbols0.pbxsymbols
+++ b/xcode/build/timesynk.build/timesynk.pbxindex/symbols0.pbxsymbols
--- a/xcode/timesynk.xcodeproj/kts.mode1v3
+++ b/xcode/timesynk.xcodeproj/kts.mode1v3
@ -228,6 +228,8 @@
 			<key>Layout</key>
 			<array>
 				<dict>
+					<key>BecomeActive</key>
+					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@ -274,13 +276,11 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>53</integer>
-									<integer>48</integer>
 									<integer>0</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 649}, {186, 493}}</string>
+							<string>{{0, 0}, {186, 493}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@ -310,14 +310,12 @@
 					<key>Dock</key>
 					<array>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>sdl.c</string>
+								<string>NSObjCRuntime.h</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@ -325,11 +323,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>sdl.c</string>
+										<string>NSObjCRuntime.h</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>2055A63D1A19E3490057BDAA</string>
+										<string>20D8CFE418D697380043F17D</string>
 										<key>history</key>
 										<array>
 											<string>206D60391808F3A600C0DE49</string>
@ -340,20 +338,17 @@
 											<string>2019284D187269BC006071D0</string>
 											<string>20F5B15C188C169700B9E39B</string>
 											<string>209EE344188D6D72007B3526</string>
+											<string>209EE345188D6D72007B3526</string>
 											<string>20B2EDCE18BCB09000A898D2</string>
 											<string>20B2EDF318BCB32C00A898D2</string>
 											<string>20B2EE0218BCB62700A898D2</string>
 											<string>20935BB118BEBF2000C1B0F9</string>
 											<string>207E2C9D18C556AF00EB3030</string>
+											<string>2065445918D1C4AF009927DC</string>
 											<string>2065445A18D1C4AF009927DC</string>
 											<string>2065445B18D1C4AF009927DC</string>
 											<string>2065446F18D1C616009927DC</string>
-											<string>2055A62C1A19E30B0057BDAA</string>
-											<string>2055A62D1A19E30B0057BDAA</string>
-											<string>2055A62E1A19E30B0057BDAA</string>
-											<string>2055A6391A19E3490057BDAA</string>
-											<string>2055A63A1A19E3490057BDAA</string>
-											<string>209EE345188D6D72007B3526</string>
+											<string>206EC09318D5030500724FCE</string>
 										</array>
 										<key>prevStack</key>
 										<array>
@ -378,11 +373,6 @@
 											<string>207E2CA118C556AF00EB3030</string>
 											<string>2065445D18D1C4AF009927DC</string>
 											<string>2065445E18D1C4AF009927DC</string>
-											<string>2055A6301A19E30B0057BDAA</string>
-											<string>2055A6311A19E30B0057BDAA</string>
-											<string>2055A6321A19E30B0057BDAA</string>
-											<string>2055A63B1A19E3490057BDAA</string>
-											<string>2055A63C1A19E3490057BDAA</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@ -440,9 +430,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>2055A6341A19E30B0057BDAA</string>
+				<string>20D8CFDB18D697100043F17D</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>2055A6351A19E30B0057BDAA</string>
+				<string>20D8CFDC18D697100043F17D</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@ -576,7 +566,6 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>1C78EAAD065D492600B07095</string>
 		<string>20F6A1B417E95A6200BAD261</string>
 		<string>1CD10A99069EF8BA00B06720</string>
 		<string>/Users/kts/Devel/timesynk/xcode/timesynk.xcodeproj</string>
@ -620,8 +609,6 @@
 							<string>218pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@ -661,7 +648,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>20F6A1B417E95A6200BAD261</string>
-				<string>2055A6231A19E22B0057BDAA</string>
+				<string>20D8CFDD18D697100043F17D</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@ -781,13 +768,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>2055A6241A19E22B0057BDAA</string>
+				<string>20D8CFDE18D697100043F17D</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>2055A6251A19E22B0057BDAA</string>
-				<string>2055A6261A19E22B0057BDAA</string>
-				<string>2055A6271A19E22B0057BDAA</string>
-				<string>2055A6281A19E22B0057BDAA</string>
-				<string>2055A6291A19E22B0057BDAA</string>
+				<string>20D8CFDF18D697100043F17D</string>
+				<string>20D8CFE018D697100043F17D</string>
+				<string>20D8CFE118D697100043F17D</string>
+				<string>20D8CFE218D697100043F17D</string>
+				<string>20D8CFE318D697100043F17D</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@ -949,7 +936,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>2055A6361A19E30B0057BDAA</string>
+				<string>206EC09E18D5030500724FCE</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
--- a/xcode/timesynk.xcodeproj/kts.pbxuser
+++ b/xcode/timesynk.xcodeproj/kts.pbxuser
@ -133,116 +133,6 @@
 			sepNavWindowFrame = "{{15, 183}, {750, 558}}";
 		};
 	};
-	2055A62C1A19E30B0057BDAA /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 20D8CFE518D697380043F17D /* NSObjCRuntime.h */;
-		name = "NSObjCRuntime.h: 60";
-		rLen = 17;
-		rLoc = 1535;
-		rType = 0;
-		vrLen = 984;
-		vrLoc = 1262;
-	};
-	2055A62D1A19E30B0057BDAA /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2065441018D1C0D0009927DC /* c_extra.c */;
-		name = "c_extra.c: 6";
-		rLen = 0;
-		rLoc = 115;
-		rType = 0;
-		vrLen = 411;
-		vrLoc = 771;
-	};
-	2055A62E1A19E30B0057BDAA /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2083B83C18867E7400A48B10 /* helper.h */;
-		name = "helper.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 304;
-		vrLoc = 0;
-	};
-	2055A6301A19E30B0057BDAA /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 20D8CFE518D697380043F17D /* NSObjCRuntime.h */;
-		name = "NSObjCRuntime.h: 60";
-		rLen = 17;
-		rLoc = 1535;
-		rType = 0;
-		vrLen = 984;
-		vrLoc = 1262;
-	};
-	2055A6311A19E30B0057BDAA /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2065441018D1C0D0009927DC /* c_extra.c */;
-		name = "c_extra.c: 6";
-		rLen = 0;
-		rLoc = 115;
-		rType = 0;
-		vrLen = 411;
-		vrLoc = 771;
-	};
-	2055A6321A19E30B0057BDAA /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2083B83C18867E7400A48B10 /* helper.h */;
-		name = "helper.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 304;
-		vrLoc = 0;
-	};
-	2055A6391A19E3490057BDAA /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2083B83B18867E7400A48B10 /* helper.c */;
-		name = "helper.c: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 633;
-		vrLoc = 0;
-	};
-	2055A63A1A19E3490057BDAA /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 208EB15618B8989D00CD2A39 /* interface.c */;
-		name = "interface.c: 97";
-		rLen = 0;
-		rLoc = 3256;
-		rType = 0;
-		vrLen = 961;
-		vrLoc = 2844;
-	};
-	2055A63B1A19E3490057BDAA /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2083B83B18867E7400A48B10 /* helper.c */;
-		name = "helper.c: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 633;
-		vrLoc = 0;
-	};
-	2055A63C1A19E3490057BDAA /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 208EB15618B8989D00CD2A39 /* interface.c */;
-		name = "interface.c: 97";
-		rLen = 0;
-		rLoc = 3256;
-		rType = 0;
-		vrLen = 961;
-		vrLoc = 2844;
-	};
-	2055A63D1A19E3490057BDAA /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 20EE4E24186EB1B0003FF203 /* sdl.c */;
-		name = "sdl.c: 50";
-		rLen = 0;
-		rLoc = 1358;
-		rType = 0;
-		vrLen = 1151;
-		vrLoc = 1171;
-	};
 	20568DD217EBE9490022F314 /* game.c */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {755, 2604}}";
@ -289,13 +179,6 @@
 		rLen = 0;
 		rLoc = 2147483647;
 	};
-	2065441018D1C0D0009927DC /* c_extra.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {726, 812}}";
-			sepNavSelRange = "{115, 0}";
-			sepNavVisRange = "{771, 411}";
-		};
-	};
 	2065441418D1C0D0009927DC /* fio.c */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1926, 1372}}";
@ -310,6 +193,16 @@
 			sepNavVisRange = "{0, 242}";
 		};
 	};
+	2065445918D1C4AF009927DC /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 208EB15618B8989D00CD2A39 /* interface.c */;
+		name = "interface.c: 98";
+		rLen = 0;
+		rLoc = 3256;
+		rType = 0;
+		vrLen = 696;
+		vrLoc = 2883;
+	};
 	2065445A18D1C4AF009927DC /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 2065441518D1C0D0009927DC /* fio.h */;
@ -401,6 +294,28 @@
 			sepNavVisRange = "{0, 492}";
 		};
 	};
+	206EC09318D5030500724FCE /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 206EC09418D5030500724FCE /* NSObjCRuntime.h */;
+		name = "NSObjCRuntime.h: 60";
+		rLen = 17;
+		rLoc = 1535;
+		rType = 0;
+		vrLen = 984;
+		vrLoc = 1262;
+	};
+	206EC09418D5030500724FCE /* NSObjCRuntime.h */ = {
+		isa = PBXFileReference;
+		lastKnownFileType = sourcecode.c.h;
+		name = NSObjCRuntime.h;
+		path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSObjCRuntime.h;
+		sourceTree = "<absolute>";
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {708, 1568}}";
+			sepNavSelRange = "{1535, 17}";
+			sepNavVisRange = "{1262, 984}";
+		};
+	};
 	207E2C9D18C556AF00EB3030 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 208EB15818B8989D00CD2A39 /* r_gl.c */;
@ -421,20 +336,6 @@
 		vrLen = 896;
 		vrLoc = 0;
 	};
-	2083B83B18867E7400A48B10 /* helper.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {726, 630}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 633}";
-		};
-	};
-	2083B83C18867E7400A48B10 /* helper.h */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {572, 350}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 304}";
-		};
-	};
 	208EB13718B8978C00CD2A39 /* engine */ = {
 		activeExec = 0;
 		executables = (
@ -485,9 +386,9 @@
 	};
 	208EB15618B8989D00CD2A39 /* interface.c */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {582, 3584}}";
+			sepNavIntBoundsRect = "{{0, 0}, {582, 3780}}";
 			sepNavSelRange = "{3256, 0}";
-			sepNavVisRange = "{2844, 961}";
+			sepNavVisRange = "{2883, 696}";
 		};
 	};
 	208EB15818B8989D00CD2A39 /* r_gl.c */ = {
@ -660,17 +561,21 @@
 		vrLen = 517;
 		vrLoc = 0;
 	};
+	20D8CFE418D697380043F17D /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 20D8CFE518D697380043F17D /* NSObjCRuntime.h */;
+		name = "NSObjCRuntime.h: 60";
+		rLen = 17;
+		rLoc = 1535;
+		rType = 0;
+		vrLen = 984;
+		vrLoc = 1262;
+	};
 	20D8CFE518D697380043F17D /* NSObjCRuntime.h */ = {
 		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.c.h;
 		name = NSObjCRuntime.h;
 		path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSObjCRuntime.h;
 		sourceTree = "<absolute>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {708, 1596}}";
-			sepNavSelRange = "{1535, 17}";
-			sepNavVisRange = "{1262, 984}";
-		};
 	};
 	20DE9D051804FE1A0047B2DD /* context.c */ = {
 		uiCtxt = {
@ -873,9 +778,9 @@
 	};
 	20EE4E24186EB1B0003FF203 /* sdl.c */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1308, 24752}}";
-			sepNavSelRange = "{1358, 0}";
-			sepNavVisRange = "{1171, 1151}";
+			sepNavIntBoundsRect = "{{0, 0}, {1182, 24080}}";
+			sepNavSelRange = "{65401, 0}";
+			sepNavVisRange = "{1191, 1049}";
 		};
 	};
 	20EE4E33186EB2CB003FF203 /* PBXTextBookmark */ = {
@ -1030,8 +935,8 @@
 	};
 	29B97313FDCFA39411CA2CEA /* Project object */ = {
 		activeBuildConfigurationName = Debug;
-		activeExecutable = 20EE4DD9186EA8AD003FF203 /* Tile Editor */;
-		activeTarget = 20EE4DD7186EA8AC003FF203 /* Tile Editor */;
+		activeExecutable = 208EB13918B8978C00CD2A39 /* engine */;
+		activeTarget = 208EB13718B8978C00CD2A39 /* engine */;
 		addToTargets = (
 			208EB13718B8978C00CD2A39 /* engine */,
 		);
@ -1142,25 +1047,15 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 437903842;
-			PBXWorkspaceStateSaveDate = 437903842;
+			PBXPerProjectTemplateStateSaveDate = 416716534;
+			PBXWorkspaceStateSaveDate = 416716534;
 		};
 		perUserProjectItems = {
 			2019284D187269BC006071D0 /* PlistBookmark */ = 2019284D187269BC006071D0 /* PlistBookmark */;
 			2019284E187269BC006071D0 /* PlistBookmark */ = 2019284E187269BC006071D0 /* PlistBookmark */;
 			203BB50318BCB8B200E4829F /* PBXTextBookmark */ = 203BB50318BCB8B200E4829F /* PBXTextBookmark */;
-			2055A62C1A19E30B0057BDAA /* PBXTextBookmark */ = 2055A62C1A19E30B0057BDAA /* PBXTextBookmark */;
-			2055A62D1A19E30B0057BDAA /* PBXTextBookmark */ = 2055A62D1A19E30B0057BDAA /* PBXTextBookmark */;
-			2055A62E1A19E30B0057BDAA /* PBXTextBookmark */ = 2055A62E1A19E30B0057BDAA /* PBXTextBookmark */;
-			2055A6301A19E30B0057BDAA /* PBXTextBookmark */ = 2055A6301A19E30B0057BDAA /* PBXTextBookmark */;
-			2055A6311A19E30B0057BDAA /* PBXTextBookmark */ = 2055A6311A19E30B0057BDAA /* PBXTextBookmark */;
-			2055A6321A19E30B0057BDAA /* PBXTextBookmark */ = 2055A6321A19E30B0057BDAA /* PBXTextBookmark */;
-			2055A6391A19E3490057BDAA /* PBXTextBookmark */ = 2055A6391A19E3490057BDAA /* PBXTextBookmark */;
-			2055A63A1A19E3490057BDAA /* PBXTextBookmark */ = 2055A63A1A19E3490057BDAA /* PBXTextBookmark */;
-			2055A63B1A19E3490057BDAA /* PBXTextBookmark */ = 2055A63B1A19E3490057BDAA /* PBXTextBookmark */;
-			2055A63C1A19E3490057BDAA /* PBXTextBookmark */ = 2055A63C1A19E3490057BDAA /* PBXTextBookmark */;
-			2055A63D1A19E3490057BDAA /* PBXTextBookmark */ = 2055A63D1A19E3490057BDAA /* PBXTextBookmark */;
 			205AF3B918167E1100F6F9FF /* PlistBookmark */ = 205AF3B918167E1100F6F9FF /* PlistBookmark */;
+			2065445918D1C4AF009927DC /* PBXTextBookmark */ = 2065445918D1C4AF009927DC /* PBXTextBookmark */;
 			2065445A18D1C4AF009927DC /* PBXTextBookmark */ = 2065445A18D1C4AF009927DC /* PBXTextBookmark */;
 			2065445B18D1C4AF009927DC /* PBXTextBookmark */ = 2065445B18D1C4AF009927DC /* PBXTextBookmark */;
 			2065445D18D1C4AF009927DC /* PBXTextBookmark */ = 2065445D18D1C4AF009927DC /* PBXTextBookmark */;
@ -1168,6 +1063,7 @@
 			2065446F18D1C616009927DC /* PBXTextBookmark */ = 2065446F18D1C616009927DC /* PBXTextBookmark */;
 			206D5FB01808EAE800C0DE49 /* PBXTextBookmark */ = 206D5FB01808EAE800C0DE49 /* PBXTextBookmark */;
 			206D60391808F3A600C0DE49 /* PBXTextBookmark */ = 206D60391808F3A600C0DE49 /* PBXTextBookmark */;
+			206EC09318D5030500724FCE /* PBXTextBookmark */ = 206EC09318D5030500724FCE /* PBXTextBookmark */;
 			207E2C9D18C556AF00EB3030 /* PBXTextBookmark */ = 207E2C9D18C556AF00EB3030 /* PBXTextBookmark */;
 			207E2CA118C556AF00EB3030 /* PBXTextBookmark */ = 207E2CA118C556AF00EB3030 /* PBXTextBookmark */;
 			2090289F17E95F9E0051A253 /* PBXTextBookmark */ = 2090289F17E95F9E0051A253 /* PBXTextBookmark */;
@ -1182,6 +1078,7 @@
 			20B2EDF318BCB32C00A898D2 /* PBXTextBookmark */ = 20B2EDF318BCB32C00A898D2 /* PBXTextBookmark */;
 			20B2EDF518BCB32C00A898D2 /* PBXTextBookmark */ = 20B2EDF518BCB32C00A898D2 /* PBXTextBookmark */;
 			20B2EE0218BCB62700A898D2 /* PBXTextBookmark */ = 20B2EE0218BCB62700A898D2 /* PBXTextBookmark */;
+			20D8CFE418D697380043F17D /* PBXTextBookmark */ = 20D8CFE418D697380043F17D /* PBXTextBookmark */;
 			20E4F80818777D6600D8069C /* PBXTextBookmark */ = 20E4F80818777D6600D8069C /* PBXTextBookmark */;
 			20EE4DC4186531B7003FF203 /* PBXTextBookmark */ = 20EE4DC4186531B7003FF203 /* PBXTextBookmark */;
 			20EE4DC6186531B7003FF203 /* PBXTextBookmark */ = 20EE4DC6186531B7003FF203 /* PBXTextBookmark */;
--- a/xcode/timesynk.xcodeproj/project.pbxproj
+++ b/xcode/timesynk.xcodeproj/project.pbxproj
@ -39,6 +39,7 @@
 		206D60451808F90700C0DE49 /* tiles.c in Sources */ = {isa = PBXBuildFile; fileRef = 206D60431808F90700C0DE49 /* tiles.c */; };
 		206EC08D18D3B20F00724FCE /* timer.c in Sources */ = {isa = PBXBuildFile; fileRef = 206EC08B18D3B20F00724FCE /* timer.c */; };
 		207431991835AEBD006BB9A4 /* SDL_image.framework in Copy Frameworks into .app bundle */ = {isa = PBXBuildFile; fileRef = 206D60281808F0E200C0DE49 /* SDL_image.framework */; };
+		2083B83D18867E7400A48B10 /* helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 2083B83B18867E7400A48B10 /* helper.c */; };
 		208764551825B1E700F17207 /* message.c in Sources */ = {isa = PBXBuildFile; fileRef = 208764531825B1E700F17207 /* message.c */; };
 		208EB13E18B897B000CD2A39 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 206D60281808F0E200C0DE49 /* SDL_image.framework */; };
 		208EB13F18B897B400CD2A39 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 002F39F909D0881F00EBEB88 /* SDL.framework */; };
@ -638,6 +639,7 @@
 				20EE4E27186EB1B0003FF203 /* sdl.c in Sources */,
 				2019284918726971006071D0 /* elements.c in Sources */,
 				201928A618727769006071D0 /* font.c in Sources */,
+				2083B83D18867E7400A48B10 /* helper.c in Sources */,
 				2065441C18D1C0D0009927DC /* c_extra.c in Sources */,
 				2065441E18D1C0D0009927DC /* fio.c in Sources */,
 				2065441F18D1C0D0009927DC /* llist.c in Sources */,
				`@ -1 +0,0 @@`
				`Subproject commit 90a0b3b4846cd3a761acf34b900c4a0ee8848624`