diff --git a/.gitignore b/.gitignore index 8156970..96f4de5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ obj/* Debug/* Release/* data/* +*.exe *.suo *.sdf *.opensdf @@ -16,4 +17,5 @@ data/* trick.ini *.xcuserstate project.xcworkspace/ -xcuserdata/ \ No newline at end of file +xcuserdata/ +.vscode/* \ No newline at end of file diff --git a/Info.plist b/Info.plist deleted file mode 100644 index 9290021..0000000 --- a/Info.plist +++ /dev/null @@ -1,34 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIconFile - mappy.icns - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSApplicationCategoryType - public.app-category.developer-tools - LSMinimumSystemVersion - $(MACOSX_DEPLOYMENT_TARGET) - NSHumanReadableCopyright - Copyright © 2016 Raimon Zamora. All rights reserved. - NSPrincipalClass - NSApplication - - diff --git a/main.cpp b/main.cpp index 3962cdd..c781e5f 100644 --- a/main.cpp +++ b/main.cpp @@ -1,5 +1,4 @@ -#include -#include +#include #define STB_IMAGE_IMPLEMENTATION #include "stb_image.h" #include "font.h" @@ -599,9 +598,9 @@ void DoMiniMap() { } int main(int argc, char* argv[]) { - const int len = strlen(argv[0])-30; + /*const int len = strlen(argv[0])-30; memcpy(path, argv[0], len); - path[len] = '\0'; + path[len] = '\0';*/ Init(); while (!Update()) { diff --git a/mappy.sln b/mappy.sln deleted file mode 100644 index f276d2a..0000000 --- a/mappy.sln +++ /dev/null @@ -1,22 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mappy", "mappy.vcxproj", "{A54CF7AB-24D6-4778-9B8B-80F1ADEE3363}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A54CF7AB-24D6-4778-9B8B-80F1ADEE3363}.Debug|Win32.ActiveCfg = Debug|Win32 - {A54CF7AB-24D6-4778-9B8B-80F1ADEE3363}.Debug|Win32.Build.0 = Debug|Win32 - {A54CF7AB-24D6-4778-9B8B-80F1ADEE3363}.Release|Win32.ActiveCfg = Release|Win32 - {A54CF7AB-24D6-4778-9B8B-80F1ADEE3363}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/mappy.vcxproj b/mappy.vcxproj deleted file mode 100644 index c9d9925..0000000 --- a/mappy.vcxproj +++ /dev/null @@ -1,102 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {A54CF7AB-24D6-4778-9B8B-80F1ADEE3363} - Win32Proj - mappy - - - - Application - true - v120 - Unicode - - - Application - false - v120 - true - Unicode - - - - - - - - - - - - - true - C:\dev\lib\sdl2\include;$(IncludePath) - C:\dev\lib\sdl2\lib\x86;$(LibraryPath) - - - false - C:\dev\lib\sdl2\include;$(IncludePath) - C:\dev\lib\sdl2\lib\x86;$(LibraryPath) - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Windows - true - SDL2.lib;SDL2main.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) - - - Windows - true - true - true - SDL2.lib;SDL2main.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/mappy.vcxproj.filters b/mappy.vcxproj.filters deleted file mode 100644 index 435d6f2..0000000 --- a/mappy.vcxproj.filters +++ /dev/null @@ -1,46 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/mappy.xcodeproj/project.pbxproj b/mappy.xcodeproj/project.pbxproj deleted file mode 100644 index 9d19e7e..0000000 --- a/mappy.xcodeproj/project.pbxproj +++ /dev/null @@ -1,288 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 02252FB81C764D2E002D1DA1 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02252FB71C764D2E002D1DA1 /* main.cpp */; }; - 02B01D591C767C1700CD186D /* SDL2_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02B01D581C767C1700CD186D /* SDL2_image.framework */; }; - 02B01D5B1C767C2C00CD186D /* SDL2_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02B01D5A1C767C2C00CD186D /* SDL2_mixer.framework */; }; - 02EA2BEF1C764B3800E5A247 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 02EA2BEE1C764B3800E5A247 /* SDL2.framework */; }; - 02F256EB1CF374B90005FAE2 /* mappy.icns in Resources */ = {isa = PBXBuildFile; fileRef = 02F256EA1CF374B90005FAE2 /* mappy.icns */; }; - 02F8248B1C772310007AAE83 /* gif.c in Sources */ = {isa = PBXBuildFile; fileRef = 02F8248A1C772310007AAE83 /* gif.c */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 02252FB71C764D2E002D1DA1 /* main.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = main.cpp; sourceTree = ""; }; - 02B01D581C767C1700CD186D /* SDL2_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_image.framework; path = ../../../../../Library/Frameworks/SDL2_image.framework; sourceTree = ""; }; - 02B01D5A1C767C2C00CD186D /* SDL2_mixer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_mixer.framework; path = ../../../../../Library/Frameworks/SDL2_mixer.framework; sourceTree = ""; }; - 02CF35B91C7649C300180C9F /* mappy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = mappy.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 02CF35C71C7649C300180C9F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 02EA2BEE1C764B3800E5A247 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = ../../../../../Library/Frameworks/SDL2.framework; sourceTree = ""; }; - 02F23A4E1CEE2D460005FAE2 /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = font.h; sourceTree = ""; }; - 02F23A4F1CEE2D460005FAE2 /* stb_image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stb_image.h; sourceTree = ""; }; - 02F256EA1CF374B90005FAE2 /* mappy.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = mappy.icns; sourceTree = ""; }; - 02F8248A1C772310007AAE83 /* gif.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gif.c; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 02CF35B61C7649C300180C9F /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 02B01D5B1C767C2C00CD186D /* SDL2_mixer.framework in Frameworks */, - 02B01D591C767C1700CD186D /* SDL2_image.framework in Frameworks */, - 02EA2BEF1C764B3800E5A247 /* SDL2.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 02CF35B01C7649C300180C9F = { - isa = PBXGroup; - children = ( - 02F256EA1CF374B90005FAE2 /* mappy.icns */, - 02F23A4E1CEE2D460005FAE2 /* font.h */, - 02F23A4F1CEE2D460005FAE2 /* stb_image.h */, - 02F8248A1C772310007AAE83 /* gif.c */, - 02252FB71C764D2E002D1DA1 /* main.cpp */, - 02CF35C71C7649C300180C9F /* Info.plist */, - 02EA2BEE1C764B3800E5A247 /* SDL2.framework */, - 02B01D581C767C1700CD186D /* SDL2_image.framework */, - 02B01D5A1C767C2C00CD186D /* SDL2_mixer.framework */, - 02CF35BA1C7649C300180C9F /* Products */, - ); - sourceTree = ""; - }; - 02CF35BA1C7649C300180C9F /* Products */ = { - isa = PBXGroup; - children = ( - 02CF35B91C7649C300180C9F /* mappy.app */, - ); - name = Products; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 02CF35B81C7649C300180C9F /* mappy */ = { - isa = PBXNativeTarget; - buildConfigurationList = 02CF35CA1C7649C300180C9F /* Build configuration list for PBXNativeTarget "mappy" */; - buildPhases = ( - 02CF35B51C7649C300180C9F /* Sources */, - 02CF35B61C7649C300180C9F /* Frameworks */, - 02CF35B71C7649C300180C9F /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = mappy; - productName = mappy; - productReference = 02CF35B91C7649C300180C9F /* mappy.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 02CF35B11C7649C300180C9F /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0720; - ORGANIZATIONNAME = "Raimon Zamora"; - TargetAttributes = { - 02CF35B81C7649C300180C9F = { - CreatedOnToolsVersion = 7.2; - }; - }; - }; - buildConfigurationList = 02CF35B41C7649C300180C9F /* Build configuration list for PBXProject "mappy" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 02CF35B01C7649C300180C9F; - productRefGroup = 02CF35BA1C7649C300180C9F /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 02CF35B81C7649C300180C9F /* mappy */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 02CF35B71C7649C300180C9F /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 02F256EB1CF374B90005FAE2 /* mappy.icns in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 02CF35B51C7649C300180C9F /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 02252FB81C764D2E002D1DA1 /* main.cpp in Sources */, - 02F8248B1C772310007AAE83 /* gif.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 02CF35C81C7649C300180C9F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - }; - name = Debug; - }; - 02CF35C91C7649C300180C9F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; - MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; - }; - name = Release; - }; - 02CF35CB1C7649C300180C9F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(LOCAL_LIBRARY_DIR)/Frameworks", - ); - HEADER_SEARCH_PATHS = ( - "$(LOCAL_LIBRARY_DIR)/Frameworks/SDL2.framework/headers", - "$(LOCAL_LIBRARY_DIR)/Frameworks/SDL2_image.framework/headers", - "$(LOCAL_LIBRARY_DIR)/Frameworks/SDL2_mixer.framework/headers", - ); - INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = net.jailers.mappy; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 02CF35CC1C7649C300180C9F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(LOCAL_LIBRARY_DIR)/Frameworks", - ); - HEADER_SEARCH_PATHS = ( - "$(LOCAL_LIBRARY_DIR)/Frameworks/SDL2.framework/headers", - "$(LOCAL_LIBRARY_DIR)/Frameworks/SDL2_image.framework/headers", - "$(LOCAL_LIBRARY_DIR)/Frameworks/SDL2_mixer.framework/headers", - ); - INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = net.jailers.mappy; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 02CF35B41C7649C300180C9F /* Build configuration list for PBXProject "mappy" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 02CF35C81C7649C300180C9F /* Debug */, - 02CF35C91C7649C300180C9F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 02CF35CA1C7649C300180C9F /* Build configuration list for PBXNativeTarget "mappy" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 02CF35CB1C7649C300180C9F /* Debug */, - 02CF35CC1C7649C300180C9F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 02CF35B11C7649C300180C9F /* Project object */; -} diff --git a/res.aps b/res.aps deleted file mode 100644 index 5db037d..0000000 Binary files a/res.aps and /dev/null differ diff --git a/res.rc b/res.rc deleted file mode 100644 index 9453edc..0000000 Binary files a/res.rc and /dev/null differ diff --git a/resource.h b/resource.h deleted file mode 100644 index f159059..0000000 Binary files a/resource.h and /dev/null differ