Commits

bdemovic committed 6121c60

Changed the way the map is rendered to square-based.

  • Participants
  • Parent commits 58c8c56

Comments (0)

Files changed (10)

 *.exe
 *.mode1v3
 *.xcworkspace
+xcuserdata
 *.pbxuser
 build/*

File The Combat.xcodeproj/project.pbxproj

 	objectVersion = 46;
 	objects = {
 
+/* Begin PBXBuildFile section */
+		AF1D1E8F1477E6D400C95550 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF1D1E8E1477E6D400C95550 /* Cocoa.framework */; };
+		AF1D1E991477E6D400C95550 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = AF1D1E971477E6D400C95550 /* InfoPlist.strings */; };
+		AF1D1E9F1477E6D400C95550 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = AF1D1E9D1477E6D400C95550 /* Credits.rtf */; };
+		AF1D1EBC1477E73E00C95550 /* audiomgr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF1D1EA91477E73E00C95550 /* audiomgr.cpp */; };
+		AF1D1EBD1477E73E00C95550 /* gamemode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF1D1EAB1477E73E00C95550 /* gamemode.cpp */; };
+		AF1D1EBE1477E73E00C95550 /* gm_battle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF1D1EAD1477E73E00C95550 /* gm_battle.cpp */; };
+		AF1D1EBF1477E73E00C95550 /* map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF1D1EAF1477E73E00C95550 /* map.cpp */; };
+		AF1D1EC01477E73E00C95550 /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = AF1D1EB21477E73E00C95550 /* SDLMain.m */; };
+		AF1D1EC11477E73E00C95550 /* texture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF1D1EB31477E73E00C95550 /* texture.cpp */; };
+		AF1D1EC21477E73E00C95550 /* thecombat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF1D1EB51477E73E00C95550 /* thecombat.cpp */; };
+		AF1D1EC31477E73E00C95550 /* tile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF1D1EB61477E73E00C95550 /* tile.cpp */; };
+		AF1D1EC41477E73E00C95550 /* tileset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF1D1EB81477E73E00C95550 /* tileset.cpp */; };
+		AF1D1EC51477E73E00C95550 /* unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF1D1EBA1477E73E00C95550 /* unit.cpp */; };
+		AF1D1ECA1477E76900C95550 /* selector.png in Resources */ = {isa = PBXBuildFile; fileRef = AF1D1EC71477E76900C95550 /* selector.png */; };
+		AF1D1ECB1477E76900C95550 /* tileset.png in Resources */ = {isa = PBXBuildFile; fileRef = AF1D1EC81477E76900C95550 /* tileset.png */; };
+		AF1D1ECC1477E76900C95550 /* zombie.png in Resources */ = {isa = PBXBuildFile; fileRef = AF1D1EC91477E76900C95550 /* zombie.png */; };
+		AF1D1ED21477E7A900C95550 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF1D1ECD1477E7A900C95550 /* SDL.framework */; };
+		AF1D1ED31477E7A900C95550 /* SDL_gfx.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF1D1ECE1477E7A900C95550 /* SDL_gfx.framework */; };
+		AF1D1ED41477E7A900C95550 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF1D1ECF1477E7A900C95550 /* SDL_image.framework */; };
+		AF1D1ED51477E7A900C95550 /* SDL_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF1D1ED01477E7A900C95550 /* SDL_mixer.framework */; };
+		AF1D1ED61477E7A900C95550 /* SDL_ttf.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF1D1ED11477E7A900C95550 /* SDL_ttf.framework */; };
+		AF1D1ED81477E7F800C95550 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF1D1ED71477E7F800C95550 /* OpenGL.framework */; };
+		AF1D1EDA1477E9D800C95550 /* skirmish1.thecombatmap in Resources */ = {isa = PBXBuildFile; fileRef = AF1D1ED91477E9D800C95550 /* skirmish1.thecombatmap */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		AF1D1E8A1477E6D400C95550 /* The Combat.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "The Combat.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		AF1D1E8E1477E6D400C95550 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+		AF1D1E911477E6D400C95550 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		AF1D1E921477E6D400C95550 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
+		AF1D1E931477E6D400C95550 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		AF1D1E961477E6D400C95550 /* The Combat-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "The Combat-Info.plist"; sourceTree = "<group>"; };
+		AF1D1E981477E6D400C95550 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		AF1D1E9C1477E6D400C95550 /* The Combat-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "The Combat-Prefix.pch"; sourceTree = "<group>"; };
+		AF1D1E9E1477E6D400C95550 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Credits.rtf; sourceTree = "<group>"; };
+		AF1D1EA91477E73E00C95550 /* audiomgr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = audiomgr.cpp; sourceTree = SOURCE_ROOT; };
+		AF1D1EAA1477E73E00C95550 /* audiomgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = audiomgr.h; sourceTree = SOURCE_ROOT; };
+		AF1D1EAB1477E73E00C95550 /* gamemode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gamemode.cpp; sourceTree = SOURCE_ROOT; };
+		AF1D1EAC1477E73E00C95550 /* gamemode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gamemode.h; sourceTree = SOURCE_ROOT; };
+		AF1D1EAD1477E73E00C95550 /* gm_battle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gm_battle.cpp; sourceTree = SOURCE_ROOT; };
+		AF1D1EAE1477E73E00C95550 /* gm_battle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gm_battle.h; sourceTree = SOURCE_ROOT; };
+		AF1D1EAF1477E73E00C95550 /* map.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map.cpp; sourceTree = SOURCE_ROOT; };
+		AF1D1EB01477E73E00C95550 /* map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = map.h; sourceTree = SOURCE_ROOT; };
+		AF1D1EB11477E73E00C95550 /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLMain.h; sourceTree = SOURCE_ROOT; };
+		AF1D1EB21477E73E00C95550 /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLMain.m; sourceTree = SOURCE_ROOT; };
+		AF1D1EB31477E73E00C95550 /* texture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = texture.cpp; sourceTree = SOURCE_ROOT; };
+		AF1D1EB41477E73E00C95550 /* texture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = texture.h; sourceTree = SOURCE_ROOT; };
+		AF1D1EB51477E73E00C95550 /* thecombat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thecombat.cpp; sourceTree = SOURCE_ROOT; };
+		AF1D1EB61477E73E00C95550 /* tile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tile.cpp; sourceTree = SOURCE_ROOT; };
+		AF1D1EB71477E73E00C95550 /* tile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tile.h; sourceTree = SOURCE_ROOT; };
+		AF1D1EB81477E73E00C95550 /* tileset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tileset.cpp; sourceTree = SOURCE_ROOT; };
+		AF1D1EB91477E73E00C95550 /* tileset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tileset.h; sourceTree = SOURCE_ROOT; };
+		AF1D1EBA1477E73E00C95550 /* unit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unit.cpp; sourceTree = SOURCE_ROOT; };
+		AF1D1EBB1477E73E00C95550 /* unit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unit.h; sourceTree = SOURCE_ROOT; };
+		AF1D1EC71477E76900C95550 /* selector.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = selector.png; sourceTree = "<group>"; };
+		AF1D1EC81477E76900C95550 /* tileset.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tileset.png; sourceTree = "<group>"; };
+		AF1D1EC91477E76900C95550 /* zombie.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = zombie.png; sourceTree = "<group>"; };
+		AF1D1ECD1477E7A900C95550 /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = SDKs/MacOSX10.6.sdk/Library/Frameworks/SDL.framework; sourceTree = DEVELOPER_DIR; };
+		AF1D1ECE1477E7A900C95550 /* SDL_gfx.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_gfx.framework; path = SDKs/MacOSX10.6.sdk/Library/Frameworks/SDL_gfx.framework; sourceTree = DEVELOPER_DIR; };
+		AF1D1ECF1477E7A900C95550 /* SDL_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_image.framework; path = SDKs/MacOSX10.6.sdk/Library/Frameworks/SDL_image.framework; sourceTree = DEVELOPER_DIR; };
+		AF1D1ED01477E7A900C95550 /* SDL_mixer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_mixer.framework; path = SDKs/MacOSX10.6.sdk/Library/Frameworks/SDL_mixer.framework; sourceTree = DEVELOPER_DIR; };
+		AF1D1ED11477E7A900C95550 /* SDL_ttf.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_ttf.framework; path = SDKs/MacOSX10.6.sdk/Library/Frameworks/SDL_ttf.framework; sourceTree = DEVELOPER_DIR; };
+		AF1D1ED71477E7F800C95550 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = SDKs/MacOSX10.6.sdk/System/Library/Frameworks/OpenGL.framework; sourceTree = DEVELOPER_DIR; };
+		AF1D1ED91477E9D800C95550 /* skirmish1.thecombatmap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = skirmish1.thecombatmap; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		AF1D1E871477E6D400C95550 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				AF1D1ED81477E7F800C95550 /* OpenGL.framework in Frameworks */,
+				AF1D1ED21477E7A900C95550 /* SDL.framework in Frameworks */,
+				AF1D1ED31477E7A900C95550 /* SDL_gfx.framework in Frameworks */,
+				AF1D1ED41477E7A900C95550 /* SDL_image.framework in Frameworks */,
+				AF1D1ED51477E7A900C95550 /* SDL_mixer.framework in Frameworks */,
+				AF1D1ED61477E7A900C95550 /* SDL_ttf.framework in Frameworks */,
+				AF1D1E8F1477E6D400C95550 /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
 /* Begin PBXGroup section */
 		AF1D1E7A1477E54E00C95550 = {
 			isa = PBXGroup;
 			children = (
+				AF1D1ED71477E7F800C95550 /* OpenGL.framework */,
+				AF1D1ECD1477E7A900C95550 /* SDL.framework */,
+				AF1D1ECE1477E7A900C95550 /* SDL_gfx.framework */,
+				AF1D1ECF1477E7A900C95550 /* SDL_image.framework */,
+				AF1D1ED01477E7A900C95550 /* SDL_mixer.framework */,
+				AF1D1ED11477E7A900C95550 /* SDL_ttf.framework */,
+				AF1D1EC61477E74D00C95550 /* Resources */,
+				AF1D1E941477E6D400C95550 /* The Combat */,
+				AF1D1E8D1477E6D400C95550 /* Frameworks */,
+				AF1D1E8B1477E6D400C95550 /* Products */,
 			);
 			sourceTree = "<group>";
 		};
+		AF1D1E8B1477E6D400C95550 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				AF1D1E8A1477E6D400C95550 /* The Combat.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		AF1D1E8D1477E6D400C95550 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				AF1D1E8E1477E6D400C95550 /* Cocoa.framework */,
+				AF1D1E901477E6D400C95550 /* Other Frameworks */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		AF1D1E901477E6D400C95550 /* Other Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				AF1D1E911477E6D400C95550 /* AppKit.framework */,
+				AF1D1E921477E6D400C95550 /* CoreData.framework */,
+				AF1D1E931477E6D400C95550 /* Foundation.framework */,
+			);
+			name = "Other Frameworks";
+			sourceTree = "<group>";
+		};
+		AF1D1E941477E6D400C95550 /* The Combat */ = {
+			isa = PBXGroup;
+			children = (
+				AF1D1EA91477E73E00C95550 /* audiomgr.cpp */,
+				AF1D1EAA1477E73E00C95550 /* audiomgr.h */,
+				AF1D1EAB1477E73E00C95550 /* gamemode.cpp */,
+				AF1D1EAC1477E73E00C95550 /* gamemode.h */,
+				AF1D1EAD1477E73E00C95550 /* gm_battle.cpp */,
+				AF1D1EAE1477E73E00C95550 /* gm_battle.h */,
+				AF1D1EAF1477E73E00C95550 /* map.cpp */,
+				AF1D1EB01477E73E00C95550 /* map.h */,
+				AF1D1EB11477E73E00C95550 /* SDLMain.h */,
+				AF1D1EB21477E73E00C95550 /* SDLMain.m */,
+				AF1D1EB31477E73E00C95550 /* texture.cpp */,
+				AF1D1EB41477E73E00C95550 /* texture.h */,
+				AF1D1EB51477E73E00C95550 /* thecombat.cpp */,
+				AF1D1EB61477E73E00C95550 /* tile.cpp */,
+				AF1D1EB71477E73E00C95550 /* tile.h */,
+				AF1D1EB81477E73E00C95550 /* tileset.cpp */,
+				AF1D1EB91477E73E00C95550 /* tileset.h */,
+				AF1D1EBA1477E73E00C95550 /* unit.cpp */,
+				AF1D1EBB1477E73E00C95550 /* unit.h */,
+				AF1D1E951477E6D400C95550 /* Supporting Files */,
+			);
+			path = "The Combat";
+			sourceTree = "<group>";
+		};
+		AF1D1E951477E6D400C95550 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				AF1D1E961477E6D400C95550 /* The Combat-Info.plist */,
+				AF1D1E971477E6D400C95550 /* InfoPlist.strings */,
+				AF1D1E9C1477E6D400C95550 /* The Combat-Prefix.pch */,
+				AF1D1E9D1477E6D400C95550 /* Credits.rtf */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		AF1D1EC61477E74D00C95550 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				AF1D1ED91477E9D800C95550 /* skirmish1.thecombatmap */,
+				AF1D1EC71477E76900C95550 /* selector.png */,
+				AF1D1EC81477E76900C95550 /* tileset.png */,
+				AF1D1EC91477E76900C95550 /* zombie.png */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
+/* Begin PBXNativeTarget section */
+		AF1D1E891477E6D400C95550 /* The Combat */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = AF1D1EA81477E6D400C95550 /* Build configuration list for PBXNativeTarget "The Combat" */;
+			buildPhases = (
+				AF1D1E861477E6D400C95550 /* Sources */,
+				AF1D1E871477E6D400C95550 /* Frameworks */,
+				AF1D1E881477E6D400C95550 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "The Combat";
+			productName = "The Combat";
+			productReference = AF1D1E8A1477E6D400C95550 /* The Combat.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
 /* Begin PBXProject section */
 		AF1D1E7C1477E54E00C95550 /* Project object */ = {
 			isa = PBXProject;
 				en,
 			);
 			mainGroup = AF1D1E7A1477E54E00C95550;
+			productRefGroup = AF1D1E8B1477E6D400C95550 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
+				AF1D1E891477E6D400C95550 /* The Combat */,
 			);
 		};
 /* End PBXProject section */
 
+/* Begin PBXResourcesBuildPhase section */
+		AF1D1E881477E6D400C95550 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				AF1D1E991477E6D400C95550 /* InfoPlist.strings in Resources */,
+				AF1D1E9F1477E6D400C95550 /* Credits.rtf in Resources */,
+				AF1D1ECA1477E76900C95550 /* selector.png in Resources */,
+				AF1D1ECB1477E76900C95550 /* tileset.png in Resources */,
+				AF1D1ECC1477E76900C95550 /* zombie.png in Resources */,
+				AF1D1EDA1477E9D800C95550 /* skirmish1.thecombatmap in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		AF1D1E861477E6D400C95550 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				AF1D1EBC1477E73E00C95550 /* audiomgr.cpp in Sources */,
+				AF1D1EBD1477E73E00C95550 /* gamemode.cpp in Sources */,
+				AF1D1EBE1477E73E00C95550 /* gm_battle.cpp in Sources */,
+				AF1D1EBF1477E73E00C95550 /* map.cpp in Sources */,
+				AF1D1EC01477E73E00C95550 /* SDLMain.m in Sources */,
+				AF1D1EC11477E73E00C95550 /* texture.cpp in Sources */,
+				AF1D1EC21477E73E00C95550 /* thecombat.cpp in Sources */,
+				AF1D1EC31477E73E00C95550 /* tile.cpp in Sources */,
+				AF1D1EC41477E73E00C95550 /* tileset.cpp in Sources */,
+				AF1D1EC51477E73E00C95550 /* unit.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		AF1D1E971477E6D400C95550 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				AF1D1E981477E6D400C95550 /* en */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		AF1D1E9D1477E6D400C95550 /* Credits.rtf */ = {
+			isa = PBXVariantGroup;
+			children = (
+				AF1D1E9E1477E6D400C95550 /* en */,
+			);
+			name = Credits.rtf;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
 /* Begin XCBuildConfiguration section */
 		AF1D1E811477E54F00C95550 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			};
 			name = Release;
 		};
+		AF1D1EA61477E6D400C95550 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "The Combat/The Combat-Prefix.pch";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = /Library/Frameworks/SDL.framework/Versions/A/Headers;
+				INFOPLIST_FILE = "The Combat/The Combat-Info.plist";
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				WRAPPER_EXTENSION = app;
+			};
+			name = Debug;
+		};
+		AF1D1EA71477E6D400C95550 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "The Combat/The Combat-Prefix.pch";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = /Library/Frameworks/SDL.framework/Versions/A/Headers;
+				INFOPLIST_FILE = "The Combat/The Combat-Info.plist";
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				WRAPPER_EXTENSION = app;
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		AF1D1EA81477E6D400C95550 /* Build configuration list for PBXNativeTarget "The Combat" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				AF1D1EA61477E6D400C95550 /* Debug */,
+				AF1D1EA71477E6D400C95550 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = AF1D1E7C1477E54E00C95550 /* Project object */;

File The Combat/The Combat-Info.plist

+<?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>en</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>hr.zrs.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.strategy-games</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2011 __MyCompanyName__. All rights reserved.</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

File The Combat/The Combat-Prefix.pch

+//
+// Prefix header for all source files of the 'The Combat' target in the 'The Combat' project
+//
+
+#ifdef __OBJC__
+    #import <Cocoa/Cocoa.h>
+#endif

File The Combat/en.lproj/Credits.rtf

+{\rtf0\ansi{\fonttbl\f0\fswiss Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\paperw9840\paperh8400
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs24 \cf0 Engineering:
+\b0 \
+	Some people\
+\
+
+\b Human Interface Design:
+\b0 \
+	Some other people\
+\
+
+\b Testing:
+\b0 \
+	Hopefully not nobody\
+\
+
+\b Documentation:
+\b0 \
+	Whoever\
+\
+
+\b With special thanks to:
+\b0 \
+	Mom\
+}

File The Combat/en.lproj/InfoPlist.strings

+/* Localized versions of Info.plist keys */
+
-#include<cstdio>
-
+#include<cstdio>
+
 #include "map.h"
 #include "tileset.h"
 #include "tile.h"
 {
     FILE *f = fopen(filename.c_str(), "r");
     int w, h;
+    if(!f)
+        INVALID_MAP;
     if(fscanf(f, "%d %d", &w, &h) != 2)
         INVALID_MAP;
 
         int x = i % this->tilesPerRow;
         int y = i / this->tilesPerRow;
 
-        int pixelX = x * 64 - y * 64;
-        int pixelY = y * 32 + x * 32;
+        int pixelX = x * 64;
+        int pixelY = y * 64;
 
         Tile *t = this->tiles[i];
         t->paintSelf(pixelX, -pixelY);

File thecombat.cpp

 	#include <OpenGL/OpenGL.h>
 	#include <OpenGL/glu.h>
 #endif
+#include <string>
 #include "gamemode.h"
 #include "gm_battle.h"
 SDL_Surface *screen;
 bool running = true;
 
+static void changeDir(const char *path)
+{
+    char dirName[strlen(path)+1];
+    memcpy(dirName, path, strlen(path)+1);
+    *strrchr(dirName, '/') = 0;
+
+#if !defined(__APPLE__)
+    chdir(dirName);
+#else
+    std::string resourcesPath(dirName);
+    resourcesPath += "/../Resources";
+    chdir(resourcesPath.c_str());
+#endif
+    
+}
+
 int main(int argc, char **argv)
 {
+    changeDir(argv[0]);
+    
 	SDL_Init(SDL_INIT_VIDEO);
 
 	SDL_WM_SetCaption("The Combat", "The Combat");
     int tilesPerRow = texture->getPixelWidth() / 64;
 
     int x = (tileId % tilesPerRow) * 64;
-    int y = (tileId / tilesPerRow) * 32;
+    int y = (tileId / tilesPerRow) * 64;
 
     glPushMatrix();
     glTranslatef(spaceX, spaceY, 0);
-    glScalef(64,32,1);
-    texture->paintSubImageWithPixels(x, y, 64, 32);
+    glScalef(32,32,1);
+    texture->paintSubImageWithPixels(x, y, 64, 64);
     glPopMatrix();
 }

File tileset.png

Old
Old image
New
New image