Updated Project files

7 files changed, 309 insertions, 345 deletions

diff --git a/English.lproj/main.nib/classes.nib b/English.lproj/main.nib/classes.nib
index ea58db11..c4b887e7 100644
--- a/English.lproj/main.nib/classes.nib
+++ b/English.lproj/main.nib/classes.nib
@@ -1,4 +1,8 @@
-{
-IBClasses = ();
-IBVersion = 1;
-}
+<?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>IBVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/English.lproj/main.nib/info.nib b/English.lproj/main.nib/info.nib
index dfd1f0e8..0411a4a5 100644
--- a/English.lproj/main.nib/info.nib
+++ b/English.lproj/main.nib/info.nib
@@ -1,25 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>IBDocumentLocation</key>
-	<string>117 12 356 240 0 0 1920 1178 </string>
-	<key>IBEditorPositions</key>
-	<dict>
-		<key>29</key>
-		<string>110 302 204 44 0 0 1920 1178 </string>
-	</dict>
 	<key>IBFramework Version</key>
-	<string>431.0</string>
+	<string>670</string>
+	<key>IBLastKnownRelativeProjectPath</key>
+	<string>../themanaworld.xcodeproj</string>
 	<key>IBOldestOS</key>
-	<integer>3</integer>
+	<integer>5</integer>
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>29</integer>
-		<integer>166</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>8A383</string>
+	<string>9F33</string>
 	<key>targetFramework</key>
 	<string>IBCarbonFramework</string>
 </dict>
diff --git a/English.lproj/main.nib/objects.xib b/English.lproj/main.nib/objects.xib
index d1922ce1..6d0c83db 100644
--- a/English.lproj/main.nib/objects.xib
+++ b/English.lproj/main.nib/objects.xib
@@ -1,272 +1,77 @@
 <?xml version="1.0" standalone="yes"?>
 <object class="NSIBObjectData">
-  <string name="targetFramework">IBCarbonFramework</string>
   <object name="rootObject" class="NSCustomObject" id="1">
-    <string name="customClass">NSApplication</string>
   </object>
-  <array count="38" name="allObjects">
-    <object class="IBCarbonMenu" id="29">
-      <string name="title">main</string>
-      <array count="4" name="items">
-        <object class="IBCarbonMenuItem" id="185">
-          <string name="title">themanaworld</string>
-          <object name="submenu" class="IBCarbonMenu" id="184">
-            <string name="title">themanaworld</string>
-            <array count="1" name="items">
-              <object class="IBCarbonMenuItem" id="187">
-                <string name="title">About themanaworld</string>
-                <int name="keyEquivalentModifier">0</int>
-                <ostype name="command">abou</ostype>
-              </object>
-            </array>
-            <string name="name">_NSAppleMenu</string>
-          </object>
-        </object>
-        <object class="IBCarbonMenuItem" id="127">
-          <string name="title">File</string>
-          <object name="submenu" class="IBCarbonMenu" id="131">
-            <string name="title">File</string>
-            <array count="10" name="items">
-              <object class="IBCarbonMenuItem" id="139">
-                <string name="title">New</string>
-                <string name="keyEquivalent">n</string>
-                <ostype name="command">new </ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="134">
-                <string name="title">Open…</string>
-                <string name="keyEquivalent">o</string>
-                <ostype name="command">open</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="133">
-                <boolean name="separator">TRUE</boolean>
-              </object>
-              <object class="IBCarbonMenuItem" id="130">
-                <string name="title">Close</string>
-                <string name="keyEquivalent">w</string>
-                <ostype name="command">clos</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="138">
-                <string name="title">Save</string>
-                <string name="keyEquivalent">s</string>
-                <ostype name="command">save</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="137">
-                <string name="title">Save As…</string>
-                <string name="keyEquivalent">S</string>
-                <ostype name="command">svas</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="132">
-                <string name="title">Revert</string>
-                <string name="keyEquivalent">r</string>
-                <ostype name="command">rvrt</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="128">
-                <boolean name="separator">TRUE</boolean>
-              </object>
-              <object class="IBCarbonMenuItem" id="135">
-                <string name="title">Page Setup…</string>
-                <string name="keyEquivalent">P</string>
-                <ostype name="command">page</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="136">
-                <string name="title">Print…</string>
-                <string name="keyEquivalent">p</string>
-                <ostype name="command">prnt</ostype>
-              </object>
-            </array>
-          </object>
-        </object>
-        <object class="IBCarbonMenuItem" id="152">
-          <string name="title">Edit</string>
-          <object name="submenu" class="IBCarbonMenu" id="147">
-            <string name="title">Edit</string>
-            <array count="10" name="items">
-              <object class="IBCarbonMenuItem" id="141">
-                <string name="title">Undo</string>
-                <string name="keyEquivalent">z</string>
-                <ostype name="command">undo</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="146">
-                <string name="title">Redo</string>
-                <string name="keyEquivalent">Z</string>
-                <ostype name="command">redo</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="142">
-                <boolean name="separator">TRUE</boolean>
-              </object>
-              <object class="IBCarbonMenuItem" id="143">
-                <string name="title">Cut</string>
-                <string name="keyEquivalent">x</string>
-                <ostype name="command">cut </ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="149">
-                <string name="title">Copy</string>
-                <string name="keyEquivalent">c</string>
-                <ostype name="command">copy</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="144">
-                <string name="title">Paste</string>
-                <string name="keyEquivalent">v</string>
-                <ostype name="command">past</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="151">
-                <string name="title">Delete</string>
-                <ostype name="command">clea</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="148">
-                <string name="title">Select All</string>
-                <string name="keyEquivalent">a</string>
-                <ostype name="command">sall</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="199">
-                <boolean name="separator">TRUE</boolean>
-              </object>
-              <object class="IBCarbonMenuItem" id="198">
-                <string name="title">Special Characters…</string>
-                <ostype name="command">chrp</ostype>
-              </object>
-            </array>
-          </object>
-        </object>
-        <object class="IBCarbonMenuItem" id="192">
-          <string name="title">Window</string>
-          <object name="submenu" class="IBCarbonMenu" id="195">
-            <string name="title">Window</string>
-            <array count="6" name="items">
-              <object class="IBCarbonMenuItem" id="190">
-                <boolean name="dynamic">TRUE</boolean>
-                <string name="title">Minimize</string>
-                <string name="keyEquivalent">m</string>
-                <ostype name="command">mini</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="191">
-                <boolean name="dynamic">TRUE</boolean>
-                <string name="title">Minimize All</string>
-                <string name="keyEquivalent">m</string>
-                <int name="keyEquivalentModifier">1572864</int>
-                <ostype name="command">mina</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="197">
-                <string name="title">Zoom</string>
-                <ostype name="command">zoom</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="194">
-                <boolean name="separator">TRUE</boolean>
-              </object>
-              <object class="IBCarbonMenuItem" id="196">
-                <boolean name="dynamic">TRUE</boolean>
-                <string name="title">Bring All to Front</string>
-                <ostype name="command">bfrt</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="193">
-                <boolean name="dynamic">TRUE</boolean>
-                <string name="title">Arrange in Front</string>
-                <int name="keyEquivalentModifier">1572864</int>
-                <ostype name="command">frnt</ostype>
-              </object>
-            </array>
-            <string name="name">_NSWindowsMenu</string>
-          </object>
-        </object>
-      </array>
-      <string name="name">_NSMainMenu</string>
+  <array count="8" name="allObjects">
+    <object class="IBCarbonMenuItem" id="229">
+      <string name="title">Quit</string>
+      <string name="keyEquivalent">q</string>
+      <boolean name="notPreviousAlternate">TRUE</boolean>
+      <ostype name="command">quit</ostype>
     </object>
-    <reference idRef="127"/>
-    <reference idRef="128"/>
-    <reference idRef="130"/>
-    <reference idRef="131"/>
-    <reference idRef="132"/>
-    <reference idRef="133"/>
-    <reference idRef="134"/>
-    <reference idRef="135"/>
-    <reference idRef="136"/>
-    <reference idRef="137"/>
-    <reference idRef="138"/>
-    <reference idRef="139"/>
-    <reference idRef="141"/>
-    <reference idRef="142"/>
-    <reference idRef="143"/>
-    <reference idRef="144"/>
-    <reference idRef="146"/>
-    <reference idRef="147"/>
-    <reference idRef="148"/>
-    <reference idRef="149"/>
-    <reference idRef="151"/>
-    <reference idRef="152"/>
     <object class="IBCarbonWindow" id="166">
-      <string name="windowRect">204 300 564 780 </string>
-      <string name="title">Window</string>
-      <object name="rootControl" class="IBCarbonRootControl" id="167">
-        <string name="bounds">0 0 360 480 </string>
-        <string name="viewFrame">0 0 480 360 </string>
-      </object>
       <boolean name="receiveUpdates">FALSE</boolean>
       <boolean name="liveResize">TRUE</boolean>
       <boolean name="compositing">TRUE</boolean>
       <boolean name="isConstrained">FALSE</boolean>
+      <string name="title">Window</string>
+      <object name="rootControl" class="IBCarbonRootControl" id="167">
+        <string name="viewFrame">0 0 480 360 </string>
+        <string name="bounds">0 0 360 480 </string>
+      </object>
+      <string name="windowRect">204 300 564 780 </string>
+      <string name="ScreenRectAtEncodeTime">0 0 768 1024 </string>
+    </object>
+    <object class="IBCarbonMenu" id="184">
+      <string name="title">themanaworld</string>
+      <string name="name">_NSAppleMenu</string>
+      <array count="3" name="items">
+        <object class="IBCarbonMenuItem" id="187">
+          <string name="title">About themanaworld</string>
+          <int name="keyEquivalentModifier">0</int>
+          <ostype name="command">abou</ostype>
+        </object>
+        <object class="IBCarbonMenuItem" id="230">
+          <boolean name="separator">TRUE</boolean>
+          <boolean name="disabled">TRUE</boolean>
+          <boolean name="notPreviousAlternate">TRUE</boolean>
+        </object>
+        <reference idRef="229"/>
+      </array>
+    </object>
+    <reference idRef="230"/>
+    <object class="IBCarbonMenu" id="29">
+      <string name="title">main</string>
+      <string name="name">_NSMainMenu</string>
+      <array count="1" name="items">
+        <object class="IBCarbonMenuItem" id="185">
+          <string name="title">themanaworld</string>
+          <reference name="submenu" idRef="184"/>
+        </object>
+      </array>
     </object>
     <reference idRef="167"/>
-    <reference idRef="184"/>
-    <reference idRef="185"/>
     <reference idRef="187"/>
-    <reference idRef="190"/>
-    <reference idRef="191"/>
-    <reference idRef="192"/>
-    <reference idRef="193"/>
-    <reference idRef="194"/>
-    <reference idRef="195"/>
-    <reference idRef="196"/>
-    <reference idRef="197"/>
-    <reference idRef="198"/>
-    <reference idRef="199"/>
+    <reference idRef="185"/>
   </array>
-  <array count="38" name="allParents">
+  <array count="8" name="allParents">
+    <reference idRef="184"/>
     <reference idRef="1"/>
-    <reference idRef="29"/>
-    <reference idRef="131"/>
-    <reference idRef="131"/>
-    <reference idRef="127"/>
-    <reference idRef="131"/>
-    <reference idRef="131"/>
-    <reference idRef="131"/>
-    <reference idRef="131"/>
-    <reference idRef="131"/>
-    <reference idRef="131"/>
-    <reference idRef="131"/>
-    <reference idRef="131"/>
-    <reference idRef="147"/>
-    <reference idRef="147"/>
-    <reference idRef="147"/>
-    <reference idRef="147"/>
-    <reference idRef="147"/>
-    <reference idRef="152"/>
-    <reference idRef="147"/>
-    <reference idRef="147"/>
-    <reference idRef="147"/>
-    <reference idRef="29"/>
+    <reference idRef="185"/>
+    <reference idRef="184"/>
     <reference idRef="1"/>
     <reference idRef="166"/>
-    <reference idRef="185"/>
-    <reference idRef="29"/>
     <reference idRef="184"/>
-    <reference idRef="195"/>
-    <reference idRef="195"/>
     <reference idRef="29"/>
-    <reference idRef="195"/>
-    <reference idRef="195"/>
-    <reference idRef="192"/>
-    <reference idRef="195"/>
-    <reference idRef="195"/>
-    <reference idRef="147"/>
-    <reference idRef="147"/>
   </array>
   <dictionary count="3" name="nameTable">
-    <string>Files Owner</string>
+    <string>File&apos;s Owner</string>
     <reference idRef="1"/>
     <string>MainWindow</string>
     <reference idRef="166"/>
     <string>MenuBar</string>
     <reference idRef="29"/>
   </dictionary>
-  <unsigned_int name="nextObjectID">200</unsigned_int>
+  <string name="targetFramework">IBCarbonFramework</string>
+  <unsigned_int name="nextObjectID">231</unsigned_int>
 </object>
diff --git a/Info.plist b/Info.plist
index 76f8dc76..8699a8ae 100644
--- a/Info.plist
+++ b/Info.plist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!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>
@@ -18,8 +18,12 @@
 	<string>tmw.</string>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 2008 The Mana World Development Team</string>
 	<key>NSMainNibFile</key>
 	<string>main</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
 	<key>NSPrincipleClass</key>
 	<string>NSApplication</string>
 </dict>
diff --git a/themanaworld.xcodeproj/garfield.mode1v3 b/themanaworld.xcodeproj/garfield.mode1v3
index fc9662d9..1b941b63 100644
--- a/themanaworld.xcodeproj/garfield.mode1v3
+++ b/themanaworld.xcodeproj/garfield.mode1v3
@@ -229,8 +229,6 @@
 			<key>Layout</key>
 			<array>
 				<dict>
-					<key>BecomeActive</key>
-					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -267,9 +265,19 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
 							<array>
 								<string>20286C29FDCF999611CA2CEA</string>
+								<string>5048396909E3304600765E4B</string>
+								<string>20286C2CFDCF999611CA2CEA</string>
+								<string>1C37FBAC04509CD000000102</string>
+								<string>927F62010ED4EA4500D919E6</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
-							<array/>
+							<array>
+								<array>
+									<integer>16</integer>
+									<integer>15</integer>
+									<integer>14</integer>
+								</array>
+							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
 							<string>{{0, 0}, {186, 520}}</string>
 						</dict>
@@ -290,7 +298,7 @@
 							<real>186</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>670 364 780 579 0 0 1680 1028 </string>
+						<string>670 363 780 579 0 0 1680 1028 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -306,7 +314,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>physfs.c</string>
+								<string>Info.plist</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -314,7 +322,24 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>physfs.c</string>
+										<string>Info.plist</string>
+										<key>_historyCapacity</key>
+										<integer>0</integer>
+										<key>bookmark</key>
+										<string>927F623A0ED4EBEB00D919E6</string>
+										<key>history</key>
+										<array>
+											<string>92B1EBDD0ED4E43D009AF197</string>
+											<string>92B1EBDE0ED4E43D009AF197</string>
+											<string>92B1EBF30ED4E5C5009AF197</string>
+											<string>92B1EC470ED4EA36009AF197</string>
+										</array>
+										<key>prevStack</key>
+										<array>
+											<string>92B1EBE00ED4E43D009AF197</string>
+											<string>92B1EBE10ED4E43D009AF197</string>
+											<string>92B1EBF50ED4E5C5009AF197</string>
+										</array>
 									</dict>
 									<key>SplitCount</key>
 									<string>1</string>
@@ -325,14 +350,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {572, 160}}</string>
+								<string>{{0, 0}, {572, 403}}</string>
 								<key>RubberWindowFrame</key>
-								<string>670 364 780 579 0 0 1680 1028 </string>
+								<string>670 363 780 579 0 0 1680 1028 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>160pt</string>
+							<string>403pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
@@ -345,14 +370,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 165}, {572, 373}}</string>
+								<string>{{0, 408}, {572, 130}}</string>
 								<key>RubberWindowFrame</key>
-								<string>670 364 780 579 0 0 1680 1028 </string>
+								<string>670 363 780 579 0 0 1680 1028 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 							<key>Proportion</key>
-							<string>373pt</string>
+							<string>130pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -371,9 +396,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>920378B80ED200E400D3712D</string>
+				<string>927F621A0ED4EA6A00D919E6</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>920378B90ED200E400D3712D</string>
+				<string>927F621B0ED4EA6A00D919E6</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -505,13 +530,13 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
+		<string>92A4CC8A0D1C5F1E00CA28FB</string>
 		<string>1C78EAAD065D492600B07095</string>
 		<string>1CD10A99069EF8BA00B06720</string>
-		<string>92A4CC8A0D1C5F1E00CA28FB</string>
 		<string>/Users/garfield/programming/tmwclient/themanaworld.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>670 364 780 579 0 0 1680 1028 </string>
+	<string>670 363 780 579 0 0 1680 1028 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
@@ -539,22 +564,20 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {553, 0}}</string>
+								<string>{{0, 0}, {553, 151}}</string>
 								<key>RubberWindowFrame</key>
 								<string>490 365 553 548 0 0 1680 1028 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>0pt</string>
+							<string>151pt</string>
 						</dict>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXBuildLogShowsTranscriptDefaultKey</key>
-								<string>{{0, 325}, {553, 177}}</string>
+								<string>{{0, 166}, {553, 185}}</string>
 								<key>PBXProjectModuleGUID</key>
 								<string>XCMainBuildResultsModuleGUID</string>
 								<key>PBXProjectModuleLabel</key>
@@ -567,14 +590,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 5}, {553, 502}}</string>
+								<string>{{0, 156}, {553, 351}}</string>
 								<key>RubberWindowFrame</key>
 								<string>490 365 553 548 0 0 1680 1028 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXBuildResultsModule</string>
 							<key>Proportion</key>
-							<string>502pt</string>
+							<string>351pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -592,7 +615,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>92A4CC8A0D1C5F1E00CA28FB</string>
-				<string>92037A230ED20C3200D3712D</string>
+				<string>927F623B0ED4EBEB00D919E6</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
@@ -603,7 +626,7 @@
 			<key>WindowToolGUID</key>
 			<string>92A4CC8A0D1C5F1E00CA28FB</string>
 			<key>WindowToolIsVisible</key>
-			<true/>
+			<false/>
 		</dict>
 		<dict>
 			<key>FirstTimeWindowDisplayed</key>
@@ -712,13 +735,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>92037A240ED20C3200D3712D</string>
+				<string>927F621D0ED4EA6A00D919E6</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>92037A250ED20C3200D3712D</string>
-				<string>92037A260ED20C3200D3712D</string>
-				<string>92037A270ED20C3200D3712D</string>
-				<string>92037A280ED20C3200D3712D</string>
-				<string>92037A290ED20C3200D3712D</string>
+				<string>927F621E0ED4EA6A00D919E6</string>
+				<string>927F621F0ED4EA6A00D919E6</string>
+				<string>927F62200ED4EA6A00D919E6</string>
+				<string>927F62210ED4EA6A00D919E6</string>
+				<string>927F62220ED4EA6A00D919E6</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -727,7 +750,7 @@
 			<key>WindowToolGUID</key>
 			<string>1CD10A99069EF8BA00B06720</string>
 			<key>WindowToolIsVisible</key>
-			<false/>
+			<true/>
 		</dict>
 		<dict>
 			<key>FirstTimeWindowDisplayed</key>
@@ -837,6 +860,8 @@
 					<key>Dock</key>
 					<array>
 						<dict>
+							<key>BecomeActive</key>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -872,7 +897,7 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>92037A2A0ED20C3200D3712D</string>
+				<string>927F623C0ED4EBEB00D919E6</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
@@ -882,7 +907,7 @@
 			<key>WindowToolGUID</key>
 			<string>1C78EAAD065D492600B07095</string>
 			<key>WindowToolIsVisible</key>
-			<false/>
+			<true/>
 		</dict>
 		<dict>
 			<key>Identifier</key>
diff --git a/themanaworld.xcodeproj/garfield.pbxuser b/themanaworld.xcodeproj/garfield.pbxuser
index c2eef960..ada25426 100644
--- a/themanaworld.xcodeproj/garfield.pbxuser
+++ b/themanaworld.xcodeproj/garfield.pbxuser
@@ -134,8 +134,23 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 248643809;
-			PBXWorkspaceStateSaveDate = 248643809;
+			PBXPerProjectTemplateStateSaveDate = 248834629;
+			PBXWorkspaceStateSaveDate = 248834629;
+		};
+		perUserProjectItems = {
+			927F62190ED4EA6A00D919E6 /* PlistBookmark */ = 927F62190ED4EA6A00D919E6 /* PlistBookmark */;
+			927F621C0ED4EA6A00D919E6 /* PlistBookmark */ = 927F621C0ED4EA6A00D919E6 /* PlistBookmark */;
+			927F623A0ED4EBEB00D919E6 /* PlistBookmark */ = 927F623A0ED4EBEB00D919E6 /* PlistBookmark */;
+			92B1EBDD0ED4E43D009AF197 = 92B1EBDD0ED4E43D009AF197 /* PBXTextBookmark */;
+			92B1EBDE0ED4E43D009AF197 = 92B1EBDE0ED4E43D009AF197 /* PBXTextBookmark */;
+			92B1EBE00ED4E43D009AF197 = 92B1EBE00ED4E43D009AF197 /* PBXTextBookmark */;
+			92B1EBE10ED4E43D009AF197 = 92B1EBE10ED4E43D009AF197 /* PBXTextBookmark */;
+			92B1EBE90ED4E547009AF197 = 92B1EBE90ED4E547009AF197 /* PBXBookmark */;
+			92B1EBF30ED4E5C5009AF197 = 92B1EBF30ED4E5C5009AF197 /* PBXTextBookmark */;
+			92B1EBF50ED4E5C5009AF197 = 92B1EBF50ED4E5C5009AF197 /* PBXTextBookmark */;
+			92B1EC440ED4EA36009AF197 = 92B1EC440ED4EA36009AF197 /* PlistBookmark */;
+			92B1EC470ED4EA36009AF197 = 92B1EC470ED4EA36009AF197 /* PlistBookmark */;
+			92B1EC480ED4EA36009AF197 = 92B1EC480ED4EA36009AF197 /* PlistBookmark */;
 		};
 		sourceControlManager = 92BC3EC80BAEE3C8000DAB7F /* Source Control */;
 		userBuildSettings = {
@@ -155,6 +170,13 @@
 			sepNavWindowFrame = "{{65, 113}, {627, 714}}";
 		};
 	};
+	92037A190ED2035A00D3712D /* SDLMain.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {511, 348}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 307}";
+		};
+	};
 	924A42600C0874D00066885E /* Info.plist */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {674, 474}}";
@@ -171,6 +193,41 @@
 			sepNavVisRange = "{1251, 209}";
 		};
 	};
+	927F62190ED4EA6A00D919E6 /* PlistBookmark */ = {
+		isa = PlistBookmark;
+		fRef = 924A42600C0874D00066885E /* Info.plist */;
+		fallbackIsa = PBXBookmark;
+		isK = 0;
+		kPath = (
+			NSPrincipalClass,
+		);
+		name = /Users/garfield/programming/tmwclient/Info.plist;
+		rLen = 0;
+		rLoc = 2147483647;
+	};
+	927F621C0ED4EA6A00D919E6 /* PlistBookmark */ = {
+		isa = PlistBookmark;
+		fRef = 924A42600C0874D00066885E /* Info.plist */;
+		fallbackIsa = PBXBookmark;
+		isK = 0;
+		kPath = (
+		);
+		name = /Users/garfield/programming/tmwclient/Info.plist;
+		rLen = 0;
+		rLoc = 2147483647;
+	};
+	927F623A0ED4EBEB00D919E6 /* PlistBookmark */ = {
+		isa = PlistBookmark;
+		fRef = 924A42600C0874D00066885E /* Info.plist */;
+		fallbackIsa = PBXBookmark;
+		isK = 0;
+		kPath = (
+			NSPrincipleClass,
+		);
+		name = /Users/garfield/programming/tmwclient/Info.plist;
+		rLen = 0;
+		rLoc = 2147483647;
+	};
 	92A4CCE70D1DA58D00CA28FB /* zip.c */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {568, 20230}}";
@@ -195,6 +252,104 @@
 			sepNavWindowFrame = "{{180, 8}, {627, 714}}";
 		};
 	};
+	92B1EBDD0ED4E43D009AF197 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 92BC40E50BAEF54B000DAB7F /* SDLMain.m */;
+		name = "SDLMain.m: 14";
+		rLen = 0;
+		rLoc = 440;
+		rType = 0;
+		vrLen = 759;
+		vrLoc = 0;
+	};
+	92B1EBDE0ED4E43D009AF197 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 92BC3F660BAEE55B000DAB7F /* viewport.cpp */;
+		name = "viewport.cpp: 261";
+		rLen = 63;
+		rLoc = 7873;
+		rType = 0;
+		vrLen = 780;
+		vrLoc = 7501;
+	};
+	92B1EBE00ED4E43D009AF197 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 92BC40E50BAEF54B000DAB7F /* SDLMain.m */;
+		name = "SDLMain.m: 14";
+		rLen = 0;
+		rLoc = 440;
+		rType = 0;
+		vrLen = 759;
+		vrLoc = 0;
+	};
+	92B1EBE10ED4E43D009AF197 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 92BC3F660BAEE55B000DAB7F /* viewport.cpp */;
+		name = "viewport.cpp: 261";
+		rLen = 63;
+		rLoc = 7873;
+		rType = 0;
+		vrLen = 780;
+		vrLoc = 7501;
+	};
+	92B1EBE90ED4E547009AF197 /* PBXBookmark */ = {
+		isa = PBXBookmark;
+		fRef = 924A42600C0874D00066885E /* Info.plist */;
+	};
+	92B1EBF30ED4E5C5009AF197 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 92BC3EEF0BAEE55A000DAB7F /* graphics.h */;
+		name = "graphics.h: 25";
+		rLen = 39;
+		rLoc = 879;
+		rType = 0;
+		vrLen = 692;
+		vrLoc = 434;
+	};
+	92B1EBF50ED4E5C5009AF197 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 92BC3EEF0BAEE55A000DAB7F /* graphics.h */;
+		name = "graphics.h: 25";
+		rLen = 39;
+		rLoc = 879;
+		rType = 0;
+		vrLen = 692;
+		vrLoc = 434;
+	};
+	92B1EC440ED4EA36009AF197 /* PlistBookmark */ = {
+		isa = PlistBookmark;
+		fRef = 924A42600C0874D00066885E /* Info.plist */;
+		fallbackIsa = PBXBookmark;
+		isK = 0;
+		kPath = (
+		);
+		name = /Users/garfield/programming/tmwclient/Info.plist;
+		rLen = 0;
+		rLoc = 2147483647;
+	};
+	92B1EC470ED4EA36009AF197 /* PlistBookmark */ = {
+		isa = PlistBookmark;
+		fRef = 924A42600C0874D00066885E /* Info.plist */;
+		fallbackIsa = PBXBookmark;
+		isK = 0;
+		kPath = (
+			NSPrincipalClass,
+		);
+		name = /Users/garfield/programming/tmwclient/Info.plist;
+		rLen = 0;
+		rLoc = 2147483647;
+	};
+	92B1EC480ED4EA36009AF197 /* PlistBookmark */ = {
+		isa = PlistBookmark;
+		fRef = 924A42600C0874D00066885E /* Info.plist */;
+		fallbackIsa = PBXBookmark;
+		isK = 0;
+		kPath = (
+		);
+		name = /Users/garfield/programming/tmwclient/Info.plist;
+		rLen = 0;
+		rLoc = 2147483647;
+	};
 	92BC3EBC0BAEE3BB000DAB7F /* themanaworld */ = {
 		isa = PBXExecutable;
 		activeArgIndices = (
@@ -280,8 +435,9 @@
 	};
 	92BC3EEF0BAEE55A000DAB7F /* graphics.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {557, 2240}}";
-			sepNavSelRange = "{0, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {492, 2240}}";
+			sepNavSelRange = "{879, 39}";
+			sepNavVisRange = "{878, 92}";
 			sepNavVisRect = "{{0, 1767}, {557, 473}}";
 			sepNavWindowFrame = "{{192, 99}, {602, 602}}";
 		};
@@ -375,9 +531,9 @@
 	};
 	92BC3F660BAEE55B000DAB7F /* viewport.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {718, 7028}}";
-			sepNavSelRange = "{12276, 0}";
-			sepNavVisRange = "{11882, 995}";
+			sepNavIntBoundsRect = "{{0, 0}, {511, 6706}}";
+			sepNavSelRange = "{7873, 63}";
+			sepNavVisRange = "{7501, 780}";
 			sepNavVisRect = "{{0, 4144}, {732, 459}}";
 			sepNavWindowFrame = "{{61, 197}, {777, 588}}";
 		};
@@ -705,9 +861,9 @@
 	};
 	92BC40E50BAEF54B000DAB7F /* SDLMain.m */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {806, 5278}}";
-			sepNavSelRange = "{776, 0}";
-			sepNavVisRange = "{0, 1283}";
+			sepNavIntBoundsRect = "{{0, 0}, {726, 3906}}";
+			sepNavSelRange = "{440, 0}";
+			sepNavVisRange = "{7053, 643}";
 			sepNavWindowFrame = "{{583, 96}, {627, 714}}";
 		};
 	};
diff --git a/themanaworld.xcodeproj/project.pbxproj b/themanaworld.xcodeproj/project.pbxproj
index 795e832d..7bd2a8e0 100644
--- a/themanaworld.xcodeproj/project.pbxproj
+++ b/themanaworld.xcodeproj/project.pbxproj
@@ -16,7 +16,6 @@
 		92024E760CF1DCF6006B55CB /* imageloader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92024E740CF1DCF6006B55CB /* imageloader.cpp */; };
 		92037A1F0ED2037300D3712D /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92037A1B0ED2037300D3712D /* text.cpp */; };
 		92037A200ED2037300D3712D /* textmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92037A1D0ED2037300D3712D /* textmanager.cpp */; };
-		920D9ADF0DE09DC0003D7E61 /* Info.plist in Copy plist */ = {isa = PBXBuildFile; fileRef = 924A42600C0874D00066885E /* Info.plist */; };
 		922CD9580E3D00900074C50E /* npcdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 922CD9560E3D00900074C50E /* npcdb.cpp */; };
 		922CD95F0E3D01080074C50E /* shopitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 922CD95D0E3D01080074C50E /* shopitem.cpp */; };
 		922CD9ED0E3D02C50074C50E /* guichan.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 922CD9EC0E3D02C50074C50E /* guichan.framework */; };
@@ -27,7 +26,6 @@
 		924A39F50C0784280066885E /* particleemitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 924A39EE0C0784280066885E /* particleemitter.cpp */; };
 		924A39F60C0784280066885E /* textparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 924A39F00C0784280066885E /* textparticle.cpp */; };
 		924A3A120C07A60B0066885E /* resizegrip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 924A3A100C07A60B0066885E /* resizegrip.cpp */; };
-		924A3E580C085E600066885E /* main.nib in Resources */ = {isa = PBXBuildFile; fileRef = 02345980000FD03B11CA0E72 /* main.nib */; };
 		924A40570C085EF50066885E /* items.xsd in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 924A401C0C085ED80066885E /* items.xsd */; };
 		924A405A0C085F950066885E /* bg_quad_dis.png in Copy GUI Files */ = {isa = PBXBuildFile; fileRef = 924A3E600C085ED70066885E /* bg_quad_dis.png */; };
 		924A405B0C085F950066885E /* browserfont.png in Copy GUI Files */ = {isa = PBXBuildFile; fileRef = 924A3E610C085ED70066885E /* browserfont.png */; };
@@ -90,6 +88,7 @@
 		926F9CF80DB005FA00AACD26 /* itemshortcut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926F9CF60DB005FA00AACD26 /* itemshortcut.cpp */; };
 		926F9D450DB00AFC00AACD26 /* itemshortcutcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926F9D410DB00AFC00AACD26 /* itemshortcutcontainer.cpp */; };
 		926F9D460DB00AFC00AACD26 /* itemshortcutwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 926F9D430DB00AFC00AACD26 /* itemshortcutwindow.cpp */; };
+		927F62590ED4F1D100D919E6 /* main.nib in Resources */ = {isa = PBXBuildFile; fileRef = 927F62570ED4F1D100D919E6 /* main.nib */; };
 		9294DA9B0C17E70400FCEDE9 /* physfs.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3FAB0BAEE55B000DAB7F /* physfs.c */; };
 		9294DA9C0C17E70600FCEDE9 /* physfs_byteorder.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BC3FAD0BAEE55B000DAB7F /* physfs_byteorder.c */; };
 		9294DAA10C17E73200FCEDE9 /* libpng.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9294DAA00C17E73200FCEDE9 /* libpng.framework */; };
@@ -238,7 +237,6 @@
 		92EEA0060D2E20B300DDE300 /* SDL_mixer.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 92BC408F0BAEE818000DAB7F /* SDL_mixer.framework */; };
 		92EEA0070D2E20B300DDE300 /* SDL_net.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 92BC40900BAEE818000DAB7F /* SDL_net.framework */; };
 		92EEA0080D2E20B300DDE300 /* SDL.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 92BC40910BAEE818000DAB7F /* SDL.framework */; };
-		92FD19A20DDCD60C00D14E5D /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 92FD19A00DDCD60C00D14E5D /* InfoPlist.strings */; };
 		92FD19B00DDCE51000D14E5D /* player_relations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92FD19AE0DDCE51000D14E5D /* player_relations.cpp */; };
 		92FD19BA0DDCE53400D14E5D /* setup_players.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92FD19B30DDCE53400D14E5D /* setup_players.cpp */; };
 		92FD19BB0DDCE53400D14E5D /* table.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92FD19B50DDCE53400D14E5D /* table.cpp */; };
@@ -248,17 +246,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-		920D9AE20DE09DCA003D7E61 /* Copy plist */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = ..;
-			dstSubfolderSpec = 6;
-			files = (
-				920D9ADF0DE09DC0003D7E61 /* Info.plist in Copy plist */,
-			);
-			name = "Copy plist";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		924A3A520C085C190066885E /* Copy Data Files */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -379,7 +366,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		1870340FFE93FCAF11CA0CD7 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/main.nib; sourceTree = "<group>"; };
 		20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
 		508344B209E5C41E0093A071 /* The Mana World.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "The Mana World.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		92024D2A0CF1BD9E006B55CB /* keyboardconfig.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = keyboardconfig.cpp; path = src/keyboardconfig.cpp; sourceTree = "<group>"; };
@@ -488,6 +474,7 @@
 		926F9D420DB00AFC00AACD26 /* itemshortcutcontainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = itemshortcutcontainer.h; sourceTree = "<group>"; };
 		926F9D430DB00AFC00AACD26 /* itemshortcutwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = itemshortcutwindow.cpp; sourceTree = "<group>"; };
 		926F9D440DB00AFC00AACD26 /* itemshortcutwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = itemshortcutwindow.h; sourceTree = "<group>"; };
+		927F62580ED4F1D100D919E6 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/main.nib; sourceTree = "<group>"; };
 		9294DAA00C17E73200FCEDE9 /* libpng.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libpng.framework; path = /Library/Frameworks/libpng.framework; sourceTree = "<absolute>"; };
 		92A4CC9D0D1C622E00CA28FB /* dye.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dye.cpp; path = src/resources/dye.cpp; sourceTree = "<group>"; };
 		92A4CCE00D1DA58D00CA28FB /* dir.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dir.c; sourceTree = "<group>"; };
@@ -768,7 +755,6 @@
 		92BC40E50BAEF54B000DAB7F /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SDLMain.m; path = src/SDLMain.m; sourceTree = "<group>"; };
 		92BC40E80BAEF57D000DAB7F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		92BC416E0BAF664C000DAB7F /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ChangeLog; sourceTree = "<group>"; };
-		92FD19A10DDCD60C00D14E5D /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		92FD19AE0DDCE51000D14E5D /* player_relations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = player_relations.cpp; path = src/player_relations.cpp; sourceTree = "<group>"; };
 		92FD19AF0DDCE51000D14E5D /* player_relations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = player_relations.h; path = src/player_relations.h; sourceTree = "<group>"; };
 		92FD19B30DDCE53400D14E5D /* setup_players.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_players.cpp; sourceTree = "<group>"; };
@@ -815,6 +801,7 @@
 		20286C29FDCF999611CA2CEA /* themanaworld */ = {
 			isa = PBXGroup;
 			children = (
+				924A42600C0874D00066885E /* Info.plist */,
 				5048396909E3304600765E4B /* Configuration Files */,
 				20286C2AFDCF999611CA2CEA /* Sources */,
 				20286C2CFDCF999611CA2CEA /* Resources */,
@@ -918,13 +905,11 @@
 		20286C2CFDCF999611CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				92FD19A00DDCD60C00D14E5D /* InfoPlist.strings */,
+				927F62570ED4F1D100D919E6 /* main.nib */,
 				92A4CCFE0D1DA8E500CA28FB /* LICENSE.rtf */,
-				924A42600C0874D00066885E /* Info.plist */,
 				924A42590C0871EC0066885E /* The Mana World.icns */,
 				924A3E590C085ED70066885E /* data */,
 				92BC416E0BAF664C000DAB7F /* ChangeLog */,
-				02345980000FD03B11CA0E72 /* main.nib */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -1385,7 +1370,6 @@
 				924A40880C085FBD0066885E /* Copy Image Files */,
 				924A42000C0861C70066885E /* Copy Help Files */,
 				92EEA0090D2E20D100DDE300 /* Copy Frameworks */,
-				920D9AE20DE09DCA003D7E61 /* Copy plist */,
 			);
 			buildRules = (
 			);
@@ -1419,10 +1403,9 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				924A3E580C085E600066885E /* main.nib in Resources */,
 				924A425A0C0871EC0066885E /* The Mana World.icns in Resources */,
 				92A4CCFF0D1DA8E500CA28FB /* LICENSE.rtf in Resources */,
-				92FD19A20DDCD60C00D14E5D /* InfoPlist.strings in Resources */,
+				927F62590ED4F1D100D919E6 /* main.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1595,22 +1578,14 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXVariantGroup section */
-		02345980000FD03B11CA0E72 /* main.nib */ = {
+		927F62570ED4F1D100D919E6 /* main.nib */ = {
 			isa = PBXVariantGroup;
 			children = (
-				1870340FFE93FCAF11CA0CD7 /* English */,
+				927F62580ED4F1D100D919E6 /* English */,
 			);
 			name = main.nib;
 			sourceTree = "<group>";
 		};
-		92FD19A00DDCD60C00D14E5D /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				92FD19A10DDCD60C00D14E5D /* English */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
@@ -1620,12 +1595,11 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_1)",
-					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_2)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
+					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
 				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
+				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"/System/Library/Frameworks\"";
 				GCC_DEBUGGING_SYMBOLS = full;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -1633,26 +1607,27 @@
 					USE_OPENGL,
 					__PHYSFS_CARBONIZED__,
 				);
-				GCC_VERSION_ppc = 3.3;
 				HEADER_SEARCH_PATHS = (
 					/Library/Frameworks/SDL_net.framework/Headers,
 					/Library/Frameworks/SDL_image.framework/Headers,
 					/Library/Frameworks/SDL_mixer.framework/Headers,
-					/Library/Frameworks/guichan.framework/Headers,
+					guichan.framework/Headers,
 					/Library/Frameworks/libpng.framework/Headers,
 					/usr/include/libxml2,
 					/Library/Frameworks/SDL.framework/Headers,
 				);
+				INFOPLIST_FILE = Info.plist;
 				LIBRARY_SEARCH_PATHS = /usr/lib;
-				MACOSX_DEPLOYMENT_TARGET = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				OTHER_LDFLAGS = (
+					"-lz",
 					"-lxml2",
 					"-lcurl",
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = "The Mana World";
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				USER_HEADER_SEARCH_PATHS = src;
-				ZERO_LINK = NO;
 			};
 			name = Debug;
 		};
@@ -1688,6 +1663,7 @@
 					/usr/include/libxml2,
 					/Library/Frameworks/SDL.framework/Headers,
 				);
+				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = /usr/lib;
 				MACOSX_DEPLOYMENT_TARGET = 10.3;
@@ -1728,7 +1704,7 @@
 					i386,
 				);
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_PREPROCESSOR_DEFINITIONS = PHYSFS_SUPPORTS_ZIP;
+				GCC_PREPROCESSOR_DEFINITIONS = "";
 				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 				SEPARATE_STRIP = YES;
 			};