Added engine as a target for the xcode project. SDL_Surface to OpenGL Texture function now packs pixel data according to the endianness of the machine, as acquired from a run-time test in the function. This should probably be checked for on start and have an appropriate system flag set.

engine/sdl/r_gl.c

@@ -143,7 +143,10 @@ GLuint r_gl_createTexture(GLuint *texture, SDL_Surface *surface) {
   // set stretching properties
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
+  // get the appropriate endianness for data packing
-  glTexImage2D(GL_TEXTURE_2D, 0, colors, surface->w, surface->h, 0, format, GL_UNSIGNED_BYTE, surface->pixels);
+  int num = 1;
+  int pack_type = ( (*(char*)&num == 1) ? GL_UNSIGNED_INT_8_8_8_8 : GL_UNSIGNED_INT_8_8_8_8_REV);
+  // copy it over! :)
+  glTexImage2D(GL_TEXTURE_2D, 0, colors, surface->w, surface->h, 0, format, pack_type, surface->pixels);
   return *texture;
 }

xcode/engine-Info.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.${PRODUCT_NAME:identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

xcode/timesynk.xcodeproj/kts.mode1v3

@@ -264,20 +264,24 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
 							<array>
 								<string>29B97314FDCFA39411CA2CEA</string>
-								<string>29B97315FDCFA39411CA2CEA</string>
 								<string>29B97317FDCFA39411CA2CEA</string>
 								<string>1C37FBAC04509CD000000102</string>
+								<string>20A19DB218B8A04500FAE3FF</string>
+								<string>20A19DB318B8A04500FAE3FF</string>
 								<string>1C37FAAC04509CD000000102</string>
 								<string>1C37FABC05509CD000000102</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>0</integer>
+									<integer>48</integer>
+									<integer>40</integer>
+									<integer>38</integer>
+									<integer>35</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {186, 364}}</string>
+							<string>{{0, 628}, {186, 364}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -307,12 +311,14 @@
 					<key>Dock</key>
 					<array>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>tiles.h</string>
+								<string>r_gl.c</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -320,11 +326,11 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>tiles.h</string>
+										<string>r_gl.c</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>209EE34D188D6D72007B3526</string>
+										<string>20A19DC218B8A06000FAE3FF</string>
 										<key>history</key>
 										<array>
 											<string>206D60391808F3A600C0DE49</string>
@@ -363,7 +369,9 @@
 											<string>209EE344188D6D72007B3526</string>
 											<string>209EE345188D6D72007B3526</string>
 											<string>209EE346188D6D72007B3526</string>
-											<string>206D60B4180907AC00C0DE49</string>
+											<string>20A19DB418B8A04500FAE3FF</string>
+											<string>20A19DB518B8A04500FAE3FF</string>
+											<string>20A19DB618B8A04500FAE3FF</string>
 										</array>
 										<key>prevStack</key>
 										<array>
@@ -407,9 +415,8 @@
 											<string>20EE4E3D186EB345003FF203</string>
 											<string>2019284E187269BC006071D0</string>
 											<string>20E4F80818777D6600D8069C</string>
-											<string>209EE347188D6D72007B3526</string>
+											<string>20A19DB718B8A04500FAE3FF</string>
-											<string>209EE348188D6D72007B3526</string>
+											<string>20A19DB818B8A04500FAE3FF</string>
-											<string>209EE349188D6D72007B3526</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -431,8 +438,6 @@
 							<string>253pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -469,9 +474,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>209EE333188D6BBE007B3526</string>
+				<string>20A19D9D18B8999300FAE3FF</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>209EE334188D6BBE007B3526</string>
+				<string>20A19D9E18B8999300FAE3FF</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -605,8 +610,6 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
-		<string>209EE34B188D6D72007B3526</string>
-		<string>209EE34C188D6D72007B3526</string>
 		<string>1C78EAAD065D492600B07095</string>
 		<string>1CD10A99069EF8BA00B06720</string>
 		<string>20F6A1B417E95A6200BAD261</string>
@@ -690,7 +693,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>20F6A1B417E95A6200BAD261</string>
-				<string>209EE335188D6BBE007B3526</string>
+				<string>20A19DBA18B8A04500FAE3FF</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -810,13 +813,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>209EE336188D6BBE007B3526</string>
+				<string>20A19DBB18B8A04500FAE3FF</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>209EE337188D6BBE007B3526</string>
+				<string>20A19DBC18B8A04500FAE3FF</string>
-				<string>209EE338188D6BBE007B3526</string>
+				<string>20A19DBD18B8A04500FAE3FF</string>
-				<string>209EE339188D6BBE007B3526</string>
+				<string>20A19DBE18B8A04500FAE3FF</string>
-				<string>209EE33A188D6BBE007B3526</string>
+				<string>20A19DBF18B8A04500FAE3FF</string>
-				<string>209EE33B188D6BBE007B3526</string>
+				<string>20A19DC018B8A04500FAE3FF</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -978,7 +981,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>209EE33C188D6BBE007B3526</string>
+				<string>20A19DC118B8A04500FAE3FF</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>

xcode/timesynk.xcodeproj/kts.pbxuser

@@ -22,6 +22,13 @@
 			sepNavWindowFrame = "{{15, 439}, {750, 558}}";
 		};
 	};
+	20052FFF18895AAE0036C1D2 /* data.c */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {2256, 10066}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 833}";
+		};
+	};
 	2007C93017ECF2EB00268653 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 20568DD417EBE9490022F314 /* player.c */;
@@ -480,16 +487,6 @@
 		vrLen = 1852;
 		vrLoc = 0;
 	};
-	206D60B4180907AC00C0DE49 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 206D60441808F90700C0DE49 /* tiles.h */;
-		name = "tiles.h: 4";
-		rLen = 0;
-		rLoc = 76;
-		rType = 0;
-		vrLen = 154;
-		vrLoc = 0;
-	};
 	206D60B7180907AC00C0DE49 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 206D60431808F90700C0DE49 /* tiles.c */;
@@ -510,6 +507,50 @@
 		vrLen = 865;
 		vrLoc = 4069;
 	};
+	208EB13718B8978C00CD2A39 /* engine */ = {
+		activeExec = 0;
+		executables = (
+			208EB13918B8978C00CD2A39 /* engine */,
+		);
+	};
+	208EB13918B8978C00CD2A39 /* engine */ = {
+		isa = PBXExecutable;
+		activeArgIndices = (
+		);
+		argumentStrings = (
+		);
+		autoAttachOnCrash = 1;
+		breakpointsEnabled = 0;
+		configStateDict = {
+		};
+		customDataFormattersEnabled = 1;
+		debuggerPlugin = GDBDebugging;
+		disassemblyDisplayState = 0;
+		dylibVariantSuffix = "";
+		enableDebugStr = 1;
+		environmentEntries = (
+		);
+		executableSystemSymbolLevel = 0;
+		executableUserSymbolLevel = 0;
+		libgmallocEnabled = 0;
+		name = engine;
+		sourceDirectories = (
+		);
+	};
+	208EB15618B8989D00CD2A39 /* interface.c */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {541, 2506}}";
+			sepNavSelRange = "{246, 0}";
+			sepNavVisRange = "{449, 458}";
+		};
+	};
+	208EB15818B8989D00CD2A39 /* r_gl.c */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {636, 2170}}";
+			sepNavSelRange = "{4612, 0}";
+			sepNavVisRange = "{3996, 616}";
+		};
+	};
 	2090287B17E95E780051A253 /* timesynk_Prefix.pch */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {600, 221}}";
@@ -592,37 +633,7 @@
 		vrLen = 519;
 		vrLoc = 856;
 	};
-	209EE347188D6D72007B3526 /* PBXTextBookmark */ = {
+	20A19DB418B8A04500FAE3FF /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 2019284718726971006071D0 /* elements.c */;
-		name = "elements.c: 320";
-		rLen = 0;
-		rLoc = 10454;
-		rType = 0;
-		vrLen = 452;
-		vrLoc = 10463;
-	};
-	209EE348188D6D72007B3526 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 20EE4E24186EB1B0003FF203 /* sdl.c */;
-		name = "sdl.c: 1727";
-		rLen = 0;
-		rLoc = 65401;
-		rType = 0;
-		vrLen = 1049;
-		vrLoc = 1191;
-	};
-	209EE349188D6D72007B3526 /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = 20568DD417EBE9490022F314 /* player.c */;
-		name = "player.c: 24";
-		rLen = 0;
-		rLoc = 762;
-		rType = 0;
-		vrLen = 519;
-		vrLoc = 856;
-	};
-	209EE34D188D6D72007B3526 /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = 206D60441808F90700C0DE49 /* tiles.h */;
 		name = "tiles.h: 1";
@@ -632,6 +643,56 @@
 		vrLen = 492;
 		vrLoc = 0;
 	};
+	20A19DB518B8A04500FAE3FF /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 208EB15618B8989D00CD2A39 /* interface.c */;
+		name = "interface.c: 12";
+		rLen = 0;
+		rLoc = 246;
+		rType = 0;
+		vrLen = 458;
+		vrLoc = 449;
+	};
+	20A19DB618B8A04500FAE3FF /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 208EB15818B8989D00CD2A39 /* r_gl.c */;
+		name = "r_gl.c: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 409;
+		vrLoc = 0;
+	};
+	20A19DB718B8A04500FAE3FF /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 206D60441808F90700C0DE49 /* tiles.h */;
+		name = "tiles.h: 1";
+		rLen = 0;
+		rLoc = 76;
+		rType = 0;
+		vrLen = 492;
+		vrLoc = 0;
+	};
+	20A19DB818B8A04500FAE3FF /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 208EB15618B8989D00CD2A39 /* interface.c */;
+		name = "interface.c: 12";
+		rLen = 0;
+		rLoc = 246;
+		rType = 0;
+		vrLen = 458;
+		vrLoc = 449;
+	};
+	20A19DC218B8A06000FAE3FF /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 208EB15818B8989D00CD2A39 /* r_gl.c */;
+		name = "r_gl.c: 153";
+		rLen = 0;
+		rLoc = 4612;
+		rType = 0;
+		vrLen = 616;
+		vrLoc = 3996;
+	};
 	20A770E9183786F100BC220B /* inventory.c */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1266, 2254}}";
@@ -1227,11 +1288,10 @@
 	};
 	29B97313FDCFA39411CA2CEA /* Project object */ = {
 		activeBuildConfigurationName = Debug;
-		activeExecutable = 20EE4DD9186EA8AD003FF203 /* Tile Editor */;
+		activeExecutable = 208EB13918B8978C00CD2A39 /* engine */;
-		activeTarget = 20EE4DD7186EA8AC003FF203 /* Tile Editor */;
+		activeTarget = 208EB13718B8978C00CD2A39 /* engine */;
 		addToTargets = (
-			20EE4DD7186EA8AC003FF203 /* Tile Editor */,
+			208EB13718B8978C00CD2A39 /* engine */,
-			8D1107260486CEB800E47090 /* timesynk */,
 		);
 		breakpoints = (
 		);
@@ -1239,6 +1299,7 @@
 		executables = (
 			20F6A19417E9598B00BAD261 /* timesynk */,
 			20EE4DD9186EA8AD003FF203 /* Tile Editor */,
+			208EB13918B8978C00CD2A39 /* engine */,
 		);
 		perUserDictionary = {
 			"PBXConfiguration.PBXBreakpointsDataSource.v1:1CA1AED706398EBD00589147" = {
@@ -1339,8 +1400,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 411921324;
+			PBXPerProjectTemplateStateSaveDate = 414751118;
-			PBXWorkspaceStateSaveDate = 411921324;
+			PBXWorkspaceStateSaveDate = 414751118;
 		};
 		perUserProjectItems = {
 			2007C93017ECF2EB00268653 /* PBXTextBookmark */ = 2007C93017ECF2EB00268653 /* PBXTextBookmark */;
@@ -1375,7 +1436,6 @@
 			206D605B1808F99A00C0DE49 /* PBXTextBookmark */ = 206D605B1808F99A00C0DE49 /* PBXTextBookmark */;
 			206D6096180904FB00C0DE49 /* PBXTextBookmark */ = 206D6096180904FB00C0DE49 /* PBXTextBookmark */;
 			206D60B3180907AC00C0DE49 /* PBXTextBookmark */ = 206D60B3180907AC00C0DE49 /* PBXTextBookmark */;
-			206D60B4180907AC00C0DE49 /* PBXTextBookmark */ = 206D60B4180907AC00C0DE49 /* PBXTextBookmark */;
 			206D60B7180907AC00C0DE49 /* PBXTextBookmark */ = 206D60B7180907AC00C0DE49 /* PBXTextBookmark */;
 			207ADF7718323F5F006C2888 /* PBXTextBookmark */ = 207ADF7718323F5F006C2888 /* PBXTextBookmark */;
 			2090289E17E95F9E0051A253 /* PBXTextBookmark */ = 2090289E17E95F9E0051A253 /* PBXTextBookmark */;
@@ -1384,10 +1444,12 @@
 			209EE344188D6D72007B3526 /* PBXTextBookmark */ = 209EE344188D6D72007B3526 /* PBXTextBookmark */;
 			209EE345188D6D72007B3526 /* PBXTextBookmark */ = 209EE345188D6D72007B3526 /* PBXTextBookmark */;
 			209EE346188D6D72007B3526 /* PBXTextBookmark */ = 209EE346188D6D72007B3526 /* PBXTextBookmark */;
-			209EE347188D6D72007B3526 /* PBXTextBookmark */ = 209EE347188D6D72007B3526 /* PBXTextBookmark */;
+			20A19DB418B8A04500FAE3FF /* PBXTextBookmark */ = 20A19DB418B8A04500FAE3FF /* PBXTextBookmark */;
-			209EE348188D6D72007B3526 /* PBXTextBookmark */ = 209EE348188D6D72007B3526 /* PBXTextBookmark */;
+			20A19DB518B8A04500FAE3FF /* PBXTextBookmark */ = 20A19DB518B8A04500FAE3FF /* PBXTextBookmark */;
-			209EE349188D6D72007B3526 /* PBXTextBookmark */ = 209EE349188D6D72007B3526 /* PBXTextBookmark */;
+			20A19DB618B8A04500FAE3FF /* PBXTextBookmark */ = 20A19DB618B8A04500FAE3FF /* PBXTextBookmark */;
-			209EE34D188D6D72007B3526 /* PBXTextBookmark */ = 209EE34D188D6D72007B3526 /* PBXTextBookmark */;
+			20A19DB718B8A04500FAE3FF /* PBXTextBookmark */ = 20A19DB718B8A04500FAE3FF /* PBXTextBookmark */;
+			20A19DB818B8A04500FAE3FF /* PBXTextBookmark */ = 20A19DB818B8A04500FAE3FF /* PBXTextBookmark */;
+			20A19DC218B8A06000FAE3FF /* PBXTextBookmark */ = 20A19DC218B8A06000FAE3FF /* PBXTextBookmark */;
 			20A770F81837870D00BC220B /* PBXTextBookmark */ = 20A770F81837870D00BC220B /* PBXTextBookmark */;
 			20A770FB1837870D00BC220B /* PBXTextBookmark */ = 20A770FB1837870D00BC220B /* PBXTextBookmark */;
 			20CD05AE180FBCD8005A8231 /* PBXTextBookmark */ = 20CD05AE180FBCD8005A8231 /* PBXTextBookmark */;

xcode/timesynk.xcodeproj/project.pbxproj

@@ -27,6 +27,28 @@
 		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 */; };
+		208EB14018B897B800CD2A39 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20EE4DE0186EA90C003FF203 /* Cocoa.framework */; };
+		208EB14118B8984400CD2A39 /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 002F3A2C09D0888800EBEB88 /* SDLMain.m */; };
+		208EB14218B8984400CD2A39 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
+		208EB14318B8984400CD2A39 /* SDLMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 002F3AEF09D08F1000EBEB88 /* SDLMain.nib */; };
+		208EB16618B8989D00CD2A39 /* c_extra.c in Sources */ = {isa = PBXBuildFile; fileRef = 208EB14618B8989D00CD2A39 /* c_extra.c */; };
+		208EB16718B8989D00CD2A39 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 208EB14A18B8989D00CD2A39 /* main.c */; };
+		208EB16818B8989D00CD2A39 /* badfont_large.png in Resources */ = {isa = PBXBuildFile; fileRef = 208EB14C18B8989D00CD2A39 /* badfont_large.png */; };
+		208EB16918B8989D00CD2A39 /* badfont_large_png.c in Sources */ = {isa = PBXBuildFile; fileRef = 208EB14D18B8989D00CD2A39 /* badfont_large_png.c */; };
+		208EB16A18B8989D00CD2A39 /* badfont_medium.png in Resources */ = {isa = PBXBuildFile; fileRef = 208EB14F18B8989D00CD2A39 /* badfont_medium.png */; };
+		208EB16B18B8989D00CD2A39 /* badfont_medium_png.c in Sources */ = {isa = PBXBuildFile; fileRef = 208EB15018B8989D00CD2A39 /* badfont_medium_png.c */; };
+		208EB16C18B8989D00CD2A39 /* ui.png in Resources */ = {isa = PBXBuildFile; fileRef = 208EB15218B8989D00CD2A39 /* ui.png */; };
+		208EB16D18B8989D00CD2A39 /* font.c in Sources */ = {isa = PBXBuildFile; fileRef = 208EB15418B8989D00CD2A39 /* font.c */; };
+		208EB16E18B8989D00CD2A39 /* interface.c in Sources */ = {isa = PBXBuildFile; fileRef = 208EB15618B8989D00CD2A39 /* interface.c */; };
+		208EB16F18B8989D00CD2A39 /* r_gl.c in Sources */ = {isa = PBXBuildFile; fileRef = 208EB15818B8989D00CD2A39 /* r_gl.c */; };
+		208EB17018B8989D00CD2A39 /* r_soft.c in Sources */ = {isa = PBXBuildFile; fileRef = 208EB15A18B8989D00CD2A39 /* r_soft.c */; };
+		208EB17118B8989D00CD2A39 /* sdl_extra.c in Sources */ = {isa = PBXBuildFile; fileRef = 208EB15C18B8989D00CD2A39 /* sdl_extra.c */; };
+		208EB17218B8989D00CD2A39 /* spritesheets.c in Sources */ = {isa = PBXBuildFile; fileRef = 208EB15E18B8989D00CD2A39 /* spritesheets.c */; };
+		208EB17318B8989D00CD2A39 /* state_menu.c in Sources */ = {isa = PBXBuildFile; fileRef = 208EB16018B8989D00CD2A39 /* state_menu.c */; };
+		208EB17418B8989D00CD2A39 /* elements.c in Sources */ = {isa = PBXBuildFile; fileRef = 208EB16418B8989D00CD2A39 /* elements.c */; };
+		208EB17918B8990300CD2A39 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 208EB17818B8990300CD2A39 /* OpenGL.framework */; };
 		209A27C81812257000B15CEC /* npc.c in Sources */ = {isa = PBXBuildFile; fileRef = 209A27C61812256F00B15CEC /* npc.c */; };
 		20A770EB183786F100BC220B /* inventory.c in Sources */ = {isa = PBXBuildFile; fileRef = 20A770E9183786F100BC220B /* inventory.c */; };
 		20DE9D071804FE1A0047B2DD /* context.c in Sources */ = {isa = PBXBuildFile; fileRef = 20DE9D051804FE1A0047B2DD /* context.c */; };
@@ -100,6 +122,38 @@
 		2083B83C18867E7400A48B10 /* helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = helper.h; path = ../tile_editor/helper.h; sourceTree = SOURCE_ROOT; };
 		208764531825B1E700F17207 /* message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = message.c; path = ../message.c; sourceTree = SOURCE_ROOT; };
 		208764541825B1E700F17207 /* message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = message.h; path = ../message.h; sourceTree = SOURCE_ROOT; };
+		208EB13818B8978C00CD2A39 /* engine.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = engine.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		208EB13A18B8978C00CD2A39 /* engine-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "engine-Info.plist"; sourceTree = "<group>"; };
+		208EB14618B8989D00CD2A39 /* c_extra.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = c_extra.c; path = ../engine/c_extra.c; sourceTree = SOURCE_ROOT; };
+		208EB14718B8989D00CD2A39 /* c_extra.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = c_extra.h; path = ../engine/c_extra.h; sourceTree = SOURCE_ROOT; };
+		208EB14818B8989D00CD2A39 /* globals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = globals.h; path = ../engine/globals.h; sourceTree = SOURCE_ROOT; };
+		208EB14918B8989D00CD2A39 /* interfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interfaces.h; path = ../engine/interfaces.h; sourceTree = SOURCE_ROOT; };
+		208EB14A18B8989D00CD2A39 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../engine/main.c; sourceTree = SOURCE_ROOT; };
+		208EB14C18B8989D00CD2A39 /* badfont_large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = badfont_large.png; sourceTree = "<group>"; };
+		208EB14D18B8989D00CD2A39 /* badfont_large_png.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = badfont_large_png.c; sourceTree = "<group>"; };
+		208EB14E18B8989D00CD2A39 /* badfont_large_png.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = badfont_large_png.h; sourceTree = "<group>"; };
+		208EB14F18B8989D00CD2A39 /* badfont_medium.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = badfont_medium.png; sourceTree = "<group>"; };
+		208EB15018B8989D00CD2A39 /* badfont_medium_png.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = badfont_medium_png.c; sourceTree = "<group>"; };
+		208EB15118B8989D00CD2A39 /* badfont_medium_png.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = badfont_medium_png.h; sourceTree = "<group>"; };
+		208EB15218B8989D00CD2A39 /* ui.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ui.png; sourceTree = "<group>"; };
+		208EB15418B8989D00CD2A39 /* font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = font.c; sourceTree = "<group>"; };
+		208EB15518B8989D00CD2A39 /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = "<group>"; };
+		208EB15618B8989D00CD2A39 /* interface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = interface.c; sourceTree = "<group>"; };
+		208EB15718B8989D00CD2A39 /* interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = interface.h; sourceTree = "<group>"; };
+		208EB15818B8989D00CD2A39 /* r_gl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = r_gl.c; sourceTree = "<group>"; };
+		208EB15918B8989D00CD2A39 /* r_gl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = r_gl.h; sourceTree = "<group>"; };
+		208EB15A18B8989D00CD2A39 /* r_soft.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = r_soft.c; sourceTree = "<group>"; };
+		208EB15B18B8989D00CD2A39 /* r_soft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = r_soft.h; sourceTree = "<group>"; };
+		208EB15C18B8989D00CD2A39 /* sdl_extra.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdl_extra.c; sourceTree = "<group>"; };
+		208EB15D18B8989D00CD2A39 /* sdl_extra.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdl_extra.h; sourceTree = "<group>"; };
+		208EB15E18B8989D00CD2A39 /* spritesheets.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = spritesheets.c; sourceTree = "<group>"; };
+		208EB15F18B8989D00CD2A39 /* spritesheets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = spritesheets.h; sourceTree = "<group>"; };
+		208EB16018B8989D00CD2A39 /* state_menu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = state_menu.c; path = ../engine/state_menu.c; sourceTree = SOURCE_ROOT; };
+		208EB16118B8989D00CD2A39 /* state_menu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = state_menu.h; path = ../engine/state_menu.h; sourceTree = SOURCE_ROOT; };
+		208EB16218B8989D00CD2A39 /* ts_event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ts_event.h; path = ../engine/ts_event.h; sourceTree = SOURCE_ROOT; };
+		208EB16418B8989D00CD2A39 /* elements.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = elements.c; sourceTree = "<group>"; };
+		208EB16518B8989D00CD2A39 /* elements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = elements.h; sourceTree = "<group>"; };
+		208EB17818B8990300CD2A39 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		2090287B17E95E780051A253 /* timesynk_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timesynk_Prefix.pch; sourceTree = "<group>"; };
 		209A27C61812256F00B15CEC /* npc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = npc.c; path = ../npc.c; sourceTree = SOURCE_ROOT; };
 		209A27C71812256F00B15CEC /* npc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = npc.h; path = ../npc.h; sourceTree = SOURCE_ROOT; };
@@ -132,6 +186,17 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		208EB13618B8978C00CD2A39 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				208EB13E18B897B000CD2A39 /* SDL_image.framework in Frameworks */,
+				208EB13F18B897B400CD2A39 /* SDL.framework in Frameworks */,
+				208EB14018B897B800CD2A39 /* Cocoa.framework in Frameworks */,
+				208EB17918B8990300CD2A39 /* OpenGL.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		20EE4DD6186EA8AC003FF203 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -194,13 +259,70 @@
 			children = (
 				8D1107320486CEB800E47090 /* timesynk.app */,
 				20EE4DD8186EA8AC003FF203 /* Tile Editor.app */,
+				208EB13818B8978C00CD2A39 /* engine.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
+		208EB14B18B8989D00CD2A39 /* resources */ = {
+			isa = PBXGroup;
+			children = (
+				208EB14C18B8989D00CD2A39 /* badfont_large.png */,
+				208EB14D18B8989D00CD2A39 /* badfont_large_png.c */,
+				208EB14E18B8989D00CD2A39 /* badfont_large_png.h */,
+				208EB14F18B8989D00CD2A39 /* badfont_medium.png */,
+				208EB15018B8989D00CD2A39 /* badfont_medium_png.c */,
+				208EB15118B8989D00CD2A39 /* badfont_medium_png.h */,
+				208EB15218B8989D00CD2A39 /* ui.png */,
+			);
+			name = resources;
+			path = ../engine/resources;
+			sourceTree = SOURCE_ROOT;
+		};
+		208EB15318B8989D00CD2A39 /* sdl */ = {
+			isa = PBXGroup;
+			children = (
+				208EB15418B8989D00CD2A39 /* font.c */,
+				208EB15518B8989D00CD2A39 /* font.h */,
+				208EB15618B8989D00CD2A39 /* interface.c */,
+				208EB15718B8989D00CD2A39 /* interface.h */,
+				208EB15818B8989D00CD2A39 /* r_gl.c */,
+				208EB15918B8989D00CD2A39 /* r_gl.h */,
+				208EB15A18B8989D00CD2A39 /* r_soft.c */,
+				208EB15B18B8989D00CD2A39 /* r_soft.h */,
+				208EB15C18B8989D00CD2A39 /* sdl_extra.c */,
+				208EB15D18B8989D00CD2A39 /* sdl_extra.h */,
+				208EB15E18B8989D00CD2A39 /* spritesheets.c */,
+				208EB15F18B8989D00CD2A39 /* spritesheets.h */,
+			);
+			name = sdl;
+			path = ../engine/sdl;
+			sourceTree = SOURCE_ROOT;
+		};
+		208EB16318B8989D00CD2A39 /* ui */ = {
+			isa = PBXGroup;
+			children = (
+				208EB16418B8989D00CD2A39 /* elements.c */,
+				208EB16518B8989D00CD2A39 /* elements.h */,
+			);
+			name = ui;
+			path = ../engine/ui;
+			sourceTree = SOURCE_ROOT;
+		};
 		29B97314FDCFA39411CA2CEA /* SDL_test */ = {
 			isa = PBXGroup;
 			children = (
+				208EB14618B8989D00CD2A39 /* c_extra.c */,
+				208EB14718B8989D00CD2A39 /* c_extra.h */,
+				208EB14818B8989D00CD2A39 /* globals.h */,
+				208EB14918B8989D00CD2A39 /* interfaces.h */,
+				208EB14A18B8989D00CD2A39 /* main.c */,
+				208EB14B18B8989D00CD2A39 /* resources */,
+				208EB15318B8989D00CD2A39 /* sdl */,
+				208EB16018B8989D00CD2A39 /* state_menu.c */,
+				208EB16118B8989D00CD2A39 /* state_menu.h */,
+				208EB16218B8989D00CD2A39 /* ts_event.h */,
+				208EB16318B8989D00CD2A39 /* ui */,
 				2019291618729191006071D0 /* sdl.h */,
 				201928A318727769006071D0 /* assets.h */,
 				201928A418727769006071D0 /* font.c */,
@@ -213,6 +335,8 @@
 				19C28FACFE9D520D11CA2CBB /* Products */,
 				20EE4DDA186EA8AD003FF203 /* tile editor-Info.plist */,
 				20EE4DE0186EA90C003FF203 /* Cocoa.framework */,
+				208EB13A18B8978C00CD2A39 /* engine-Info.plist */,
+				208EB17818B8990300CD2A39 /* OpenGL.framework */,
 			);
 			name = SDL_test;
 			sourceTree = "<group>";
@@ -286,6 +410,23 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
+		208EB13718B8978C00CD2A39 /* engine */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 208EB13D18B8979300CD2A39 /* Build configuration list for PBXNativeTarget "engine" */;
+			buildPhases = (
+				208EB13418B8978C00CD2A39 /* Resources */,
+				208EB13518B8978C00CD2A39 /* Sources */,
+				208EB13618B8978C00CD2A39 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = engine;
+			productName = engine;
+			productReference = 208EB13818B8978C00CD2A39 /* engine.app */;
+			productType = "com.apple.product-type.application";
+		};
 		20EE4DD7186EA8AC003FF203 /* Tile Editor */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 20EE4DDD186EA8B3003FF203 /* Build configuration list for PBXNativeTarget "Tile Editor" */;
@@ -336,11 +477,24 @@
 			targets = (
 				8D1107260486CEB800E47090 /* timesynk */,
 				20EE4DD7186EA8AC003FF203 /* Tile Editor */,
+				208EB13718B8978C00CD2A39 /* engine */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
+		208EB13418B8978C00CD2A39 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				208EB14218B8984400CD2A39 /* InfoPlist.strings in Resources */,
+				208EB14318B8984400CD2A39 /* SDLMain.nib in Resources */,
+				208EB16818B8989D00CD2A39 /* badfont_large.png in Resources */,
+				208EB16A18B8989D00CD2A39 /* badfont_medium.png in Resources */,
+				208EB16C18B8989D00CD2A39 /* ui.png in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		20EE4DD4186EA8AC003FF203 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -364,6 +518,26 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+		208EB13518B8978C00CD2A39 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				208EB14118B8984400CD2A39 /* SDLMain.m in Sources */,
+				208EB16618B8989D00CD2A39 /* c_extra.c in Sources */,
+				208EB16718B8989D00CD2A39 /* main.c in Sources */,
+				208EB16918B8989D00CD2A39 /* badfont_large_png.c in Sources */,
+				208EB16B18B8989D00CD2A39 /* badfont_medium_png.c in Sources */,
+				208EB16D18B8989D00CD2A39 /* font.c in Sources */,
+				208EB16E18B8989D00CD2A39 /* interface.c in Sources */,
+				208EB16F18B8989D00CD2A39 /* r_gl.c in Sources */,
+				208EB17018B8989D00CD2A39 /* r_soft.c in Sources */,
+				208EB17118B8989D00CD2A39 /* sdl_extra.c in Sources */,
+				208EB17218B8989D00CD2A39 /* spritesheets.c in Sources */,
+				208EB17318B8989D00CD2A39 /* state_menu.c in Sources */,
+				208EB17418B8989D00CD2A39 /* elements.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		20EE4DD5186EA8AC003FF203 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -425,6 +599,54 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
+		208EB13B18B8979200CD2A39 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = timesynk_Prefix.pch;
+				INFOPLIST_FILE = "engine-Info.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Foundation,
+					"-framework",
+					AppKit,
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = engine;
+			};
+			name = Debug;
+		};
+		208EB13C18B8979200CD2A39 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+				INFOPLIST_FILE = "engine-Info.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Foundation,
+					"-framework",
+					AppKit,
+				);
+				PREBINDING = NO;
+				PRODUCT_NAME = engine;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
 		20EE4DDB186EA8B2003FF203 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -556,6 +778,15 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		208EB13D18B8979300CD2A39 /* Build configuration list for PBXNativeTarget "engine" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				208EB13B18B8979200CD2A39 /* Debug */,
+				208EB13C18B8979200CD2A39 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		20EE4DDD186EA8B3003FF203 /* Build configuration list for PBXNativeTarget "Tile Editor" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (