diff --git a/.DS_Store b/.DS_Store
index d5d2c847..044e1969 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/Grafx2.xcodeproj/xx.pbxuser b/Grafx2.xcodeproj/xx.pbxuser
index 3025b26d..00b0cf50 100644
--- a/Grafx2.xcodeproj/xx.pbxuser
+++ b/Grafx2.xcodeproj/xx.pbxuser
@@ -57,7 +57,7 @@
PBXFileTableDataSourceColumnWidthsKey = (
22,
300,
- 287,
+ 280,
);
PBXFileTableDataSourceColumnsKey = (
PBXExecutablesDataSource_ActiveFlagID,
@@ -103,13 +103,29 @@
PBXFindDataSource_LocationID,
);
};
+ PBXConfiguration.PBXFileTableDataSource3.PBXSymbolsDataSource = {
+ PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
+ PBXFileTableDataSourceColumnSortingKey = PBXSymbolsDataSource_SymbolNameID;
+ PBXFileTableDataSourceColumnWidthsKey = (
+ 16,
+ 200,
+ 50,
+ 325.2085,
+ );
+ PBXFileTableDataSourceColumnsKey = (
+ PBXSymbolsDataSource_SymbolTypeIconID,
+ PBXSymbolsDataSource_SymbolNameID,
+ PBXSymbolsDataSource_SymbolTypeID,
+ PBXSymbolsDataSource_ReferenceNameID,
+ );
+ };
PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = {
PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
PBXFileTableDataSourceColumnWidthsKey = (
20,
200,
- 200,
+ 212,
20,
48,
43,
@@ -125,8 +141,8 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 245795027;
- PBXWorkspaceStateSaveDate = 245795027;
+ PBXPerProjectTemplateStateSaveDate = 245804800;
+ PBXWorkspaceStateSaveDate = 245804800;
};
perUserProjectItems = {
F5B19C160EA4D6E8003F4BA4 = F5B19C160EA4D6E8003F4BA4 /* PBXTextBookmark */;
@@ -136,51 +152,13 @@
F5B19C300EA4DB23003F4BA4 = F5B19C300EA4DB23003F4BA4 /* PBXTextBookmark */;
F5B19C310EA4DB36003F4BA4 = F5B19C310EA4DB36003F4BA4 /* PBXTextBookmark */;
F5B1D1770EA5FE2100AB8D0F = F5B1D1770EA5FE2100AB8D0F /* PBXTextBookmark */;
- F5B1D1780EA5FE2100AB8D0F = F5B1D1780EA5FE2100AB8D0F /* PBXBookmark */;
F5B1D1790EA5FE2100AB8D0F = F5B1D1790EA5FE2100AB8D0F /* PBXTextBookmark */;
- F5B1D1880EA5FE5100AB8D0F = F5B1D1880EA5FE5100AB8D0F /* PBXTextBookmark */;
- F5B1D19A0EA600BF00AB8D0F = F5B1D19A0EA600BF00AB8D0F /* PBXTextBookmark */;
- F5B1D19B0EA600BF00AB8D0F = F5B1D19B0EA600BF00AB8D0F /* PBXTextBookmark */;
- F5B1D1AF0EA6025D00AB8D0F = F5B1D1AF0EA6025D00AB8D0F /* PBXTextBookmark */;
- F5B1D1B00EA6027D00AB8D0F = F5B1D1B00EA6027D00AB8D0F /* PBXTextBookmark */;
- F5B1D1B20EA6028C00AB8D0F = F5B1D1B20EA6028C00AB8D0F /* PBXTextBookmark */;
F5B1D1B50EA602BA00AB8D0F = F5B1D1B50EA602BA00AB8D0F /* PBXTextBookmark */;
- F5B1D1B60EA602BA00AB8D0F = F5B1D1B60EA602BA00AB8D0F /* PBXTextBookmark */;
F5B1D1B70EA602BA00AB8D0F = F5B1D1B70EA602BA00AB8D0F /* PBXTextBookmark */;
- F5B1D1B80EA602BA00AB8D0F = F5B1D1B80EA602BA00AB8D0F /* PBXTextBookmark */;
- F5B1D1B90EA602C300AB8D0F = F5B1D1B90EA602C300AB8D0F /* PBXTextBookmark */;
F5B1D1BD0EA602C300AB8D0F = F5B1D1BD0EA602C300AB8D0F /* PBXTextBookmark */;
- F5B1D1BE0EA602C300AB8D0F = F5B1D1BE0EA602C300AB8D0F /* PBXTextBookmark */;
F5B1D1CA0EA602F600AB8D0F = F5B1D1CA0EA602F600AB8D0F /* PBXTextBookmark */;
- F5B1D1CC0EA6030C00AB8D0F = F5B1D1CC0EA6030C00AB8D0F /* PBXTextBookmark */;
- F5B1D1CD0EA6030C00AB8D0F = F5B1D1CD0EA6030C00AB8D0F /* PBXTextBookmark */;
- F5B1D1CF0EA6035100AB8D0F = F5B1D1CF0EA6035100AB8D0F /* PBXTextBookmark */;
- F5B1D1D00EA6035100AB8D0F = F5B1D1D00EA6035100AB8D0F /* PBXTextBookmark */;
- F5B1D1D20EA6037500AB8D0F = F5B1D1D20EA6037500AB8D0F /* PBXTextBookmark */;
- F5B1D1D30EA6037500AB8D0F = F5B1D1D30EA6037500AB8D0F /* PBXTextBookmark */;
- F5B1D1D50EA603BB00AB8D0F = F5B1D1D50EA603BB00AB8D0F /* PBXTextBookmark */;
- F5B1D1D60EA603BB00AB8D0F = F5B1D1D60EA603BB00AB8D0F /* PBXTextBookmark */;
- F5B1D1D80EA6045800AB8D0F = F5B1D1D80EA6045800AB8D0F /* PBXTextBookmark */;
- F5B1D1D90EA6045800AB8D0F = F5B1D1D90EA6045800AB8D0F /* PBXTextBookmark */;
- F5B1D1DB0EA6047A00AB8D0F = F5B1D1DB0EA6047A00AB8D0F /* PBXTextBookmark */;
- F5B1D1DC0EA6047A00AB8D0F = F5B1D1DC0EA6047A00AB8D0F /* PBXTextBookmark */;
- F5B1D1DE0EA604D800AB8D0F = F5B1D1DE0EA604D800AB8D0F /* PBXTextBookmark */;
- F5B1D1DF0EA604D800AB8D0F = F5B1D1DF0EA604D800AB8D0F /* PBXTextBookmark */;
- F5B1D1E10EA605D200AB8D0F = F5B1D1E10EA605D200AB8D0F /* PBXTextBookmark */;
- F5B1D1E20EA605D200AB8D0F = F5B1D1E20EA605D200AB8D0F /* PBXTextBookmark */;
- F5B1D1E40EA6061B00AB8D0F = F5B1D1E40EA6061B00AB8D0F /* PBXTextBookmark */;
- F5B1D1E50EA6061B00AB8D0F = F5B1D1E50EA6061B00AB8D0F /* PBXTextBookmark */;
- F5B1D1E70EA6065F00AB8D0F = F5B1D1E70EA6065F00AB8D0F /* PBXTextBookmark */;
- F5B1D1E80EA6065F00AB8D0F = F5B1D1E80EA6065F00AB8D0F /* PBXTextBookmark */;
- F5B1D1EA0EA6070000AB8D0F = F5B1D1EA0EA6070000AB8D0F /* PBXTextBookmark */;
- F5B1D1EB0EA6070000AB8D0F = F5B1D1EB0EA6070000AB8D0F /* PBXTextBookmark */;
- F5B1D1EE0EA608C200AB8D0F = F5B1D1EE0EA608C200AB8D0F /* PBXTextBookmark */;
- F5B1D1EF0EA608C200AB8D0F = F5B1D1EF0EA608C200AB8D0F /* PBXTextBookmark */;
- F5B1D1F10EA6093700AB8D0F = F5B1D1F10EA6093700AB8D0F /* PBXTextBookmark */;
- F5B1D1F20EA6093700AB8D0F = F5B1D1F20EA6093700AB8D0F /* PBXTextBookmark */;
- F5B1D1F40EA60C3700AB8D0F = F5B1D1F40EA60C3700AB8D0F /* PBXTextBookmark */;
- F5B1D1F50EA60C3700AB8D0F = F5B1D1F50EA60C3700AB8D0F /* PBXTextBookmark */;
- F5BF1F120EA68C30000E9B3D /* PBXTextBookmark */ = F5BF1F120EA68C30000E9B3D /* PBXTextBookmark */;
+ F5BF1F1F0EA69319000E9B3D = F5BF1F1F0EA69319000E9B3D /* PBXTextBookmark */;
+ F5D35A630EA6AE4800497F18 = F5D35A630EA6AE4800497F18 /* PBXTextBookmark */;
F5DCE26A0EA50EDC0065B0EF = F5DCE26A0EA50EDC0065B0EF /* PBXTextBookmark */;
F5DCE26B0EA50EDC0065B0EF = F5DCE26B0EA50EDC0065B0EF /* PBXTextBookmark */;
F5DCE26C0EA50EDC0065B0EF = F5DCE26C0EA50EDC0065B0EF /* PBXTextBookmark */;
@@ -258,9 +236,9 @@
};
F5B19B7B0EA4BE3E003F4BA4 /* graph.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1732, 117705}}";
- sepNavSelRange = "{204644, 0}";
- sepNavVisRect = "{{0, 9}, {583, 67}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1620, 116090}}";
+ sepNavSelRange = "{204086, 0}";
+ sepNavVisRect = "{{0, 0}, {0, 0}}";
};
};
F5B19B7C0EA4BE3E003F4BA4 /* init.c */ = {
@@ -271,6 +249,14 @@
sepNavWindowFrame = "{{12, 46}, {906, 665}}";
};
};
+ F5B19B7F0EA4BE3E003F4BA4 /* loadsave.c */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {1700, 101574}}";
+ sepNavSelRange = "{28358, 27}";
+ sepNavVisRect = "{{0, 18096}, {867, 536}}";
+ sepNavWindowFrame = "{{15, 76}, {906, 665}}";
+ };
+ };
F5B19B800EA4BE3E003F4BA4 /* moteur.c */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1420, 37145}}";
@@ -386,10 +372,6 @@
vrLen = 376;
vrLoc = 0;
};
- F5B1D1780EA5FE2100AB8D0F /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = F5B19B800EA4BE3E003F4BA4 /* moteur.c */;
- };
F5B1D1790EA5FE2100AB8D0F /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = F5DCE2700EA50EDC0065B0EF /* SDL_image.h */;
@@ -400,66 +382,6 @@
vrLen = 376;
vrLoc = 0;
};
- F5B1D1880EA5FE5100AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B800EA4BE3E003F4BA4 /* moteur.c */;
- name = "moteur.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 351;
- vrLoc = 0;
- };
- F5B1D19A0EA600BF00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B800EA4BE3E003F4BA4 /* moteur.c */;
- name = "moteur.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 351;
- vrLoc = 0;
- };
- F5B1D19B0EA600BF00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B800EA4BE3E003F4BA4 /* moteur.c */;
- name = "moteur.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
- F5B1D1AF0EA6025D00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B800EA4BE3E003F4BA4 /* moteur.c */;
- name = "moteur.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 227;
- vrLoc = 0;
- };
- F5B1D1B00EA6027D00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B800EA4BE3E003F4BA4 /* moteur.c */;
- name = "moteur.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 227;
- vrLoc = 0;
- };
- F5B1D1B20EA6028C00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B800EA4BE3E003F4BA4 /* moteur.c */;
- name = "moteur.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 434;
- vrLoc = 0;
- };
F5B1D1B50EA602BA00AB8D0F /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = F5B19B800EA4BE3E003F4BA4 /* moteur.c */;
@@ -470,16 +392,6 @@
vrLen = 227;
vrLoc = 0;
};
- F5B1D1B60EA602BA00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 233;
- vrLoc = 0;
- };
F5B1D1B70EA602BA00AB8D0F /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = F5B19B800EA4BE3E003F4BA4 /* moteur.c */;
@@ -490,26 +402,6 @@
vrLen = 227;
vrLoc = 0;
};
- F5B1D1B80EA602BA00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 233;
- vrLoc = 0;
- };
- F5B1D1B90EA602C300AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 233;
- vrLoc = 0;
- };
F5B1D1BD0EA602C300AB8D0F /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = F5B19B800EA4BE3E003F4BA4 /* moteur.c */;
@@ -520,16 +412,6 @@
vrLen = 0;
vrLoc = 0;
};
- F5B1D1BE0EA602C300AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
F5B1D1CA0EA602F600AB8D0F /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
@@ -540,296 +422,26 @@
vrLen = 170;
vrLoc = 0;
};
- F5B1D1CC0EA6030C00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 170;
- vrLoc = 0;
- };
- F5B1D1CD0EA6030C00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
- F5B1D1CF0EA6035100AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6099";
- rLen = 0;
- rLoc = 204564;
- rType = 0;
- vrLen = 170;
- vrLoc = 0;
- };
- F5B1D1D00EA6035100AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6099";
- rLen = 0;
- rLoc = 204564;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
- F5B1D1D20EA6037500AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6099";
- rLen = 0;
- rLoc = 204566;
- rType = 0;
- vrLen = 170;
- vrLoc = 0;
- };
- F5B1D1D30EA6037500AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6099";
- rLen = 0;
- rLoc = 204566;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
- F5B1D1D50EA603BB00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6097";
- rLen = 0;
- rLoc = 204542;
- rType = 0;
- vrLen = 170;
- vrLoc = 0;
- };
- F5B1D1D60EA603BB00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6097";
- rLen = 0;
- rLoc = 204542;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
- F5B1D1D80EA6045800AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6098";
- rLen = 0;
- rLoc = 204546;
- rType = 0;
- vrLen = 170;
- vrLoc = 0;
- };
- F5B1D1D90EA6045800AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6098";
- rLen = 0;
- rLoc = 204546;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
- F5B1D1DB0EA6047A00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6098";
- rLen = 0;
- rLoc = 204546;
- rType = 0;
- vrLen = 170;
- vrLoc = 0;
- };
- F5B1D1DC0EA6047A00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6098";
- rLen = 0;
- rLoc = 204546;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
- F5B1D1DE0EA604D800AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6099";
- rLen = 0;
- rLoc = 204552;
- rType = 0;
- vrLen = 170;
- vrLoc = 0;
- };
- F5B1D1DF0EA604D800AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6099";
- rLen = 0;
- rLoc = 204552;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
- F5B1D1E10EA605D200AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6100";
- rLen = 0;
- rLoc = 204636;
- rType = 0;
- vrLen = 170;
- vrLoc = 0;
- };
- F5B1D1E20EA605D200AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6100";
- rLen = 0;
- rLoc = 204636;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
- F5B1D1E40EA6061B00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6100";
- rLen = 0;
- rLoc = 204638;
- rType = 0;
- vrLen = 170;
- vrLoc = 0;
- };
- F5B1D1E50EA6061B00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6100";
- rLen = 0;
- rLoc = 204638;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
- F5B1D1E70EA6065F00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6098";
- rLen = 0;
- rLoc = 204608;
- rType = 0;
- vrLen = 170;
- vrLoc = 0;
- };
- F5B1D1E80EA6065F00AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6098";
- rLen = 0;
- rLoc = 204608;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
- F5B1D1EA0EA6070000AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6101";
- rLen = 0;
- rLoc = 204689;
- rType = 0;
- vrLen = 170;
- vrLoc = 0;
- };
- F5B1D1EB0EA6070000AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6101";
- rLen = 0;
- rLoc = 204689;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
- F5B1D1EE0EA608C200AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6099";
- rLen = 0;
- rLoc = 204546;
- rType = 0;
- vrLen = 170;
- vrLoc = 0;
- };
- F5B1D1EF0EA608C200AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6099";
- rLen = 0;
- rLoc = 204546;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
- F5B1D1F10EA6093700AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6101";
- rLen = 0;
- rLoc = 204617;
- rType = 0;
- vrLen = 170;
- vrLoc = 0;
- };
- F5B1D1F20EA6093700AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6101";
- rLen = 0;
- rLoc = 204617;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
- F5B1D1F40EA60C3700AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6103";
- rLen = 0;
- rLoc = 204644;
- rType = 0;
- vrLen = 170;
- vrLoc = 0;
- };
- F5B1D1F50EA60C3700AB8D0F /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
- name = "graph.c: 6103";
- rLen = 0;
- rLoc = 204644;
- rType = 0;
- vrLen = 0;
- vrLoc = 0;
- };
- F5BF1F120EA68C30000E9B3D /* PBXTextBookmark */ = {
+ F5BF1F1F0EA69319000E9B3D /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
name = "graph.c: 6162";
rLen = 0;
- rLoc = 204644;
+ rLoc = 204086;
rType = 0;
vrLen = 170;
vrLoc = 0;
};
+ F5D35A630EA6AE4800497F18 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */;
+ name = "graph.c: 6162";
+ rLen = 0;
+ rLoc = 204086;
+ rType = 0;
+ vrLen = 0;
+ vrLoc = 0;
+ };
F5DCE26A0EA50EDC0065B0EF /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = F5B19B880EA4BE3E003F4BA4 /* saveini.c */;
diff --git a/Grafx2.xcodeproj/xx.perspective b/Grafx2.xcodeproj/xx.perspective
index 41b85033..ea913dd5 100644
--- a/Grafx2.xcodeproj/xx.perspective
+++ b/Grafx2.xcodeproj/xx.perspective
@@ -266,16 +266,16 @@
29B97314FDCFA39411CA2CEA
1C37FBAC04509CD000000102
- F5BF1F110EA68C30000E9B3D
PBXSmartGroupTreeModuleOutlineStateSelectionKey
- 46
+ 40
+ 39
PBXSmartGroupTreeModuleOutlineStateVisibleRectKey
- {{0, 470}, {339, 502}}
+ {{0, 494}, {339, 262}}
PBXTopSmartGroupGIDs
@@ -285,7 +285,7 @@
GeometryConfiguration
Frame
- {{0, 0}, {356, 520}}
+ {{0, 0}, {356, 280}}
GroupTreeTableConfiguration
FileBuiltColumn
@@ -296,7 +296,7 @@
297
RubberWindowFrame
- 7 141 985 561 0 0 1024 746
+ 11 98 992 321 0 0 1024 746
Module
PBXSmartGroupTreeModule
@@ -324,7 +324,7 @@
_historyCapacity
0
bookmark
- F5BF1F120EA68C30000E9B3D
+ F5D35A630EA6AE4800497F18
history
F5B19C160EA4D6E8003F4BA4
@@ -333,7 +333,7 @@
F5DCE26C0EA50EDC0065B0EF
F5B1D1770EA5FE2100AB8D0F
F5B1D1B50EA602BA00AB8D0F
- F5B1D1F40EA60C3700AB8D0F
+ F5BF1F1F0EA69319000E9B3D
prevStack
@@ -353,18 +353,18 @@
GeometryConfiguration
Frame
- {{0, 0}, {624, 99}}
+ {{0, 0}, {631, 0}}
RubberWindowFrame
- 7 141 985 561 0 0 1024 746
+ 11 98 992 321 0 0 1024 746
Module
PBXNavigatorGroup
Proportion
- 99pt
+ 0pt
Proportion
- 416pt
+ 275pt
Tabs
@@ -378,9 +378,9 @@
GeometryConfiguration
Frame
- {{10, 27}, {624, 389}}
+ {{10, 27}, {631, 248}}
RubberWindowFrame
- 7 141 985 561 0 0 1024 746
+ 11 98 992 321 0 0 1024 746
Module
XCDetailModule
@@ -421,7 +421,7 @@
Proportion
- 624pt
+ 631pt
Name
@@ -439,11 +439,11 @@
TableOfContents
- F5BF1F130EA68C30000E9B3D
+ F5D35A4C0EA6A4F800497F18
1CA23ED40692098700951B8B
- F5BF1F140EA68C30000E9B3D
+ F5D35A4D0EA6A4F800497F18
F5B19BA70EA4BF24003F4BA4
- F5BF1F150EA68C30000E9B3D
+ F5D35A4E0EA6A4F800497F18
1CA23EDF0692099D00951B8B
1CA23EE00692099D00951B8B
1CA23EE10692099D00951B8B
@@ -688,14 +688,14 @@
TableOfContents
- F5BF1F160EA68C30000E9B3D
+ F5D35A4F0EA6A4F800497F18
1CA23EE50692099D00951B8B
- F5BF1F170EA68C30000E9B3D
+ F5D35A500EA6A4F800497F18
F5B19BA70EA4BF24003F4BA4
- F5BF1F180EA68C30000E9B3D
+ F5D35A510EA6A4F800497F18
XCMainBuildResultsModuleGUID
1CA23EE80692099D00951B8B
- F5BF1F190EA68C30000E9B3D
+ F5D35A520EA6A4F800497F18
ToolbarConfiguration
xcode.toolbar.config.buildAndRun
@@ -867,7 +867,7 @@
/Users/xx/Grafx2/Grafx2.xcodeproj
WindowString
- 7 141 985 561 0 0 1024 746
+ 11 98 992 321 0 0 1024 746
WindowTools
diff --git a/aide.c b/aide.c
index 462ed0c9..e4db6d43 100644
--- a/aide.c
+++ b/aide.c
@@ -1,6 +1,7 @@
/* Grafx2 - The Ultimate 256-color bitmap paint program
Copyright 2008 Yves Rizoud
+ Copyright 2008 Franck Charlet
Copyright 2007 Adrien Destugues
Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud)
diff --git a/divers.c b/divers.c
index 5d9ef003..c59dda26 100644
--- a/divers.c
+++ b/divers.c
@@ -1,6 +1,7 @@
/* Grafx2 - The Ultimate 256-color bitmap paint program
Copyright 2008 Yves Rizoud
+ Copyright 2008 Franck Charlet
Copyright 2007 Adrien Destugues
Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud)
@@ -161,7 +162,7 @@ void Get_input(void)
switch(event.button.button)
{
#ifdef __macosx__
- // fc: poor poor mac users with a signle button mouse...
+ // fc: poor poor mac users with a single button mouse...
// emulated with the shifts keys
case SDL_BUTTON_LEFT:
INPUT_Nouveau_Mouse_K = 1;
diff --git a/graph.c b/graph.c
index e30c5ead..951acac0 100644
--- a/graph.c
+++ b/graph.c
@@ -1,5 +1,6 @@
/* Grafx2 - The Ultimate 256-color bitmap paint program
+ Copyright 2008 Franck Charlet
Copyright 2007 Adrien Destugues
Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud)
@@ -504,14 +505,14 @@ unsigned long Memoire_libre(void)
#ifdef __linux__
#ifdef __macosx__
int mib[2];
- int maxmem;
- size_t len;
+ int maxmem;
+ size_t len;
- mib[0] = CTL_HW;
- mib[1] = HW_USERMEM;
- len = sizeof(maxmem);
- sysctl(mib,2,&maxmem,&len,NULL,0);
- return maxmem;
+ mib[0] = CTL_HW;
+ mib[1] = HW_USERMEM;
+ len = sizeof(maxmem);
+ sysctl(mib,2,&maxmem,&len,NULL,0);
+ return maxmem;
#else
struct sysinfo info;
sysinfo(&info);
diff --git a/init.c b/init.c
index 9799dca3..f53e6ac5 100644
--- a/init.c
+++ b/init.c
@@ -1,6 +1,7 @@
/* Grafx2 - The Ultimate 256-color bitmap paint program
Copyright 2008 Yves Rizoud
+ Copyright 2008 Franck Charlet
Copyright 2007 Adrien Destugues
Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud)
diff --git a/loadsave.c b/loadsave.c
index 375620ce..61af5e71 100644
--- a/loadsave.c
+++ b/loadsave.c
@@ -1,6 +1,7 @@
/* Grafx2 - The Ultimate 256-color bitmap paint program
Copyright 2008 Yves Rizoud
+ Copyright 2008 Franck Charlet
Copyright 2007 Adrien Destugues
Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud)
@@ -775,6 +776,12 @@ void Load_IMG(void)
if (read_bytes(Fichier,&IMG_Header,sizeof(T_Header_IMG)))
{
+
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ IMG_Header.Largeur = SDL_Swap16(IMG_Header.Largeur);
+ IMG_Header.Hauteur = SDL_Swap16(IMG_Header.Hauteur);
+#endif
+
Buffer=(byte *)malloc(IMG_Header.Largeur);
Initialiser_preview(IMG_Header.Largeur,IMG_Header.Hauteur,Taille_du_fichier,FORMAT_IMG);
@@ -848,6 +855,11 @@ void Save_IMG(void)
memcpy(IMG_Header.Palette,Principal_Palette,sizeof(T_Palette));
Palette_256_to_64(Principal_Palette);
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ IMG_Header.Largeur = SDL_Swap16(IMG_Header.Largeur);
+ IMG_Header.Hauteur = SDL_Swap16(IMG_Header.Hauteur);
+#endif
+
if (write_bytes(Fichier,&IMG_Header,sizeof(T_Header_IMG)))
{
Init_ecriture();
@@ -956,6 +968,13 @@ void Load_PKM(void)
if (read_bytes(Fichier,&Head,sizeof(T_Header_PKM)))
{
+
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ Head.Largeur = SDL_Swap16(Head.Largeur);
+ Head.Hauteur = SDL_Swap16(Head.Hauteur);
+ Head.Jump = SDL_Swap16(Head.Jump);
+#endif
+
Principal_Commentaire[0]='\0'; // On efface le commentaire
if (Head.Jump)
{
@@ -1194,6 +1213,13 @@ void Save_PKM(void)
// Ouverture du fichier
if ((Fichier=fopen(Nom_du_fichier,"wb")))
{
+
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ Head.Largeur = SDL_Swap16(Head.Largeur);
+ Head.Hauteur = SDL_Swap16(Head.Hauteur);
+ Head.Jump = SDL_Swap16(Head.Jump);
+#endif
+
// Ecriture du header
if (write_bytes(Fichier,&Head,sizeof(T_Header_PKM)))
{
@@ -2108,6 +2134,11 @@ void Test_BMP(void)
&& read_dword_le(Fichier,&(Header.Clr_Imprt))
)
{
+
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ Header.Signature = SDL_Swap16(Header.Signature);
+#endif
+
if ( (Header.Signature==0x4D42) && (Header.Taille_2==40)
&& Header.Largeur && Header.Hauteur )
Erreur_fichier=0;
@@ -2418,7 +2449,11 @@ void Save_BMP(void)
else
Taille_ligne=Principal_Largeur_image;
- Header.Signature =0x4D42;
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ Header.Signature = 0x424D;
+#else
+ Header.Signature = 0x4D42;
+#endif
Header.Taille_1 =(Taille_ligne*Principal_Hauteur_image)+1078;
Header.Reserv_1 =0;
Header.Reserv_2 =0;
@@ -2690,6 +2725,7 @@ void Load_GIF(void)
( (memcmp(Signature,"GIF87a",6)==0) ||
(memcmp(Signature,"GIF89a",6)==0) ) )
{
+
// Allocation de mémoire pour les tables & piles de traitement:
Alphabet_Pile =(word *)malloc(4096*sizeof(word));
Alphabet_Prefixe=(word *)malloc(4096*sizeof(word));
@@ -2704,8 +2740,8 @@ void Load_GIF(void)
{
// Lecture du Logical Screen Descriptor Block réussie:
- Ecran_original_X=endian_magic16(LSDB.Largeur);
- Ecran_original_Y=endian_magic16(LSDB.Hauteur);
+ Ecran_original_X=LSDB.Largeur;
+ Ecran_original_Y=LSDB.Hauteur;
// Palette globale dispo = (LSDB.Resol and $80)
// Profondeur de couleur =((LSDB.Resol and $70) shr 4)+1
@@ -2797,10 +2833,10 @@ void Load_GIF(void)
&& read_byte(GIF_Fichier,&(IDB.Nb_bits_pixel))
&& IDB.Largeur_image && IDB.Hauteur_image)
{
- Principal_Largeur_image=endian_magic16(IDB.Largeur_image);
- Principal_Hauteur_image=endian_magic16(IDB.Hauteur_image);
+ Principal_Largeur_image=IDB.Largeur_image;
+ Principal_Hauteur_image=IDB.Hauteur_image;
- Initialiser_preview(endian_magic16(IDB.Largeur_image),endian_magic16(IDB.Hauteur_image),Taille_du_fichier,FORMAT_GIF);
+ Initialiser_preview(IDB.Largeur_image,IDB.Hauteur_image,Taille_du_fichier,FORMAT_GIF);
// Palette locale dispo = (IDB.Indicateur and $80)
// Image entrelacée = (IDB.Indicateur and $40)
@@ -3084,6 +3120,11 @@ void Save_GIF(void)
// On sauve le LSDB dans le fichier
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ LSDB.Largeur = SDL_Swap16(LSDB.Largeur);
+ LSDB.Hauteur = SDL_Swap16(LSDB.Hauteur);
+#endif
+
if (write_bytes(GIF_Fichier,&LSDB,sizeof(T_LSDB)))
{
// Le LSDB a été correctement écrit.
@@ -3108,6 +3149,11 @@ void Save_GIF(void)
IDB.Indicateur=0x07; // Image non entrelacée, pas de palette locale.
IDB.Nb_bits_pixel=8; // Image 256 couleurs;
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+ IDB.Largeur_image = SDL_Swap16(IDB.Largeur_image);
+ IDB.Hauteur_image = SDL_Swap16(IDB.Hauteur_image);
+#endif
+
if ( write_bytes(GIF_Fichier,&Block_indicateur,1) &&
write_bytes(GIF_Fichier,&IDB,sizeof(T_IDB)) )
{
diff --git a/main.c b/main.c
index a1ab3557..1b5163eb 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,6 @@
/* Grafx2 - The Ultimate 256-color bitmap paint program
+ Copyright 2008 Franck Charlet
Copyright 2007 Adrien Destugues
Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud)
diff --git a/pages.c b/pages.c
index c2df380b..6f9bff3d 100644
--- a/pages.c
+++ b/pages.c
@@ -1,5 +1,6 @@
/* Grafx2 - The Ultimate 256-color bitmap paint program
+ Copyright 2008 Franck Charlet
Copyright 2007 Adrien Destugues
Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud)
@@ -830,7 +831,7 @@ void Backup(void)
#ifdef __macosx__
S_Page Nouvelle_page;
#else
- S_Page * Nouvelle_page;
+ S_Page *Nouvelle_page;
#endif
// On remet à jour l'état des infos de la page courante (pour pouvoir les
diff --git a/sdlscreen.c b/sdlscreen.c
index 8b521bb3..08ab0def 100644
--- a/sdlscreen.c
+++ b/sdlscreen.c
@@ -1,6 +1,7 @@
/* Grafx2 - The Ultimate 256-color bitmap paint program
Copyright 2008 Yves Rizoud
+ Copyright 2008 Franck Charlet
Copyright 2007 Adrien Destugues
Copyright 1996-2001 Sunset Design (Guillaume Dorme & Karl Maritaud)