diff --git a/.DS_Store b/.DS_Store index a7fc0cdd..4845a554 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Grafx2.xcodeproj/project.pbxproj b/Grafx2.xcodeproj/project.pbxproj index 5c883090..5b9cd413 100644 --- a/Grafx2.xcodeproj/project.pbxproj +++ b/Grafx2.xcodeproj/project.pbxproj @@ -12,6 +12,8 @@ 002F3A3F09D088BA00EBEB88 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F3A3E09D088BA00EBEB88 /* main.c */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; F5AD4B1F0EA8CCF0009CCAC4 /* version.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AD4B1E0EA8CCF0009CCAC4 /* version.c */; }; + F5B138940EB71977000B83CC /* texte.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B138930EB71977000B83CC /* texte.c */; }; + F5B138C30EB71D28000B83CC /* SDL_ttf in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B138C20EB71D28000B83CC /* SDL_ttf */; }; F5B19B740EA4BDF5003F4BA4 /* 8pxfont.png in Resources */ = {isa = PBXBuildFile; fileRef = F5B19B730EA4BDF5003F4BA4 /* 8pxfont.png */; }; F5B19B8D0EA4BE3E003F4BA4 /* aide.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B750EA4BE3E003F4BA4 /* aide.c */; }; F5B19B8E0EA4BE3E003F4BA4 /* boutons.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B760EA4BE3E003F4BA4 /* boutons.c */; }; @@ -40,6 +42,7 @@ F5B19C1D0EA4D71C003F4BA4 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B19C1C0EA4D71C003F4BA4 /* CoreFoundation.framework */; }; F5B19C3D0EA4DC91003F4BA4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F5B19C3B0EA4DC91003F4BA4 /* InfoPlist.strings */; }; F5B1EE850EAD0F4E00B087B5 /* gfx2.ini in Resources */ = {isa = PBXBuildFile; fileRef = F5B1EE840EAD0F4E00B087B5 /* gfx2.ini */; }; + F5DCE2BC0EA5116A0065B0EF /* SDL_ttf in Copy Frameworks into .app bundle */ = {isa = PBXBuildFile; fileRef = F5DCE2BE0EA5118F0065B0EF /* SDL_ttf */; }; F5DCE2BC0EA5116B0065B0EF /* SDL_image in Copy Frameworks into .app bundle */ = {isa = PBXBuildFile; fileRef = F5DCE2BB0EA5116B0065B0EF /* SDL_image */; }; F5DCE2BE0EA5118E0065B0EF /* SDL in Copy Frameworks into .app bundle */ = {isa = PBXBuildFile; fileRef = F5DCE2BD0EA5118E0065B0EF /* SDL */; }; /* End PBXBuildFile section */ @@ -67,6 +70,17 @@ name = "Copy Frameworks into .app bundle"; runOnlyForDeploymentPostprocessing = 0; }; + 002F39FD09D0883400EBEB8A /* Copy Frameworks into .app bundle */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = SDL_ttf.framework/Versions/A; + dstSubfolderSpec = 10; + files = ( + F5DCE2BC0EA5116A0065B0EF /* SDL_ttf in Copy Frameworks into .app bundle */, + ); + name = "Copy Frameworks into .app bundle"; + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -81,6 +95,8 @@ 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 8D1107320486CEB800E47090 /* Grafx2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Grafx2.app; sourceTree = BUILT_PRODUCTS_DIR; }; F5AD4B1E0EA8CCF0009CCAC4 /* version.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = version.c; sourceTree = ""; }; + F5B138930EB71977000B83CC /* texte.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = texte.c; sourceTree = ""; }; + F5B138C20EB71D28000B83CC /* SDL_ttf */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = SDL_ttf; path = /Library/Frameworks/SDL_ttf.framework/SDL_ttf; sourceTree = ""; }; F5B19B6C0EA4BDA8003F4BA4 /* SDL_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_image.framework; path = /Library/Frameworks/SDL_image.framework; sourceTree = ""; }; F5B19B730EA4BDF5003F4BA4 /* 8pxfont.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = 8pxfont.png; sourceTree = ""; }; F5B19B750EA4BE3E003F4BA4 /* aide.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = aide.c; sourceTree = ""; }; @@ -113,6 +129,7 @@ F5B1EE840EAD0F4E00B087B5 /* gfx2.ini */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = gfx2.ini; path = dat/gfx2.ini; sourceTree = ""; }; F5DCE2BB0EA5116B0065B0EF /* SDL_image */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = SDL_image; path = /Library/Frameworks/SDL_image.framework/Versions/A/SDL_image; sourceTree = ""; }; F5DCE2BD0EA5118E0065B0EF /* SDL */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = SDL; path = /Library/Frameworks/SDL.framework/Versions/A/SDL; sourceTree = ""; }; + F5DCE2BE0EA5118F0065B0EF /* SDL_ttf */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = SDL_ttf; path = /Library/Frameworks/SDL_ttf.framework/Versions/A/SDL_ttf; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -123,6 +140,7 @@ 002F39FA09D0881F00EBEB88 /* SDL.framework in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, F5B19C1D0EA4D71C003F4BA4 /* CoreFoundation.framework in Frameworks */, + F5B138C30EB71D28000B83CC /* SDL_ttf in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -167,10 +185,13 @@ 29B97314FDCFA39411CA2CEA /* Grafx2 */ = { isa = PBXGroup; children = ( + F5B138C20EB71D28000B83CC /* SDL_ttf */, + F5B138930EB71977000B83CC /* texte.c */, F5B1EE840EAD0F4E00B087B5 /* gfx2.ini */, F5AD4B1E0EA8CCF0009CCAC4 /* version.c */, F5DCE2BD0EA5118E0065B0EF /* SDL */, F5DCE2BB0EA5116B0065B0EF /* SDL_image */, + F5DCE2BE0EA5118F0065B0EF /* SDL_ttf */, F5B19C3B0EA4DC91003F4BA4 /* InfoPlist.strings */, F5B19C1C0EA4D71C003F4BA4 /* CoreFoundation.framework */, F5B19BDF0EA4C65A003F4BA4 /* gfx2.cfg */, @@ -247,6 +268,7 @@ 8D11072E0486CEB800E47090 /* Frameworks */, 002F39FD09D0883400EBEB88 /* Copy Frameworks into .app bundle */, 002F39FD09D0883400EBEB89 /* Copy Frameworks into .app bundle */, + 002F39FD09D0883400EBEB8A /* Copy Frameworks into .app bundle */, ); buildRules = ( ); @@ -318,6 +340,7 @@ F5B19BA30EA4BE3E003F4BA4 /* shade.c in Sources */, F5B19BA40EA4BE3E003F4BA4 /* special.c in Sources */, F5AD4B1F0EA8CCF0009CCAC4 /* version.c in Sources */, + F5B138940EB71977000B83CC /* texte.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -354,9 +377,11 @@ "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL_image.framework\""; LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL.framework\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL_ttf.framework\""; PRODUCT_NAME = Grafx2; WRAPPER_EXTENSION = app; ZERO_LINK = YES; @@ -383,9 +408,11 @@ "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", ); LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL_image.framework\""; LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL.framework\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(LOCAL_LIBRARY_DIR)/Frameworks/SDL_ttf.framework\""; PRODUCT_NAME = Grafx2; WRAPPER_EXTENSION = app; }; @@ -409,6 +436,7 @@ HEADER_SEARCH_PATHS = ( "$(HOME)/Library/Frameworks/SDL.framework/Headers", /Library/Frameworks/SDL.framework/Headers, + /Library/SDL_ttf.framework/Headers, "$(HEADER_SEARCH_PATHS)", ); PREBINDING = NO; diff --git a/Grafx2.xcodeproj/xx.pbxuser b/Grafx2.xcodeproj/xx.pbxuser index 6422f6ca..8a710782 100644 --- a/Grafx2.xcodeproj/xx.pbxuser +++ b/Grafx2.xcodeproj/xx.pbxuser @@ -77,7 +77,7 @@ 43, 20, 79, - 84, + 51, ); PBXFileTableDataSourceColumnsKey = ( PBXFileDataSource_FiletypeID, @@ -165,18 +165,16 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 246337816; - PBXWorkspaceStateSaveDate = 246337816; + PBXPerProjectTemplateStateSaveDate = 246882396; + PBXWorkspaceStateSaveDate = 246882396; }; perUserProjectItems = { + F5AE7F8D0EB12409001C151F = F5AE7F8D0EB12409001C151F /* PBXTextBookmark */; F5B19C160EA4D6E8003F4BA4 = F5B19C160EA4D6E8003F4BA4 /* PBXTextBookmark */; F5B1D1770EA5FE2100AB8D0F = F5B1D1770EA5FE2100AB8D0F /* PBXTextBookmark */; F5B1D1790EA5FE2100AB8D0F = F5B1D1790EA5FE2100AB8D0F /* PBXTextBookmark */; - F5B1D1B70EA602BA00AB8D0F = F5B1D1B70EA602BA00AB8D0F /* PBXTextBookmark */; F5B1EEA80EAD15CD00B087B5 = F5B1EEA80EAD15CD00B087B5 /* PBXTextBookmark */; F5B1EEAA0EAD15CD00B087B5 = F5B1EEAA0EAD15CD00B087B5 /* PBXTextBookmark */; - F5C3D2770EAE1BA000264A2B = F5C3D2770EAE1BA000264A2B /* PBXTextBookmark */; - F5C3D2870EAE1EE800264A2B = F5C3D2870EAE1EE800264A2B /* PBXTextBookmark */; }; sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */; userBuildSettings = { @@ -189,6 +187,24 @@ F5B19B5D0EA4BD57003F4BA4 /* Grafx2 */, ); }; + F5AE7F8D0EB12409001C151F /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = F5B19B850EA4BE3E003F4BA4 /* palette.c */; + name = "palette.c: 1942"; + rLen = 0; + rLoc = 75128; + rType = 0; + vrLen = 0; + vrLoc = 0; + }; + F5B138930EB71977000B83CC /* texte.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1092, 4807}}"; + sepNavSelRange = "{1127, 0}"; + sepNavVisRect = "{{0, 339}, {867, 536}}"; + sepNavWindowFrame = "{{34, 37}, {906, 665}}"; + }; + }; F5B19B5D0EA4BD57003F4BA4 /* Grafx2 */ = { isa = PBXExecutable; activeArgIndex = 2147483647; @@ -281,21 +297,22 @@ F5B19B7F0EA4BE3E003F4BA4 /* loadsave.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1700, 101574}}"; - sepNavSelRange = "{28358, 27}"; - sepNavVisRect = "{{0, 18096}, {867, 536}}"; + sepNavSelRange = "{29459, 0}"; + sepNavVisRect = "{{0, 18552}, {867, 536}}"; sepNavWindowFrame = "{{15, 76}, {906, 665}}"; }; }; F5B19B800EA4BE3E003F4BA4 /* moteur.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1420, 37145}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRect = "{{0, 0}, {0, 0}}"; + sepNavIntBoundsRect = "{{0, 0}, {1420, 37772}}"; + sepNavSelRange = "{371, 0}"; + sepNavVisRect = "{{0, 516}, {867, 536}}"; + sepNavWindowFrame = "{{38, 55}, {906, 665}}"; }; }; F5B19B850EA4BE3E003F4BA4 /* palette.c */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1268, 36993}}"; + sepNavIntBoundsRect = "{{0, 0}, {1268, 37031}}"; sepNavSelRange = "{75128, 0}"; sepNavVisRect = "{{0, 0}, {0, 0}}"; sepNavWindowFrame = "{{15, 76}, {906, 665}}"; @@ -309,6 +326,14 @@ sepNavWindowFrame = "{{15, 76}, {906, 665}}"; }; }; + F5B19B890EA4BE3E003F4BA4 /* sdlscreen.c */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1580, 11571}}"; + sepNavSelRange = "{0, 0}"; + sepNavVisRect = "{{0, 0}, {867, 536}}"; + sepNavWindowFrame = "{{61, 34}, {906, 665}}"; + }; + }; F5B19C160EA4D6E8003F4BA4 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = F5B19C170EA4D6E8003F4BA4 /* curl.h */; @@ -354,16 +379,6 @@ vrLen = 376; vrLoc = 0; }; - F5B1D1B70EA602BA00AB8D0F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5B19B800EA4BE3E003F4BA4 /* moteur.c */; - name = "moteur.c: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 227; - vrLoc = 0; - }; F5B1EEA80EAD15CD00B087B5 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = F5B19B780EA4BE3E003F4BA4 /* divers.c */; @@ -384,26 +399,6 @@ vrLen = 123; vrLoc = 0; }; - F5C3D2770EAE1BA000264A2B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5B19B850EA4BE3E003F4BA4 /* palette.c */; - name = "palette.c: 1947"; - rLen = 0; - rLoc = 75128; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; - F5C3D2870EAE1EE800264A2B /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5B19B850EA4BE3E003F4BA4 /* palette.c */; - name = "palette.c: 1947"; - rLen = 0; - rLoc = 75128; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; F5DCE2700EA50EDC0065B0EF /* SDL_image.h */ = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; diff --git a/Grafx2.xcodeproj/xx.perspective b/Grafx2.xcodeproj/xx.perspective index adcda10a..0b10c7af 100644 --- a/Grafx2.xcodeproj/xx.perspective +++ b/Grafx2.xcodeproj/xx.perspective @@ -3,7 +3,7 @@ ActivePerspectiveName - Build + Project AllowedModules @@ -188,9 +188,9 @@ PerspectiveWidths - 1000 - 1000 - 1000 + 967 + 967 + 967 Perspectives @@ -222,6 +222,8 @@ Layout + BecomeActive + ContentConfiguration PBXBottomSmartGroupGIDs @@ -262,9 +264,17 @@ PBXSmartGroupTreeModuleOutlineStateExpansionKey + 29B97314FDCFA39411CA2CEA + 080E96DDFE201D6D7F000001 + 29B97315FDCFA39411CA2CEA + 29B97317FDCFA39411CA2CEA + 29B97323FDCFA39411CA2CEA + 19C28FACFE9D520D11CA2CBB 1C37FBAC04509CD000000102 - F5B1EEA20EAD15CD00B087B5 - F5B1EEA30EAD15CD00B087B5 + F5B138DE0EB72045000B83CC + F5B138DF0EB72045000B83CC + F5B138E00EB72045000B83CC + F5B138E10EB72045000B83CC PBXSmartGroupTreeModuleOutlineStateSelectionKey @@ -273,7 +283,7 @@ PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {339, 580}} + {{0, 662}, {339, 544}} PBXTopSmartGroupGIDs @@ -283,7 +293,7 @@ GeometryConfiguration Frame - {{0, 0}, {356, 598}} + {{0, 0}, {356, 562}} GroupTreeTableConfiguration FileBuiltColumn @@ -293,6 +303,8 @@ MainColumn 297 + RubberWindowFrame + 25 79 967 603 0 0 1024 746 Module PBXSmartGroupTreeModule @@ -308,7 +320,7 @@ PBXProjectModuleGUID F5B19BA70EA4BF24003F4BA4 PBXProjectModuleLabel - divers.c + PBXSplitModuleInNavigatorKey Split0 @@ -316,21 +328,15 @@ PBXProjectModuleGUID F5B19BA80EA4BF24003F4BA4 PBXProjectModuleLabel - divers.c - _historyCapacity - 0 - bookmark - F5B1EEBB0EAD20DC00B087B5 + history F5B19C160EA4D6E8003F4BA4 F5B1D1770EA5FE2100AB8D0F - F5B1EE860EAD0F5800B087B5 prevStack F5B1D1790EA5FE2100AB8D0F - F5B1D1B70EA602BA00AB8D0F SplitCount @@ -344,7 +350,9 @@ GeometryConfiguration Frame - {{0, 0}, {639, 0}} + {{0, 0}, {606, 0}} + RubberWindowFrame + 25 79 967 603 0 0 1024 746 Module PBXNavigatorGroup @@ -353,7 +361,7 @@ Proportion - 593pt + 557pt Tabs @@ -367,7 +375,9 @@ GeometryConfiguration Frame - {{10, 27}, {639, 566}} + {{10, 27}, {606, 530}} + RubberWindowFrame + 25 79 967 603 0 0 1024 746 Module XCDetailModule @@ -408,7 +418,7 @@ Proportion - 639pt + 606pt Name @@ -426,11 +436,11 @@ TableOfContents - F5B1EEA50EAD15CD00B087B5 + F5B138E20EB72045000B83CC 1CA23ED40692098700951B8B - F5B1EEA60EAD15CD00B087B5 + F5B138E30EB72045000B83CC F5B19BA70EA4BF24003F4BA4 - F5B1EEA70EAD15CD00B087B5 + F5B138E40EB72045000B83CC 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -478,7 +488,7 @@ PBXSmartGroupTreeModuleColumnWidthsKey - 251 + 327 PBXSmartGroupTreeModuleColumnsKey_v4 @@ -488,18 +498,15 @@ PBXSmartGroupTreeModuleOutlineStateKey_v7 PBXSmartGroupTreeModuleOutlineStateExpansionKey - - 29B97314FDCFA39411CA2CEA - + PBXSmartGroupTreeModuleOutlineStateSelectionKey - 1 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {251, 429}} + {{0, 0}, {327, 544}} PBXTopSmartGroupGIDs @@ -509,19 +516,17 @@ GeometryConfiguration Frame - {{0, 0}, {268, 447}} + {{0, 0}, {344, 562}} GroupTreeTableConfiguration MainColumn - 251 + 327 - RubberWindowFrame - 47 162 969 488 0 0 1024 746 Module PBXSmartGroupTreeModule Proportion - 268pt + 344pt Dock @@ -541,21 +546,16 @@ F5B19BA80EA4BF24003F4BA4 PBXProjectModuleLabel palette.c - _historyCapacity - 0 - bookmark - F5C3D2870EAE1EE800264A2B history F5B19C160EA4D6E8003F4BA4 F5B1D1770EA5FE2100AB8D0F F5B1EEA80EAD15CD00B087B5 - F5C3D2770EAE1BA000264A2B + F5AE7F8D0EB12409001C151F prevStack F5B1D1790EA5FE2100AB8D0F - F5B1D1B70EA602BA00AB8D0F F5B1EEAA0EAD15CD00B087B5 @@ -570,9 +570,7 @@ GeometryConfiguration Frame - {{0, 0}, {696, 0}} - RubberWindowFrame - 47 162 969 488 0 0 1024 746 + {{0, 0}, {618, 0}} Module PBXNavigatorGroup @@ -581,16 +579,14 @@ Proportion - 442pt + 557pt Tabs - BecomeActive - ContentConfiguration PBXBuildLogShowsTranscriptDefaultKey - {{0, 166}, {696, 249}} + {{0, 141}, {618, 389}} PBXProjectModuleGUID XCMainBuildResultsModuleGUID PBXProjectModuleLabel @@ -603,9 +599,7 @@ GeometryConfiguration Frame - {{10, 27}, {696, 415}} - RubberWindowFrame - 47 162 969 488 0 0 1024 746 + {{10, 27}, {618, 530}} Module PBXBuildResultsModule @@ -667,7 +661,7 @@ Proportion - 696pt + 618pt Name @@ -685,14 +679,14 @@ TableOfContents - F5C3D2830EAE1D5C00264A2B + F5B138E50EB72045000B83CC 1CA23EE50692099D00951B8B - F5C3D2840EAE1D5C00264A2B + F5B138E60EB72045000B83CC F5B19BA70EA4BF24003F4BA4 - F5C3D2850EAE1D5C00264A2B + F5B138E70EB72045000B83CC XCMainBuildResultsModuleGUID 1CA23EE80692099D00951B8B - F5C3D2860EAE1D5C00264A2B + F5B138E80EB72045000B83CC ToolbarConfiguration xcode.toolbar.config.buildAndRun @@ -736,12 +730,12 @@ GeometryConfiguration Frame - {{0, 0}, {951, 163}} + {{0, 0}, {969, 12}} Module PBXDebugCLIModule Proportion - 163pt + 12pt ContentConfiguration @@ -760,8 +754,8 @@ yes sizes - {{0, 0}, {445, 205}} - {{445, 0}, {506, 205}} + {{0, 0}, {453, 205}} + {{453, 0}, {516, 205}} VerticalSplitView @@ -776,8 +770,8 @@ yes sizes - {{0, 0}, {951, 205}} - {{0, 205}, {951, 225}} + {{0, 0}, {969, 205}} + {{0, 205}, {969, 225}} @@ -799,7 +793,7 @@ DebugSTDIOWindowFrame {{200, 200}, {500, 300}} Frame - {{0, 168}, {951, 430}} + {{0, 17}, {969, 430}} Module PBXDebugSessionModule @@ -823,15 +817,15 @@ TableOfContents - F5AD4A820EA8C2B2009CCAC4 + F5B1389F0EB71A4B000B83CC 1CCC7628064C1048000F2A68 1CCC7629064C1048000F2A68 - F5AD4A830EA8C2B2009CCAC4 - F5AD4A840EA8C2B2009CCAC4 - F5AD4A850EA8C2B2009CCAC4 - F5AD4A860EA8C2B2009CCAC4 - F5AD4A720EA8C198009CCAC4 - F5AD4A870EA8C2B2009CCAC4 + F5B138A00EB71A4B000B83CC + F5B138A10EB71A4B000B83CC + F5B138A20EB71A4B000B83CC + F5B138A30EB71A4B000B83CC + F5B138A40EB71A4B000B83CC + F5B138A50EB71A4B000B83CC ToolbarConfiguration xcode.toolbar.config.debug @@ -864,7 +858,7 @@ /Users/xx/Grafx2/Grafx2.xcodeproj WindowString - 47 162 969 488 0 0 1024 746 + 25 79 967 603 0 0 1024 746 WindowTools diff --git a/loadsave.c b/loadsave.c index 73cb460c..3120631d 100644 --- a/loadsave.c +++ b/loadsave.c @@ -988,8 +988,8 @@ void Load_PKM(void) if (Octet==4) { Indice+=4; - if ( ! read_word_le(Fichier,&Ecran_original_X) - || !read_word_le(Fichier,&Ecran_original_Y) ) + if ( ! read_word_le(Fichier,(word *) &Ecran_original_X) + || !read_word_le(Fichier,(word *) &Ecran_original_Y) ) Erreur_fichier=2; } else diff --git a/operatio.c b/operatio.c index ac3e134b..4b37db50 100644 --- a/operatio.c +++ b/operatio.c @@ -4158,6 +4158,7 @@ void Rectangle_Degrade_12_0(void) // Initialisation de l'étape 1, on commence ŕ dessiner le rectangle { Initialiser_debut_operation(); + Backup(); if ((Config.Coords_rel) && (Menu_visible)) Print_dans_menu("\035: 1 \022: 1",0); diff --git a/texte.c b/texte.c index 72a63e0b..c14e0a09 100644 --- a/texte.c +++ b/texte.c @@ -28,10 +28,14 @@ // TrueType #ifndef NOTTF +#ifdef __macosx__ +#include +#else #include #endif -// SFont +#endif #include +// SFont #include "SFont.h" #include "struct.h"