diff --git a/.DS_Store b/.DS_Store index 1e60023b..a784fbe5 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Grafx2.xcodeproj/xx.pbxuser b/Grafx2.xcodeproj/xx.pbxuser index e9a306c0..900fb557 100644 --- a/Grafx2.xcodeproj/xx.pbxuser +++ b/Grafx2.xcodeproj/xx.pbxuser @@ -141,32 +141,29 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 245883613; - PBXWorkspaceStateSaveDate = 245883613; + PBXPerProjectTemplateStateSaveDate = 245890901; + PBXWorkspaceStateSaveDate = 245890901; }; perUserProjectItems = { - F5B19C160EA4D6E8003F4BA4 /* PBXTextBookmark */ = F5B19C160EA4D6E8003F4BA4 /* PBXTextBookmark */; - F5B19C180EA4D6E8003F4BA4 /* PBXTextBookmark */ = F5B19C180EA4D6E8003F4BA4 /* PBXTextBookmark */; - F5B19C1A0EA4D6E8003F4BA4 /* PBXTextBookmark */ = F5B19C1A0EA4D6E8003F4BA4 /* PBXTextBookmark */; - F5B19C2F0EA4DB23003F4BA4 /* PBXTextBookmark */ = F5B19C2F0EA4DB23003F4BA4 /* PBXTextBookmark */; - F5B19C300EA4DB23003F4BA4 /* PBXTextBookmark */ = F5B19C300EA4DB23003F4BA4 /* PBXTextBookmark */; - F5B19C310EA4DB36003F4BA4 /* PBXTextBookmark */ = F5B19C310EA4DB36003F4BA4 /* PBXTextBookmark */; - F5B1D1770EA5FE2100AB8D0F /* PBXTextBookmark */ = F5B1D1770EA5FE2100AB8D0F /* PBXTextBookmark */; - F5B1D1790EA5FE2100AB8D0F /* PBXTextBookmark */ = F5B1D1790EA5FE2100AB8D0F /* PBXTextBookmark */; - F5B1D1B50EA602BA00AB8D0F /* PBXTextBookmark */ = F5B1D1B50EA602BA00AB8D0F /* PBXTextBookmark */; - F5B1D1B70EA602BA00AB8D0F /* PBXTextBookmark */ = F5B1D1B70EA602BA00AB8D0F /* PBXTextBookmark */; - F5B1D1BD0EA602C300AB8D0F /* PBXTextBookmark */ = F5B1D1BD0EA602C300AB8D0F /* PBXTextBookmark */; - F5B1D1CA0EA602F600AB8D0F /* PBXTextBookmark */ = F5B1D1CA0EA602F600AB8D0F /* PBXTextBookmark */; - F5B8B7700EA7E20300214777 /* PBXTextBookmark */ = F5B8B7700EA7E20300214777 /* PBXTextBookmark */; - F5B8B7890EA7EE9F00214777 /* PBXTextBookmark */ = F5B8B7890EA7EE9F00214777 /* PBXTextBookmark */; - F5B8B7900EA7EE9F00214777 /* PBXTextBookmark */ = F5B8B7900EA7EE9F00214777 /* PBXTextBookmark */; - F5B8B7920EA7EE9F00214777 /* PBXTextBookmark */ = F5B8B7920EA7EE9F00214777 /* PBXTextBookmark */; - F5B8B7960EA7EE9F00214777 /* PBXTextBookmark */ = F5B8B7960EA7EE9F00214777 /* PBXTextBookmark */; - F5B8B7980EA7EE9F00214777 /* PBXTextBookmark */ = F5B8B7980EA7EE9F00214777 /* PBXTextBookmark */; - F5DCE26A0EA50EDC0065B0EF /* PBXTextBookmark */ = F5DCE26A0EA50EDC0065B0EF /* PBXTextBookmark */; - F5DCE26B0EA50EDC0065B0EF /* PBXTextBookmark */ = F5DCE26B0EA50EDC0065B0EF /* PBXTextBookmark */; - F5DCE26C0EA50EDC0065B0EF /* PBXTextBookmark */ = F5DCE26C0EA50EDC0065B0EF /* PBXTextBookmark */; - F5DCE26E0EA50EDC0065B0EF /* PBXTextBookmark */ = F5DCE26E0EA50EDC0065B0EF /* PBXTextBookmark */; + F5B19C160EA4D6E8003F4BA4 = F5B19C160EA4D6E8003F4BA4 /* PBXTextBookmark */; + F5B19C180EA4D6E8003F4BA4 = F5B19C180EA4D6E8003F4BA4 /* PBXTextBookmark */; + F5B19C1A0EA4D6E8003F4BA4 = F5B19C1A0EA4D6E8003F4BA4 /* PBXTextBookmark */; + F5B19C2F0EA4DB23003F4BA4 = F5B19C2F0EA4DB23003F4BA4 /* PBXTextBookmark */; + F5B19C300EA4DB23003F4BA4 = F5B19C300EA4DB23003F4BA4 /* PBXTextBookmark */; + F5B19C310EA4DB36003F4BA4 = F5B19C310EA4DB36003F4BA4 /* PBXTextBookmark */; + F5B1D1770EA5FE2100AB8D0F = F5B1D1770EA5FE2100AB8D0F /* PBXTextBookmark */; + F5B1D1790EA5FE2100AB8D0F = F5B1D1790EA5FE2100AB8D0F /* PBXTextBookmark */; + F5B1D1B50EA602BA00AB8D0F = F5B1D1B50EA602BA00AB8D0F /* PBXTextBookmark */; + F5B1D1B70EA602BA00AB8D0F = F5B1D1B70EA602BA00AB8D0F /* PBXTextBookmark */; + F5B1D1BD0EA602C300AB8D0F = F5B1D1BD0EA602C300AB8D0F /* PBXTextBookmark */; + F5B1D1CA0EA602F600AB8D0F = F5B1D1CA0EA602F600AB8D0F /* PBXTextBookmark */; + F5B8B7890EA7EE9F00214777 = F5B8B7890EA7EE9F00214777 /* PBXTextBookmark */; + F5B8B7960EA7EE9F00214777 = F5B8B7960EA7EE9F00214777 /* PBXTextBookmark */; + F5B8B7A30EA7F2AA00214777 = F5B8B7A30EA7F2AA00214777 /* PBXTextBookmark */; + F5DCE26A0EA50EDC0065B0EF = F5DCE26A0EA50EDC0065B0EF /* PBXTextBookmark */; + F5DCE26B0EA50EDC0065B0EF = F5DCE26B0EA50EDC0065B0EF /* PBXTextBookmark */; + F5DCE26C0EA50EDC0065B0EF = F5DCE26C0EA50EDC0065B0EF /* PBXTextBookmark */; + F5DCE26E0EA50EDC0065B0EF = F5DCE26E0EA50EDC0065B0EF /* PBXTextBookmark */; }; sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */; userBuildSettings = { @@ -426,16 +423,6 @@ vrLen = 170; vrLoc = 0; }; - F5B8B7700EA7E20300214777 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */; - name = "graph.c: 6111"; - rLen = 0; - rLoc = 204170; - rType = 0; - vrLen = 0; - vrLoc = 0; - }; F5B8B7890EA7EE9F00214777 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */; @@ -446,42 +433,6 @@ vrLen = 0; vrLoc = 0; }; - F5B8B7900EA7EE9F00214777 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5B8B7910EA7EE9F00214777 /* SDL_keysym.h */; - rLen = 0; - rLoc = 2147483647; - rType = 0; - }; - F5B8B7910EA7EE9F00214777 /* SDL_keysym.h */ = { - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - name = SDL_keysym.h; - path = /Library/Frameworks/SDL.framework/Versions/A/Headers/SDL_keysym.h; - sourceTree = ""; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {867, 5928}}"; - sepNavSelRange = "{2619, 11}"; - sepNavVisRect = "{{0, 1704}, {867, 536}}"; - sepNavWindowFrame = "{{38, -28}, {906, 665}}"; - }; - }; - F5B8B7920EA7EE9F00214777 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = F5B8B7930EA7EE9F00214777 /* SDL_keysym.h */; - name = SDLK_DELETE; - rLen = 11; - rLoc = 2619; - rType = 0; - vrLen = 559; - vrLoc = 2295; - }; - F5B8B7930EA7EE9F00214777 /* SDL_keysym.h */ = { - isa = PBXFileReference; - name = SDL_keysym.h; - path = /Library/Frameworks/SDL.framework/Versions/A/Headers/SDL_keysym.h; - sourceTree = ""; - }; F5B8B7960EA7EE9F00214777 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = F5B8B7970EA7EE9F00214777 /* SDL_keyboard.h */; @@ -495,25 +446,16 @@ name = SDL_keyboard.h; path = /Library/Frameworks/SDL.framework/Versions/A/Headers/SDL_keyboard.h; sourceTree = ""; - uiCtxt = { - sepNavWindowFrame = "{{15, 76}, {906, 665}}"; - }; }; - F5B8B7980EA7EE9F00214777 /* PBXTextBookmark */ = { + F5B8B7A30EA7F2AA00214777 /* PBXTextBookmark */ = { isa = PBXTextBookmark; - fRef = F5B8B7990EA7EE9F00214777 /* SDL_keyboard.h */; - name = "(null): 1"; + fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */; + name = "graph.c: Tourner_brosse_preview"; rLen = 0; - rLoc = 0; + rLoc = 204170; rType = 0; - vrLen = 961; - vrLoc = 1042; - }; - F5B8B7990EA7EE9F00214777 /* SDL_keyboard.h */ = { - isa = PBXFileReference; - name = SDL_keyboard.h; - path = /Library/Frameworks/SDL.framework/Versions/A/Headers/SDL_keyboard.h; - sourceTree = ""; + vrLen = 0; + vrLoc = 0; }; F5DCE26A0EA50EDC0065B0EF /* PBXTextBookmark */ = { isa = PBXTextBookmark; diff --git a/Grafx2.xcodeproj/xx.perspective b/Grafx2.xcodeproj/xx.perspective index d7566246..10d555e0 100644 --- a/Grafx2.xcodeproj/xx.perspective +++ b/Grafx2.xcodeproj/xx.perspective @@ -186,46 +186,6 @@ OpenEditors - - Content - - PBXProjectModuleGUID - F5B8B78E0EA7EE9F00214777 - PBXProjectModuleLabel - SDL_keysym.h - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - F5B8B78F0EA7EE9F00214777 - PBXProjectModuleLabel - SDL_keysym.h - _historyCapacity - 0 - bookmark - F5B8B7920EA7EE9F00214777 - history - - F5B8B7900EA7EE9F00214777 - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {906, 568}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 38 28 906 609 0 0 1024 746 - - Content @@ -241,10 +201,6 @@ F5B8B7950EA7EE9F00214777 PBXProjectModuleLabel SDL_keyboard.h - _historyCapacity - 0 - bookmark - F5B8B7980EA7EE9F00214777 history F5B8B7960EA7EE9F00214777 @@ -405,7 +361,7 @@ _historyCapacity 0 bookmark - F5B8B7890EA7EE9F00214777 + F5B8B7A30EA7F2AA00214777 history F5B19C160EA4D6E8003F4BA4 @@ -414,7 +370,7 @@ F5DCE26C0EA50EDC0065B0EF F5B1D1770EA5FE2100AB8D0F F5B1D1B50EA602BA00AB8D0F - F5B8B7700EA7E20300214777 + F5B8B7890EA7EE9F00214777 prevStack @@ -520,11 +476,11 @@ TableOfContents - F5B8B7780EA7E2E200214777 + F5B8B7A40EA7F2AA00214777 1CA23ED40692098700951B8B - F5B8B7790EA7E2E200214777 + F5B8B7A50EA7F2AA00214777 F5B19BA70EA4BF24003F4BA4 - F5B8B77A0EA7E2E200214777 + F5B8B7A60EA7F2AA00214777 1CA23EDF0692099D00951B8B 1CA23EE00692099D00951B8B 1CA23EE10692099D00951B8B @@ -593,7 +549,7 @@ PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {970, 262}} + {{0, 0}, {0, 0}} PBXTopSmartGroupGIDs @@ -671,7 +627,7 @@ Proportion - 108pt + 0pt Tabs @@ -689,7 +645,7 @@ GeometryConfiguration Frame - {{10, 27}, {0, 81}} + {{10, 27}, {0, -27}} Module PBXBuildResultsModule @@ -769,14 +725,14 @@ TableOfContents - F5B8B78A0EA7EE9F00214777 + F5B8B7A70EA7F2AA00214777 1CA23EE50692099D00951B8B - F5B8B78B0EA7EE9F00214777 + F5B8B7A80EA7F2AA00214777 F5B19BA70EA4BF24003F4BA4 - F5B8B78C0EA7EE9F00214777 + F5B8B7A90EA7F2AA00214777 XCMainBuildResultsModuleGUID 1CA23EE80692099D00951B8B - F5B8B78D0EA7EE9F00214777 + F5B8B7AA0EA7F2AA00214777 ToolbarConfiguration xcode.toolbar.config.buildAndRun @@ -945,7 +901,6 @@ 5 WindowOrderList - F5B8B78E0EA7EE9F00214777 /Users/xx/Grafx2/Grafx2.xcodeproj WindowString diff --git a/const.h b/const.h index 440dc729..bf1af00c 100644 --- a/const.h +++ b/const.h @@ -29,7 +29,7 @@ #define M_2PI 6.28318530717958647692528676656 // Note: La taille du fichier GFX2.DAT est définie au début de INIT.C ! -#define POURCENTAGE_VERSION "97.4%" // Libellé du pourcentage de la version ß +#define POURCENTAGE_VERSION "97.5%" // Libellé du pourcentage de la version ß #define VERSION1 2 // | #define VERSION2 0 // |_ Numéro de version découpé en #define BETA1 97 // | plusieurs parties => 2.0 ß95.5% diff --git a/divers.c b/divers.c index c59dda26..cdb4344d 100644 --- a/divers.c +++ b/divers.c @@ -161,20 +161,7 @@ void Get_input(void) //Clic sur un des boutons de la souris switch(event.button.button) { -#ifdef __macosx__ - // fc: poor poor mac users with a single button mouse... - // emulated with the shifts keys - case SDL_BUTTON_LEFT: - INPUT_Nouveau_Mouse_K = 1; - if(SDL_GetModState() & KMOD_LSHIFT || - SDL_GetModState() & KMOD_RSHIFT) - { - INPUT_Nouveau_Mouse_K = 2; - } - break; -#else case SDL_BUTTON_LEFT: INPUT_Nouveau_Mouse_K = 1; break; -#endif case SDL_BUTTON_MIDDLE: // Pour SDL, 2 = clic milieu. Pour nous c'est le clic droit case SDL_BUTTON_RIGHT: // Clic droit SDL, clic droit pour nous aussi ( pour le moment en tout cas) INPUT_Nouveau_Mouse_K = 2;