diff --git a/osx/BoE.xcodeproj/project.pbxproj b/osx/BoE.xcodeproj/project.pbxproj index 61874188..c6e1b4e7 100644 --- a/osx/BoE.xcodeproj/project.pbxproj +++ b/osx/BoE.xcodeproj/project.pbxproj @@ -14,9 +14,7 @@ 91A0B15F1900FFDA00EF438F /* Copy Shaders */, 912CF3560FE4494C0063B614 /* Copy Scenarios */, 91ACCE6218FFB5F300FAEF8B /* Copy Base Scenarios */, - 912CF36D0FE44A2A0063B614 /* Copy Mac Graphics */, - 912CF36E0FE44A2A0063B614 /* Copy Mac Cursors */, - 914B2B3118E80030007B6799 /* Copy Mac Sounds */, + 912CF36D0FE44A2A0063B614 /* Copy Sounds and Graphics */, 9192C13918F32E6E0088A580 /* Copy Strings */, 914701A618F62A52008A6DC9 /* Copy Fonts */, 914B2BB718E8BF99007B6799 /* Validate Dialog Definitions */, @@ -113,96 +111,6 @@ 912CF3640FE449900063B614 /* valleydy.meg in Copy Scenarios */ = {isa = PBXBuildFile; fileRef = 91D635AD0F90E7B500674AB3 /* valleydy.meg */; }; 912CF3650FE449900063B614 /* zakhazi.exs in Copy Scenarios */ = {isa = PBXBuildFile; fileRef = 91D635AE0F90E7B500674AB3 /* zakhazi.exs */; }; 912CF3660FE449900063B614 /* zakhazi.meg in Copy Scenarios */ = {isa = PBXBuildFile; fileRef = 91D635AF0F90E7B500674AB3 /* zakhazi.meg */; }; - 912CF4140FE44AAF0063B614 /* actionhelp.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF37F0FE44A9B0063B614 /* actionhelp.png */; }; - 912CF4150FE44AAF0063B614 /* bigscenpics.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3800FE44A9B0063B614 /* bigscenpics.png */; }; - 912CF4160FE44AAF0063B614 /* booms.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3810FE44A9B0063B614 /* booms.png */; }; - 912CF4170FE44AAF0063B614 /* buttons.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3820FE44A9B0063B614 /* buttons.png */; }; - 912CF4180FE44AAF0063B614 /* dlgbtnred.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF39C0FE44A9B0063B614 /* dlgbtnred.png */; }; - 912CF4190FE44AAF0063B614 /* dlogbtnhelp.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF39D0FE44A9B0063B614 /* dlogbtnhelp.png */; }; - 912CF41A0FE44AAF0063B614 /* dlogbtnled.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF39E0FE44A9B0063B614 /* dlogbtnled.png */; }; - 912CF41B0FE44AAF0063B614 /* dlogbtnlg.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF39F0FE44A9B0063B614 /* dlogbtnlg.png */; }; - 912CF41C0FE44AAF0063B614 /* dlogbtnmed.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3A00FE44A9B0063B614 /* dlogbtnmed.png */; }; - 912CF41D0FE44AAF0063B614 /* dlogbtnsm.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3A10FE44A9B0063B614 /* dlogbtnsm.png */; }; - 912CF41E0FE44AAF0063B614 /* dlogbtntall.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3A20FE44A9B0063B614 /* dlogbtntall.png */; }; - 912CF41F0FE44AAF0063B614 /* dlogpics.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3A30FE44A9B0063B614 /* dlogpics.png */; }; - 912CF4200FE44AAF0063B614 /* edbuttons.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3A40FE44A9B0063B614 /* edbuttons.png */; }; - 912CF4210FE44AAF0063B614 /* edsplash.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3A50FE44A9B0063B614 /* edsplash.png */; }; - 912CF4220FE44AAF0063B614 /* fields.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3A60FE44A9B0063B614 /* fields.png */; }; - 912CF4230FE44AAF0063B614 /* fighthelp.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3A70FE44A9B0063B614 /* fighthelp.png */; }; - 912CF4240FE44AAF0063B614 /* invenbtns.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3A80FE44A9B0063B614 /* invenbtns.png */; }; - 912CF4250FE44AAF0063B614 /* invenhelp.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3A90FE44A9B0063B614 /* invenhelp.png */; }; - 912CF4260FE44AAF0063B614 /* inventory.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3AA0FE44A9B0063B614 /* inventory.png */; }; - 912CF4270FE44AAF0063B614 /* mapOLD.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3AB0FE44A9B0063B614 /* mapOLD.png */; }; - 912CF4280FE44AAF0063B614 /* missiles.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3AC0FE44A9B0063B614 /* missiles.png */; }; - 912CF4290FE44AAF0063B614 /* monst1.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3AD0FE44A9B0063B614 /* monst1.png */; }; - 912CF42A0FE44AAF0063B614 /* monst10.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3AE0FE44A9B0063B614 /* monst10.png */; }; - 912CF42B0FE44AAF0063B614 /* monst11.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3AF0FE44A9B0063B614 /* monst11.png */; }; - 912CF42C0FE44AAF0063B614 /* monst2.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3B00FE44A9B0063B614 /* monst2.png */; }; - 912CF42D0FE44AAF0063B614 /* monst3.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3B10FE44A9B0063B614 /* monst3.png */; }; - 912CF42E0FE44AAF0063B614 /* monst4.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3B20FE44A9B0063B614 /* monst4.png */; }; - 912CF42F0FE44AAF0063B614 /* monst5.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3B30FE44A9B0063B614 /* monst5.png */; }; - 912CF4300FE44AAF0063B614 /* monst6.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3B40FE44A9B0063B614 /* monst6.png */; }; - 912CF4310FE44AAF0063B614 /* monst7.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3B50FE44A9B0063B614 /* monst7.png */; }; - 912CF4320FE44AAF0063B614 /* monst8.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3B60FE44A9B0063B614 /* monst8.png */; }; - 912CF4330FE44AAF0063B614 /* monst9.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3B70FE44A9B0063B614 /* monst9.png */; }; - 912CF4340FE44AAF0063B614 /* objects.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3B80FE44A9B0063B614 /* objects.png */; }; - 912CF4350FE44AAF0063B614 /* outhelp.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3B90FE44A9B0063B614 /* outhelp.png */; }; - 912CF4360FE44AAF0063B614 /* pcedbuttons.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3BA0FE44A9B0063B614 /* pcedbuttons.png */; }; - 912CF4370FE44AAF0063B614 /* pcedtitle.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3BB0FE44A9B0063B614 /* pcedtitle.png */; }; - 912CF4380FE44AAF0063B614 /* pcs.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3BC0FE44A9B0063B614 /* pcs.png */; }; - 912CF4390FE44AAF0063B614 /* pixpats.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3BD0FE44A9B0063B614 /* pixpats.png */; }; - 912CF43A0FE44AAF0063B614 /* scenpics.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3BE0FE44A9B0063B614 /* scenpics.png */; }; - 912CF43B0FE44AAF0063B614 /* spidlogo.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3BF0FE44A9B0063B614 /* spidlogo.png */; }; - 912CF43C0FE44AAF0063B614 /* startanim.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3C00FE44A9B0063B614 /* startanim.png */; }; - 912CF43D0FE44AAF0063B614 /* startbut.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3C10FE44A9B0063B614 /* startbut.png */; }; - 912CF43E0FE44AAF0063B614 /* startsplash.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3C20FE44A9B0063B614 /* startsplash.png */; }; - 912CF43F0FE44AAF0063B614 /* startup.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3C30FE44A9B0063B614 /* startup.png */; }; - 912CF4400FE44AAF0063B614 /* statarea.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3C40FE44A9B0063B614 /* statarea.png */; }; - 912CF4410FE44AAF0063B614 /* stathelp.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3C50FE44A9B0063B614 /* stathelp.png */; }; - 912CF4420FE44AAF0063B614 /* staticonhelp.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3C60FE44A9B0063B614 /* staticonhelp.png */; }; - 912CF4430FE44AAF0063B614 /* staticons.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3C70FE44A9B0063B614 /* staticons.png */; }; - 912CF4440FE44AAF0063B614 /* talkportraits.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3C80FE44A9B0063B614 /* talkportraits.png */; }; - 912CF4450FE44AAF0063B614 /* ter1.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3C90FE44A9B0063B614 /* ter1.png */; }; - 912CF4460FE44AAF0063B614 /* ter2.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3CA0FE44A9B0063B614 /* ter2.png */; }; - 912CF4470FE44AAF0063B614 /* ter3.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3CB0FE44A9B0063B614 /* ter3.png */; }; - 912CF4480FE44AAF0063B614 /* ter4.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3CC0FE44A9B0063B614 /* ter4.png */; }; - 912CF4490FE44AAF0063B614 /* ter5.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3CD0FE44A9B0063B614 /* ter5.png */; }; - 912CF44A0FE44AAF0063B614 /* ter6.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3CE0FE44A9B0063B614 /* ter6.png */; }; - 912CF44B0FE44AAF0063B614 /* ter7.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3CF0FE44A9B0063B614 /* ter7.png */; }; - 912CF44C0FE44AAF0063B614 /* ter8.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3D00FE44A9B0063B614 /* ter8.png */; }; - 912CF44D0FE44AAF0063B614 /* teranim.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3D10FE44A9B0063B614 /* teranim.png */; }; - 912CF44E0FE44AAF0063B614 /* termap.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3D20FE44A9B0063B614 /* termap.png */; }; - 912CF44F0FE44AAF0063B614 /* terscreen.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3D30FE44A9B0063B614 /* terscreen.png */; }; - 912CF4500FE44AAF0063B614 /* textbar.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3D40FE44A9B0063B614 /* textbar.png */; }; - 912CF4510FE44AAF0063B614 /* tinyobj.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3D50FE44A9B0063B614 /* tinyobj.png */; }; - 912CF4520FE44AAF0063B614 /* townhelp.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3D60FE44A9B0063B614 /* townhelp.png */; }; - 912CF4530FE44AAF0063B614 /* transcript.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3D70FE44A9B0063B614 /* transcript.png */; }; - 912CF4540FE44AAF0063B614 /* trim.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3D80FE44A9B0063B614 /* trim.png */; }; - 912CF4550FE44AAF0063B614 /* vehicle.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 912CF3D90FE44A9B0063B614 /* vehicle.png */; }; - 912CF4560FE44AC20063B614 /* boot.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF3840FE44A9B0063B614 /* boot.gif */; }; - 912CF4570FE44AC20063B614 /* bottomright.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF3850FE44A9B0063B614 /* bottomright.gif */; }; - 912CF4580FE44AC20063B614 /* brush.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF3860FE44A9B0063B614 /* brush.gif */; }; - 912CF4590FE44AC20063B614 /* drop.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF3870FE44A9B0063B614 /* drop.gif */; }; - 912CF45A0FE44AC20063B614 /* E.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF3880FE44A9B0063B614 /* E.gif */; }; - 912CF45B0FE44AC20063B614 /* eraser.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF3890FE44A9B0063B614 /* eraser.gif */; }; - 912CF45C0FE44AC20063B614 /* eyedropper.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF38A0FE44A9B0063B614 /* eyedropper.gif */; }; - 912CF45D0FE44AC20063B614 /* hand.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF38B0FE44A9B0063B614 /* hand.gif */; }; - 912CF45E0FE44AC20063B614 /* key.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF38C0FE44A9B0063B614 /* key.gif */; }; - 912CF45F0FE44AC20063B614 /* look.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF38D0FE44A9B0063B614 /* look.gif */; }; - 912CF4600FE44AC20063B614 /* N.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF38E0FE44A9B0063B614 /* N.gif */; }; - 912CF4610FE44AC20063B614 /* NE.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF38F0FE44A9B0063B614 /* NE.gif */; }; - 912CF4620FE44AC20063B614 /* NW.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF3900FE44A9B0063B614 /* NW.gif */; }; - 912CF4630FE44AC20063B614 /* S.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF3910FE44A9B0063B614 /* S.gif */; }; - 912CF4640FE44AC20063B614 /* SE.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF3920FE44A9B0063B614 /* SE.gif */; }; - 912CF4650FE44AC20063B614 /* spraycan.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF3930FE44A9B0063B614 /* spraycan.gif */; }; - 912CF4660FE44AC20063B614 /* SW.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF3940FE44A9B0063B614 /* SW.gif */; }; - 912CF4670FE44AC20063B614 /* sword.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF3950FE44A9B0063B614 /* sword.gif */; }; - 912CF4680FE44AC20063B614 /* talk.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF3960FE44A9B0063B614 /* talk.gif */; }; - 912CF4690FE44AC20063B614 /* target.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF3970FE44A9B0063B614 /* target.gif */; }; - 912CF46A0FE44AC20063B614 /* topleft.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF3980FE44A9B0063B614 /* topleft.gif */; }; - 912CF46B0FE44AC20063B614 /* W.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF3990FE44A9B0063B614 /* W.gif */; }; - 912CF46C0FE44AC20063B614 /* wait.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF39A0FE44A9B0063B614 /* wait.gif */; }; - 912CF46D0FE44AC20063B614 /* wand.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 912CF39B0FE44A9B0063B614 /* wand.gif */; }; 912DFE8F18E2872400B00D75 /* boe.menus.mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 912DFE8E18E2872300B00D75 /* boe.menus.mac.mm */; }; 913D005B0F9FEEC300184C18 /* porting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 913D005A0F9FEEC200184C18 /* porting.cpp */; }; 913D005C0F9FEEC300184C18 /* porting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 913D005A0F9FEEC200184C18 /* porting.cpp */; }; @@ -226,106 +134,6 @@ 914B2AC018E7E544007B6799 /* sndfile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 914B2AAE18E7E529007B6799 /* sndfile.framework */; }; 914B2AC118E7E544007B6799 /* sndfile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 914B2AAE18E7E529007B6799 /* sndfile.framework */; }; 914B2AC618E7E6EB007B6799 /* winutil.mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 919145FF18E63B70005CF3A4 /* winutil.mac.mm */; }; - 914B2B3218E8005B007B6799 /* SND1.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2ACC18E7FFEF007B6799 /* SND1.WAV */; }; - 914B2B3318E8005B007B6799 /* SND10.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2ACD18E7FFEF007B6799 /* SND10.WAV */; }; - 914B2B3418E8005B007B6799 /* SND11.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2ACE18E7FFEF007B6799 /* SND11.WAV */; }; - 914B2B3518E8005B007B6799 /* SND12.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2ACF18E7FFEF007B6799 /* SND12.WAV */; }; - 914B2B3618E8005B007B6799 /* SND13.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AD018E7FFEF007B6799 /* SND13.WAV */; }; - 914B2B3718E8005B007B6799 /* SND14.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AD118E7FFEF007B6799 /* SND14.WAV */; }; - 914B2B3818E8005B007B6799 /* SND15.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AD218E7FFEF007B6799 /* SND15.WAV */; }; - 914B2B3918E8005B007B6799 /* SND16.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AD318E7FFEF007B6799 /* SND16.WAV */; }; - 914B2B3A18E8005B007B6799 /* SND17.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AD418E7FFEF007B6799 /* SND17.WAV */; }; - 914B2B3B18E8005B007B6799 /* SND18.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AD518E7FFEF007B6799 /* SND18.WAV */; }; - 914B2B3C18E8005B007B6799 /* SND19.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AD618E7FFEF007B6799 /* SND19.WAV */; }; - 914B2B3D18E8005B007B6799 /* SND2.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AD718E7FFEF007B6799 /* SND2.WAV */; }; - 914B2B3E18E8005B007B6799 /* SND20.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AD818E7FFEF007B6799 /* SND20.WAV */; }; - 914B2B3F18E8005B007B6799 /* SND21.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AD918E7FFEF007B6799 /* SND21.WAV */; }; - 914B2B4018E8005B007B6799 /* SND22.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2ADA18E7FFEF007B6799 /* SND22.WAV */; }; - 914B2B4118E8005B007B6799 /* SND23.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2ADB18E7FFEF007B6799 /* SND23.WAV */; }; - 914B2B4218E8005B007B6799 /* SND24.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2ADC18E7FFEF007B6799 /* SND24.WAV */; }; - 914B2B4318E8005B007B6799 /* SND25.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2ADD18E7FFEF007B6799 /* SND25.WAV */; }; - 914B2B4418E8005B007B6799 /* SND26.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2ADE18E7FFEF007B6799 /* SND26.WAV */; }; - 914B2B4518E8005B007B6799 /* SND27.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2ADF18E7FFEF007B6799 /* SND27.WAV */; }; - 914B2B4618E8005B007B6799 /* SND28.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AE018E7FFEF007B6799 /* SND28.WAV */; }; - 914B2B4718E8005B007B6799 /* SND29.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AE118E7FFEF007B6799 /* SND29.WAV */; }; - 914B2B4818E8005B007B6799 /* SND3.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AE218E7FFEF007B6799 /* SND3.WAV */; }; - 914B2B4918E8005B007B6799 /* SND30.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AE318E7FFEF007B6799 /* SND30.WAV */; }; - 914B2B4A18E8005B007B6799 /* SND31.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AE418E7FFEF007B6799 /* SND31.WAV */; }; - 914B2B4B18E8005B007B6799 /* SND32.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AE518E7FFEF007B6799 /* SND32.WAV */; }; - 914B2B4C18E8005B007B6799 /* SND33.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AE618E7FFEF007B6799 /* SND33.WAV */; }; - 914B2B4D18E8005B007B6799 /* SND34.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AE718E7FFEF007B6799 /* SND34.WAV */; }; - 914B2B4E18E8005B007B6799 /* SND35.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AE818E7FFEF007B6799 /* SND35.WAV */; }; - 914B2B4F18E8005B007B6799 /* SND36.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AE918E7FFEF007B6799 /* SND36.WAV */; }; - 914B2B5018E8005B007B6799 /* SND37.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AEA18E7FFEF007B6799 /* SND37.WAV */; }; - 914B2B5118E8005B007B6799 /* SND38.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AEB18E7FFEF007B6799 /* SND38.WAV */; }; - 914B2B5218E8005B007B6799 /* SND39.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AEC18E7FFEF007B6799 /* SND39.WAV */; }; - 914B2B5318E8005B007B6799 /* SND4.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AED18E7FFEF007B6799 /* SND4.WAV */; }; - 914B2B5418E8005B007B6799 /* SND40.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AEE18E7FFEF007B6799 /* SND40.WAV */; }; - 914B2B5518E8005B007B6799 /* SND41.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AEF18E7FFEF007B6799 /* SND41.WAV */; }; - 914B2B5618E8005B007B6799 /* SND42.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AF018E7FFEF007B6799 /* SND42.WAV */; }; - 914B2B5718E8005B007B6799 /* SND43.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AF118E7FFEF007B6799 /* SND43.WAV */; }; - 914B2B5818E8005B007B6799 /* SND44.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AF218E7FFEF007B6799 /* SND44.WAV */; }; - 914B2B5918E8005B007B6799 /* SND45.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AF318E7FFEF007B6799 /* SND45.WAV */; }; - 914B2B5A18E8005B007B6799 /* SND46.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AF418E7FFEF007B6799 /* SND46.WAV */; }; - 914B2B5B18E8005B007B6799 /* SND47.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AF518E7FFEF007B6799 /* SND47.WAV */; }; - 914B2B5C18E8005B007B6799 /* SND48.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AF618E7FFEF007B6799 /* SND48.WAV */; }; - 914B2B5D18E8005B007B6799 /* SND49.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AF718E7FFEF007B6799 /* SND49.WAV */; }; - 914B2B5E18E8005B007B6799 /* SND5.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AF818E7FFEF007B6799 /* SND5.WAV */; }; - 914B2B5F18E8005B007B6799 /* SND50.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AF918E7FFEF007B6799 /* SND50.WAV */; }; - 914B2B6018E8005B007B6799 /* SND51.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AFA18E7FFEF007B6799 /* SND51.WAV */; }; - 914B2B6118E8005B007B6799 /* SND52.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AFB18E7FFEF007B6799 /* SND52.WAV */; }; - 914B2B6218E8005B007B6799 /* SND53.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AFC18E7FFEF007B6799 /* SND53.WAV */; }; - 914B2B6318E8005B007B6799 /* SND54.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AFD18E7FFEF007B6799 /* SND54.WAV */; }; - 914B2B6418E8005B007B6799 /* SND55.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AFE18E7FFEF007B6799 /* SND55.WAV */; }; - 914B2B6518E8005B007B6799 /* SND56.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2AFF18E7FFEF007B6799 /* SND56.WAV */; }; - 914B2B6618E8005B007B6799 /* SND57.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B0018E7FFEF007B6799 /* SND57.WAV */; }; - 914B2B6718E8005B007B6799 /* SND58.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B0118E7FFEF007B6799 /* SND58.WAV */; }; - 914B2B6818E8005B007B6799 /* SND59.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B0218E7FFEF007B6799 /* SND59.WAV */; }; - 914B2B6918E8005B007B6799 /* SND6.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B0318E7FFEF007B6799 /* SND6.WAV */; }; - 914B2B6A18E8005B007B6799 /* SND60.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B0418E7FFEF007B6799 /* SND60.WAV */; }; - 914B2B6B18E8005B007B6799 /* SND61.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B0518E7FFEF007B6799 /* SND61.WAV */; }; - 914B2B6C18E8005B007B6799 /* SND62.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B0618E7FFEF007B6799 /* SND62.WAV */; }; - 914B2B6D18E8005B007B6799 /* SND63.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B0718E7FFEF007B6799 /* SND63.WAV */; }; - 914B2B6E18E8005B007B6799 /* SND64.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B0818E7FFEF007B6799 /* SND64.WAV */; }; - 914B2B6F18E8005B007B6799 /* SND65.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B0918E7FFEF007B6799 /* SND65.WAV */; }; - 914B2B7018E8005B007B6799 /* SND66.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B0A18E7FFEF007B6799 /* SND66.WAV */; }; - 914B2B7118E8005B007B6799 /* SND67.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B0B18E7FFEF007B6799 /* SND67.WAV */; }; - 914B2B7218E8005B007B6799 /* SND68.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B0C18E7FFEF007B6799 /* SND68.WAV */; }; - 914B2B7318E8005B007B6799 /* SND69.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B0D18E7FFEF007B6799 /* SND69.WAV */; }; - 914B2B7418E8005B007B6799 /* SND7.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B0E18E7FFEF007B6799 /* SND7.WAV */; }; - 914B2B7518E8005B007B6799 /* SND70.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B0F18E7FFEF007B6799 /* SND70.WAV */; }; - 914B2B7618E8005B007B6799 /* SND71.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B1018E7FFEF007B6799 /* SND71.WAV */; }; - 914B2B7718E8005B007B6799 /* SND72.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B1118E7FFEF007B6799 /* SND72.WAV */; }; - 914B2B7818E8005B007B6799 /* SND73.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B1218E7FFEF007B6799 /* SND73.WAV */; }; - 914B2B7918E8005B007B6799 /* SND74.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B1318E7FFEF007B6799 /* SND74.WAV */; }; - 914B2B7A18E8005B007B6799 /* SND75.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B1418E7FFEF007B6799 /* SND75.WAV */; }; - 914B2B7B18E8005B007B6799 /* SND76.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B1518E7FFEF007B6799 /* SND76.WAV */; }; - 914B2B7C18E8005B007B6799 /* SND77.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B1618E7FFEF007B6799 /* SND77.WAV */; }; - 914B2B7D18E8005B007B6799 /* SND78.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B1718E7FFEF007B6799 /* SND78.WAV */; }; - 914B2B7E18E8005B007B6799 /* SND79.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B1818E7FFEF007B6799 /* SND79.WAV */; }; - 914B2B7F18E8005B007B6799 /* SND8.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B1918E7FFEF007B6799 /* SND8.WAV */; }; - 914B2B8018E8005B007B6799 /* SND80.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B1A18E7FFEF007B6799 /* SND80.WAV */; }; - 914B2B8118E8005B007B6799 /* SND81.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B1B18E7FFEF007B6799 /* SND81.WAV */; }; - 914B2B8218E8005B007B6799 /* SND82.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B1C18E7FFEF007B6799 /* SND82.WAV */; }; - 914B2B8318E8005B007B6799 /* SND83.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B1D18E7FFEF007B6799 /* SND83.WAV */; }; - 914B2B8418E8005B007B6799 /* SND84.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B1E18E7FFEF007B6799 /* SND84.WAV */; }; - 914B2B8518E8005B007B6799 /* SND85.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B1F18E7FFEF007B6799 /* SND85.WAV */; }; - 914B2B8618E8005B007B6799 /* SND86.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B2018E7FFEF007B6799 /* SND86.WAV */; }; - 914B2B8718E8005B007B6799 /* SND87.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B2118E7FFEF007B6799 /* SND87.WAV */; }; - 914B2B8818E8005B007B6799 /* SND88.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B2218E7FFEF007B6799 /* SND88.WAV */; }; - 914B2B8918E8005B007B6799 /* SND89.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B2318E7FFEF007B6799 /* SND89.WAV */; }; - 914B2B8A18E8005B007B6799 /* SND9.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B2418E7FFEF007B6799 /* SND9.WAV */; }; - 914B2B8B18E8005B007B6799 /* SND90.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B2518E7FFEF007B6799 /* SND90.WAV */; }; - 914B2B8C18E8005B007B6799 /* SND91.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B2618E7FFEF007B6799 /* SND91.WAV */; }; - 914B2B8D18E8005B007B6799 /* SND92.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B2718E7FFEF007B6799 /* SND92.WAV */; }; - 914B2B8E18E8005B007B6799 /* SND93.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B2818E7FFEF007B6799 /* SND93.WAV */; }; - 914B2B8F18E8005B007B6799 /* SND94.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B2918E7FFEF007B6799 /* SND94.WAV */; }; - 914B2B9018E8005B007B6799 /* SND95.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B2A18E7FFEF007B6799 /* SND95.WAV */; }; - 914B2B9118E8005B007B6799 /* SND96.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B2B18E7FFEF007B6799 /* SND96.WAV */; }; - 914B2B9218E8005B007B6799 /* SND97.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B2C18E7FFEF007B6799 /* SND97.WAV */; }; - 914B2B9318E8005B007B6799 /* SND98.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B2D18E7FFEF007B6799 /* SND98.WAV */; }; - 914B2B9418E8005B007B6799 /* SND99.WAV in Copy Mac Sounds */ = {isa = PBXBuildFile; fileRef = 914B2B2E18E7FFEF007B6799 /* SND99.WAV */; }; - 914CA4441905789C00B6ADD1 /* watch.gif in Copy Mac Cursors */ = {isa = PBXBuildFile; fileRef = 914CA4431905788F00B6ADD1 /* watch.gif */; }; 914CA45819074E0100B6ADD1 /* scen.menus.mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 914CA45719074D0A00B6ADD1 /* scen.menus.mac.mm */; }; 915325171A2E1DF0000A9A1C /* oldstructs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 915325161A2E1DA8000A9A1C /* oldstructs.cpp */; }; 915325391A2E5F36000A9A1C /* specials_parse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 915325181A2E37EE000A9A1C /* specials_parse.cpp */; }; @@ -335,6 +143,8 @@ 915E090A1A316EE3008BDF00 /* map_parse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 915E09081A316D89008BDF00 /* map_parse.cpp */; }; 915E090B1A316EE4008BDF00 /* map_parse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 915E09081A316D89008BDF00 /* map_parse.cpp */; }; 915E090C1A317E2E008BDF00 /* map_parse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 915E09081A316D89008BDF00 /* map_parse.cpp */; }; + 9179A4601A42988500FEF872 /* sounds.exa in Copy Sounds and Graphics */ = {isa = PBXBuildFile; fileRef = 9179A45F1A42988200FEF872 /* sounds.exa */; }; + 9179A4611A42988800FEF872 /* graphics.exd in Copy Sounds and Graphics */ = {isa = PBXBuildFile; fileRef = 9179A45E1A42986200FEF872 /* graphics.exd */; }; 91870F81190C8C1C0081C150 /* winutil.mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 919145FF18E63B70005CF3A4 /* winutil.mac.mm */; }; 91870F83190C8C1F0081C150 /* tarball.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91BFA3D81902AD78001686E4 /* tarball.cpp */; }; 91870F84190C90980081C150 /* scen.menu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 914CA49F190C4E9200B6ADD1 /* scen.menu.xib */; }; @@ -381,7 +191,6 @@ 91AC65520FA3441B00EEAE67 /* universe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91AC61C50FA2729900EEAE67 /* universe.cpp */; }; 91AC65AD0FA34AC600EEAE67 /* universe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91AC61C50FA2729900EEAE67 /* universe.cpp */; }; 91ACCE6418FFB61A00FAEF8B /* bladbase.exs in Copy Base Scenarios */ = {isa = PBXBuildFile; fileRef = 91B3EF250F969CE300BF5B67 /* bladbase.exs */; }; - 91ACCE66190004F000FAEF8B /* dlogscroll.png in Copy Mac Graphics */ = {isa = PBXBuildFile; fileRef = 91ACCE65190004D300FAEF8B /* dlogscroll.png */; }; 91ACCE7619002E5F00FAEF8B /* sfml-audio.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DD18F87F3700E3EA15 /* sfml-audio.framework */; }; 91ACCE7719002E5F00FAEF8B /* sfml-graphics.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8DE18F87F3700E3EA15 /* sfml-graphics.framework */; }; 91ACCE7919002E5F00FAEF8B /* sfml-system.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 91F6F8E018F87F3700E3EA15 /* sfml-system.framework */; }; @@ -559,116 +368,16 @@ name = "Copy Scenarios"; runOnlyForDeploymentPostprocessing = 0; }; - 912CF36D0FE44A2A0063B614 /* Copy Mac Graphics */ = { + 912CF36D0FE44A2A0063B614 /* Copy Sounds and Graphics */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; - dstPath = "Scenario Editor/graphics.exd/mac"; + dstPath = "Scenario Editor"; dstSubfolderSpec = 16; files = ( - 912CF4140FE44AAF0063B614 /* actionhelp.png in Copy Mac Graphics */, - 912CF4150FE44AAF0063B614 /* bigscenpics.png in Copy Mac Graphics */, - 912CF4160FE44AAF0063B614 /* booms.png in Copy Mac Graphics */, - 912CF4170FE44AAF0063B614 /* buttons.png in Copy Mac Graphics */, - 912CF4180FE44AAF0063B614 /* dlgbtnred.png in Copy Mac Graphics */, - 912CF4190FE44AAF0063B614 /* dlogbtnhelp.png in Copy Mac Graphics */, - 912CF41A0FE44AAF0063B614 /* dlogbtnled.png in Copy Mac Graphics */, - 912CF41B0FE44AAF0063B614 /* dlogbtnlg.png in Copy Mac Graphics */, - 912CF41C0FE44AAF0063B614 /* dlogbtnmed.png in Copy Mac Graphics */, - 912CF41D0FE44AAF0063B614 /* dlogbtnsm.png in Copy Mac Graphics */, - 912CF41E0FE44AAF0063B614 /* dlogbtntall.png in Copy Mac Graphics */, - 912CF41F0FE44AAF0063B614 /* dlogpics.png in Copy Mac Graphics */, - 91ACCE66190004F000FAEF8B /* dlogscroll.png in Copy Mac Graphics */, - 912CF4200FE44AAF0063B614 /* edbuttons.png in Copy Mac Graphics */, - 912CF4210FE44AAF0063B614 /* edsplash.png in Copy Mac Graphics */, - 912CF4220FE44AAF0063B614 /* fields.png in Copy Mac Graphics */, - 912CF4230FE44AAF0063B614 /* fighthelp.png in Copy Mac Graphics */, - 912CF4240FE44AAF0063B614 /* invenbtns.png in Copy Mac Graphics */, - 912CF4250FE44AAF0063B614 /* invenhelp.png in Copy Mac Graphics */, - 912CF4260FE44AAF0063B614 /* inventory.png in Copy Mac Graphics */, - 912CF4270FE44AAF0063B614 /* mapOLD.png in Copy Mac Graphics */, - 912CF4280FE44AAF0063B614 /* missiles.png in Copy Mac Graphics */, - 912CF4290FE44AAF0063B614 /* monst1.png in Copy Mac Graphics */, - 912CF42A0FE44AAF0063B614 /* monst10.png in Copy Mac Graphics */, - 912CF42B0FE44AAF0063B614 /* monst11.png in Copy Mac Graphics */, - 912CF42C0FE44AAF0063B614 /* monst2.png in Copy Mac Graphics */, - 912CF42D0FE44AAF0063B614 /* monst3.png in Copy Mac Graphics */, - 912CF42E0FE44AAF0063B614 /* monst4.png in Copy Mac Graphics */, - 912CF42F0FE44AAF0063B614 /* monst5.png in Copy Mac Graphics */, - 912CF4300FE44AAF0063B614 /* monst6.png in Copy Mac Graphics */, - 912CF4310FE44AAF0063B614 /* monst7.png in Copy Mac Graphics */, - 912CF4320FE44AAF0063B614 /* monst8.png in Copy Mac Graphics */, - 912CF4330FE44AAF0063B614 /* monst9.png in Copy Mac Graphics */, - 912CF4340FE44AAF0063B614 /* objects.png in Copy Mac Graphics */, - 912CF4350FE44AAF0063B614 /* outhelp.png in Copy Mac Graphics */, - 912CF4360FE44AAF0063B614 /* pcedbuttons.png in Copy Mac Graphics */, - 912CF4370FE44AAF0063B614 /* pcedtitle.png in Copy Mac Graphics */, - 912CF4380FE44AAF0063B614 /* pcs.png in Copy Mac Graphics */, - 912CF4390FE44AAF0063B614 /* pixpats.png in Copy Mac Graphics */, - 912CF43A0FE44AAF0063B614 /* scenpics.png in Copy Mac Graphics */, - 912CF43B0FE44AAF0063B614 /* spidlogo.png in Copy Mac Graphics */, - 912CF43C0FE44AAF0063B614 /* startanim.png in Copy Mac Graphics */, - 912CF43D0FE44AAF0063B614 /* startbut.png in Copy Mac Graphics */, - 912CF43E0FE44AAF0063B614 /* startsplash.png in Copy Mac Graphics */, - 912CF43F0FE44AAF0063B614 /* startup.png in Copy Mac Graphics */, - 912CF4400FE44AAF0063B614 /* statarea.png in Copy Mac Graphics */, - 912CF4410FE44AAF0063B614 /* stathelp.png in Copy Mac Graphics */, - 912CF4420FE44AAF0063B614 /* staticonhelp.png in Copy Mac Graphics */, - 912CF4430FE44AAF0063B614 /* staticons.png in Copy Mac Graphics */, - 912CF4440FE44AAF0063B614 /* talkportraits.png in Copy Mac Graphics */, - 912CF4450FE44AAF0063B614 /* ter1.png in Copy Mac Graphics */, - 912CF4460FE44AAF0063B614 /* ter2.png in Copy Mac Graphics */, - 912CF4470FE44AAF0063B614 /* ter3.png in Copy Mac Graphics */, - 912CF4480FE44AAF0063B614 /* ter4.png in Copy Mac Graphics */, - 912CF4490FE44AAF0063B614 /* ter5.png in Copy Mac Graphics */, - 912CF44A0FE44AAF0063B614 /* ter6.png in Copy Mac Graphics */, - 912CF44B0FE44AAF0063B614 /* ter7.png in Copy Mac Graphics */, - 912CF44C0FE44AAF0063B614 /* ter8.png in Copy Mac Graphics */, - 912CF44D0FE44AAF0063B614 /* teranim.png in Copy Mac Graphics */, - 912CF44E0FE44AAF0063B614 /* termap.png in Copy Mac Graphics */, - 912CF44F0FE44AAF0063B614 /* terscreen.png in Copy Mac Graphics */, - 912CF4500FE44AAF0063B614 /* textbar.png in Copy Mac Graphics */, - 912CF4510FE44AAF0063B614 /* tinyobj.png in Copy Mac Graphics */, - 912CF4520FE44AAF0063B614 /* townhelp.png in Copy Mac Graphics */, - 912CF4530FE44AAF0063B614 /* transcript.png in Copy Mac Graphics */, - 912CF4540FE44AAF0063B614 /* trim.png in Copy Mac Graphics */, - 912CF4550FE44AAF0063B614 /* vehicle.png in Copy Mac Graphics */, + 9179A4601A42988500FEF872 /* sounds.exa in Copy Sounds and Graphics */, + 9179A4611A42988800FEF872 /* graphics.exd in Copy Sounds and Graphics */, ); - name = "Copy Mac Graphics"; - runOnlyForDeploymentPostprocessing = 0; - }; - 912CF36E0FE44A2A0063B614 /* Copy Mac Cursors */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "Scenario Editor/graphics.exd/mac/cursors"; - dstSubfolderSpec = 16; - files = ( - 912CF4560FE44AC20063B614 /* boot.gif in Copy Mac Cursors */, - 912CF4570FE44AC20063B614 /* bottomright.gif in Copy Mac Cursors */, - 912CF4580FE44AC20063B614 /* brush.gif in Copy Mac Cursors */, - 912CF4590FE44AC20063B614 /* drop.gif in Copy Mac Cursors */, - 912CF45A0FE44AC20063B614 /* E.gif in Copy Mac Cursors */, - 912CF45B0FE44AC20063B614 /* eraser.gif in Copy Mac Cursors */, - 912CF45C0FE44AC20063B614 /* eyedropper.gif in Copy Mac Cursors */, - 912CF45D0FE44AC20063B614 /* hand.gif in Copy Mac Cursors */, - 912CF45E0FE44AC20063B614 /* key.gif in Copy Mac Cursors */, - 912CF45F0FE44AC20063B614 /* look.gif in Copy Mac Cursors */, - 912CF4600FE44AC20063B614 /* N.gif in Copy Mac Cursors */, - 912CF4610FE44AC20063B614 /* NE.gif in Copy Mac Cursors */, - 912CF4620FE44AC20063B614 /* NW.gif in Copy Mac Cursors */, - 912CF4630FE44AC20063B614 /* S.gif in Copy Mac Cursors */, - 912CF4640FE44AC20063B614 /* SE.gif in Copy Mac Cursors */, - 912CF4650FE44AC20063B614 /* spraycan.gif in Copy Mac Cursors */, - 912CF4660FE44AC20063B614 /* SW.gif in Copy Mac Cursors */, - 912CF4670FE44AC20063B614 /* sword.gif in Copy Mac Cursors */, - 912CF4680FE44AC20063B614 /* talk.gif in Copy Mac Cursors */, - 912CF4690FE44AC20063B614 /* target.gif in Copy Mac Cursors */, - 912CF46A0FE44AC20063B614 /* topleft.gif in Copy Mac Cursors */, - 912CF46B0FE44AC20063B614 /* W.gif in Copy Mac Cursors */, - 912CF46C0FE44AC20063B614 /* wait.gif in Copy Mac Cursors */, - 912CF46D0FE44AC20063B614 /* wand.gif in Copy Mac Cursors */, - 914CA4441905789C00B6ADD1 /* watch.gif in Copy Mac Cursors */, - ); - name = "Copy Mac Cursors"; + name = "Copy Sounds and Graphics"; runOnlyForDeploymentPostprocessing = 0; }; 912CF37B0FE44A660063B614 /* Copy String Lists */ = { @@ -705,115 +414,6 @@ name = "Copy Fonts"; runOnlyForDeploymentPostprocessing = 0; }; - 914B2B3118E80030007B6799 /* Copy Mac Sounds */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "Scenario Editor/sounds.exa"; - dstSubfolderSpec = 16; - files = ( - 914B2B3218E8005B007B6799 /* SND1.WAV in Copy Mac Sounds */, - 914B2B3318E8005B007B6799 /* SND10.WAV in Copy Mac Sounds */, - 914B2B3418E8005B007B6799 /* SND11.WAV in Copy Mac Sounds */, - 914B2B3518E8005B007B6799 /* SND12.WAV in Copy Mac Sounds */, - 914B2B3618E8005B007B6799 /* SND13.WAV in Copy Mac Sounds */, - 914B2B3718E8005B007B6799 /* SND14.WAV in Copy Mac Sounds */, - 914B2B3818E8005B007B6799 /* SND15.WAV in Copy Mac Sounds */, - 914B2B3918E8005B007B6799 /* SND16.WAV in Copy Mac Sounds */, - 914B2B3A18E8005B007B6799 /* SND17.WAV in Copy Mac Sounds */, - 914B2B3B18E8005B007B6799 /* SND18.WAV in Copy Mac Sounds */, - 914B2B3C18E8005B007B6799 /* SND19.WAV in Copy Mac Sounds */, - 914B2B3D18E8005B007B6799 /* SND2.WAV in Copy Mac Sounds */, - 914B2B3E18E8005B007B6799 /* SND20.WAV in Copy Mac Sounds */, - 914B2B3F18E8005B007B6799 /* SND21.WAV in Copy Mac Sounds */, - 914B2B4018E8005B007B6799 /* SND22.WAV in Copy Mac Sounds */, - 914B2B4118E8005B007B6799 /* SND23.WAV in Copy Mac Sounds */, - 914B2B4218E8005B007B6799 /* SND24.WAV in Copy Mac Sounds */, - 914B2B4318E8005B007B6799 /* SND25.WAV in Copy Mac Sounds */, - 914B2B4418E8005B007B6799 /* SND26.WAV in Copy Mac Sounds */, - 914B2B4518E8005B007B6799 /* SND27.WAV in Copy Mac Sounds */, - 914B2B4618E8005B007B6799 /* SND28.WAV in Copy Mac Sounds */, - 914B2B4718E8005B007B6799 /* SND29.WAV in Copy Mac Sounds */, - 914B2B4818E8005B007B6799 /* SND3.WAV in Copy Mac Sounds */, - 914B2B4918E8005B007B6799 /* SND30.WAV in Copy Mac Sounds */, - 914B2B4A18E8005B007B6799 /* SND31.WAV in Copy Mac Sounds */, - 914B2B4B18E8005B007B6799 /* SND32.WAV in Copy Mac Sounds */, - 914B2B4C18E8005B007B6799 /* SND33.WAV in Copy Mac Sounds */, - 914B2B4D18E8005B007B6799 /* SND34.WAV in Copy Mac Sounds */, - 914B2B4E18E8005B007B6799 /* SND35.WAV in Copy Mac Sounds */, - 914B2B4F18E8005B007B6799 /* SND36.WAV in Copy Mac Sounds */, - 914B2B5018E8005B007B6799 /* SND37.WAV in Copy Mac Sounds */, - 914B2B5118E8005B007B6799 /* SND38.WAV in Copy Mac Sounds */, - 914B2B5218E8005B007B6799 /* SND39.WAV in Copy Mac Sounds */, - 914B2B5318E8005B007B6799 /* SND4.WAV in Copy Mac Sounds */, - 914B2B5418E8005B007B6799 /* SND40.WAV in Copy Mac Sounds */, - 914B2B5518E8005B007B6799 /* SND41.WAV in Copy Mac Sounds */, - 914B2B5618E8005B007B6799 /* SND42.WAV in Copy Mac Sounds */, - 914B2B5718E8005B007B6799 /* SND43.WAV in Copy Mac Sounds */, - 914B2B5818E8005B007B6799 /* SND44.WAV in Copy Mac Sounds */, - 914B2B5918E8005B007B6799 /* SND45.WAV in Copy Mac Sounds */, - 914B2B5A18E8005B007B6799 /* SND46.WAV in Copy Mac Sounds */, - 914B2B5B18E8005B007B6799 /* SND47.WAV in Copy Mac Sounds */, - 914B2B5C18E8005B007B6799 /* SND48.WAV in Copy Mac Sounds */, - 914B2B5D18E8005B007B6799 /* SND49.WAV in Copy Mac Sounds */, - 914B2B5E18E8005B007B6799 /* SND5.WAV in Copy Mac Sounds */, - 914B2B5F18E8005B007B6799 /* SND50.WAV in Copy Mac Sounds */, - 914B2B6018E8005B007B6799 /* SND51.WAV in Copy Mac Sounds */, - 914B2B6118E8005B007B6799 /* SND52.WAV in Copy Mac Sounds */, - 914B2B6218E8005B007B6799 /* SND53.WAV in Copy Mac Sounds */, - 914B2B6318E8005B007B6799 /* SND54.WAV in Copy Mac Sounds */, - 914B2B6418E8005B007B6799 /* SND55.WAV in Copy Mac Sounds */, - 914B2B6518E8005B007B6799 /* SND56.WAV in Copy Mac Sounds */, - 914B2B6618E8005B007B6799 /* SND57.WAV in Copy Mac Sounds */, - 914B2B6718E8005B007B6799 /* SND58.WAV in Copy Mac Sounds */, - 914B2B6818E8005B007B6799 /* SND59.WAV in Copy Mac Sounds */, - 914B2B6918E8005B007B6799 /* SND6.WAV in Copy Mac Sounds */, - 914B2B6A18E8005B007B6799 /* SND60.WAV in Copy Mac Sounds */, - 914B2B6B18E8005B007B6799 /* SND61.WAV in Copy Mac Sounds */, - 914B2B6C18E8005B007B6799 /* SND62.WAV in Copy Mac Sounds */, - 914B2B6D18E8005B007B6799 /* SND63.WAV in Copy Mac Sounds */, - 914B2B6E18E8005B007B6799 /* SND64.WAV in Copy Mac Sounds */, - 914B2B6F18E8005B007B6799 /* SND65.WAV in Copy Mac Sounds */, - 914B2B7018E8005B007B6799 /* SND66.WAV in Copy Mac Sounds */, - 914B2B7118E8005B007B6799 /* SND67.WAV in Copy Mac Sounds */, - 914B2B7218E8005B007B6799 /* SND68.WAV in Copy Mac Sounds */, - 914B2B7318E8005B007B6799 /* SND69.WAV in Copy Mac Sounds */, - 914B2B7418E8005B007B6799 /* SND7.WAV in Copy Mac Sounds */, - 914B2B7518E8005B007B6799 /* SND70.WAV in Copy Mac Sounds */, - 914B2B7618E8005B007B6799 /* SND71.WAV in Copy Mac Sounds */, - 914B2B7718E8005B007B6799 /* SND72.WAV in Copy Mac Sounds */, - 914B2B7818E8005B007B6799 /* SND73.WAV in Copy Mac Sounds */, - 914B2B7918E8005B007B6799 /* SND74.WAV in Copy Mac Sounds */, - 914B2B7A18E8005B007B6799 /* SND75.WAV in Copy Mac Sounds */, - 914B2B7B18E8005B007B6799 /* SND76.WAV in Copy Mac Sounds */, - 914B2B7C18E8005B007B6799 /* SND77.WAV in Copy Mac Sounds */, - 914B2B7D18E8005B007B6799 /* SND78.WAV in Copy Mac Sounds */, - 914B2B7E18E8005B007B6799 /* SND79.WAV in Copy Mac Sounds */, - 914B2B7F18E8005B007B6799 /* SND8.WAV in Copy Mac Sounds */, - 914B2B8018E8005B007B6799 /* SND80.WAV in Copy Mac Sounds */, - 914B2B8118E8005B007B6799 /* SND81.WAV in Copy Mac Sounds */, - 914B2B8218E8005B007B6799 /* SND82.WAV in Copy Mac Sounds */, - 914B2B8318E8005B007B6799 /* SND83.WAV in Copy Mac Sounds */, - 914B2B8418E8005B007B6799 /* SND84.WAV in Copy Mac Sounds */, - 914B2B8518E8005B007B6799 /* SND85.WAV in Copy Mac Sounds */, - 914B2B8618E8005B007B6799 /* SND86.WAV in Copy Mac Sounds */, - 914B2B8718E8005B007B6799 /* SND87.WAV in Copy Mac Sounds */, - 914B2B8818E8005B007B6799 /* SND88.WAV in Copy Mac Sounds */, - 914B2B8918E8005B007B6799 /* SND89.WAV in Copy Mac Sounds */, - 914B2B8A18E8005B007B6799 /* SND9.WAV in Copy Mac Sounds */, - 914B2B8B18E8005B007B6799 /* SND90.WAV in Copy Mac Sounds */, - 914B2B8C18E8005B007B6799 /* SND91.WAV in Copy Mac Sounds */, - 914B2B8D18E8005B007B6799 /* SND92.WAV in Copy Mac Sounds */, - 914B2B8E18E8005B007B6799 /* SND93.WAV in Copy Mac Sounds */, - 914B2B8F18E8005B007B6799 /* SND94.WAV in Copy Mac Sounds */, - 914B2B9018E8005B007B6799 /* SND95.WAV in Copy Mac Sounds */, - 914B2B9118E8005B007B6799 /* SND96.WAV in Copy Mac Sounds */, - 914B2B9218E8005B007B6799 /* SND97.WAV in Copy Mac Sounds */, - 914B2B9318E8005B007B6799 /* SND98.WAV in Copy Mac Sounds */, - 914B2B9418E8005B007B6799 /* SND99.WAV in Copy Mac Sounds */, - ); - name = "Copy Mac Sounds"; - runOnlyForDeploymentPostprocessing = 0; - }; 914B2B9518E8008A007B6799 /* Copy Dialog Definitions */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -1040,96 +640,6 @@ 91279CC60F9D1A02007B0D52 /* special.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = special.cpp; sourceTree = ""; }; 91279D3C0F9D1D6A007B0D52 /* item.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = item.h; sourceTree = ""; }; 91279D3D0F9D1D6A007B0D52 /* item.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = item.cpp; sourceTree = ""; }; - 912CF37F0FE44A9B0063B614 /* actionhelp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = actionhelp.png; sourceTree = ""; }; - 912CF3800FE44A9B0063B614 /* bigscenpics.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bigscenpics.png; sourceTree = ""; }; - 912CF3810FE44A9B0063B614 /* booms.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = booms.png; sourceTree = ""; }; - 912CF3820FE44A9B0063B614 /* buttons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = buttons.png; sourceTree = ""; }; - 912CF3840FE44A9B0063B614 /* boot.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = boot.gif; sourceTree = ""; }; - 912CF3850FE44A9B0063B614 /* bottomright.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = bottomright.gif; sourceTree = ""; }; - 912CF3860FE44A9B0063B614 /* brush.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = brush.gif; sourceTree = ""; }; - 912CF3870FE44A9B0063B614 /* drop.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = drop.gif; sourceTree = ""; }; - 912CF3880FE44A9B0063B614 /* E.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = E.gif; sourceTree = ""; }; - 912CF3890FE44A9B0063B614 /* eraser.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = eraser.gif; sourceTree = ""; }; - 912CF38A0FE44A9B0063B614 /* eyedropper.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = eyedropper.gif; sourceTree = ""; }; - 912CF38B0FE44A9B0063B614 /* hand.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = hand.gif; sourceTree = ""; }; - 912CF38C0FE44A9B0063B614 /* key.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = key.gif; sourceTree = ""; }; - 912CF38D0FE44A9B0063B614 /* look.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = look.gif; sourceTree = ""; }; - 912CF38E0FE44A9B0063B614 /* N.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = N.gif; sourceTree = ""; }; - 912CF38F0FE44A9B0063B614 /* NE.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = NE.gif; sourceTree = ""; }; - 912CF3900FE44A9B0063B614 /* NW.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = NW.gif; sourceTree = ""; }; - 912CF3910FE44A9B0063B614 /* S.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = S.gif; sourceTree = ""; }; - 912CF3920FE44A9B0063B614 /* SE.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = SE.gif; sourceTree = ""; }; - 912CF3930FE44A9B0063B614 /* spraycan.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = spraycan.gif; sourceTree = ""; }; - 912CF3940FE44A9B0063B614 /* SW.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = SW.gif; sourceTree = ""; }; - 912CF3950FE44A9B0063B614 /* sword.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = sword.gif; sourceTree = ""; }; - 912CF3960FE44A9B0063B614 /* talk.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = talk.gif; sourceTree = ""; }; - 912CF3970FE44A9B0063B614 /* target.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = target.gif; sourceTree = ""; }; - 912CF3980FE44A9B0063B614 /* topleft.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = topleft.gif; sourceTree = ""; }; - 912CF3990FE44A9B0063B614 /* W.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = W.gif; sourceTree = ""; }; - 912CF39A0FE44A9B0063B614 /* wait.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = wait.gif; sourceTree = ""; }; - 912CF39B0FE44A9B0063B614 /* wand.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = wand.gif; sourceTree = ""; }; - 912CF39C0FE44A9B0063B614 /* dlgbtnred.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dlgbtnred.png; sourceTree = ""; }; - 912CF39D0FE44A9B0063B614 /* dlogbtnhelp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dlogbtnhelp.png; sourceTree = ""; }; - 912CF39E0FE44A9B0063B614 /* dlogbtnled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dlogbtnled.png; sourceTree = ""; }; - 912CF39F0FE44A9B0063B614 /* dlogbtnlg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dlogbtnlg.png; sourceTree = ""; }; - 912CF3A00FE44A9B0063B614 /* dlogbtnmed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dlogbtnmed.png; sourceTree = ""; }; - 912CF3A10FE44A9B0063B614 /* dlogbtnsm.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dlogbtnsm.png; sourceTree = ""; }; - 912CF3A20FE44A9B0063B614 /* dlogbtntall.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dlogbtntall.png; sourceTree = ""; }; - 912CF3A30FE44A9B0063B614 /* dlogpics.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dlogpics.png; sourceTree = ""; }; - 912CF3A40FE44A9B0063B614 /* edbuttons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = edbuttons.png; sourceTree = ""; }; - 912CF3A50FE44A9B0063B614 /* edsplash.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = edsplash.png; sourceTree = ""; }; - 912CF3A60FE44A9B0063B614 /* fields.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fields.png; sourceTree = ""; }; - 912CF3A70FE44A9B0063B614 /* fighthelp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fighthelp.png; sourceTree = ""; }; - 912CF3A80FE44A9B0063B614 /* invenbtns.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = invenbtns.png; sourceTree = ""; }; - 912CF3A90FE44A9B0063B614 /* invenhelp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = invenhelp.png; sourceTree = ""; }; - 912CF3AA0FE44A9B0063B614 /* inventory.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = inventory.png; sourceTree = ""; }; - 912CF3AB0FE44A9B0063B614 /* mapOLD.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mapOLD.png; sourceTree = ""; }; - 912CF3AC0FE44A9B0063B614 /* missiles.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = missiles.png; sourceTree = ""; }; - 912CF3AD0FE44A9B0063B614 /* monst1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = monst1.png; sourceTree = ""; }; - 912CF3AE0FE44A9B0063B614 /* monst10.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = monst10.png; sourceTree = ""; }; - 912CF3AF0FE44A9B0063B614 /* monst11.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = monst11.png; sourceTree = ""; }; - 912CF3B00FE44A9B0063B614 /* monst2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = monst2.png; sourceTree = ""; }; - 912CF3B10FE44A9B0063B614 /* monst3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = monst3.png; sourceTree = ""; }; - 912CF3B20FE44A9B0063B614 /* monst4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = monst4.png; sourceTree = ""; }; - 912CF3B30FE44A9B0063B614 /* monst5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = monst5.png; sourceTree = ""; }; - 912CF3B40FE44A9B0063B614 /* monst6.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = monst6.png; sourceTree = ""; }; - 912CF3B50FE44A9B0063B614 /* monst7.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = monst7.png; sourceTree = ""; }; - 912CF3B60FE44A9B0063B614 /* monst8.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = monst8.png; sourceTree = ""; }; - 912CF3B70FE44A9B0063B614 /* monst9.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = monst9.png; sourceTree = ""; }; - 912CF3B80FE44A9B0063B614 /* objects.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = objects.png; sourceTree = ""; }; - 912CF3B90FE44A9B0063B614 /* outhelp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = outhelp.png; sourceTree = ""; }; - 912CF3BA0FE44A9B0063B614 /* pcedbuttons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pcedbuttons.png; sourceTree = ""; }; - 912CF3BB0FE44A9B0063B614 /* pcedtitle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pcedtitle.png; sourceTree = ""; }; - 912CF3BC0FE44A9B0063B614 /* pcs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pcs.png; sourceTree = ""; }; - 912CF3BD0FE44A9B0063B614 /* pixpats.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pixpats.png; sourceTree = ""; }; - 912CF3BE0FE44A9B0063B614 /* scenpics.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = scenpics.png; sourceTree = ""; }; - 912CF3BF0FE44A9B0063B614 /* spidlogo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = spidlogo.png; sourceTree = ""; }; - 912CF3C00FE44A9B0063B614 /* startanim.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = startanim.png; sourceTree = ""; }; - 912CF3C10FE44A9B0063B614 /* startbut.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = startbut.png; sourceTree = ""; }; - 912CF3C20FE44A9B0063B614 /* startsplash.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = startsplash.png; sourceTree = ""; }; - 912CF3C30FE44A9B0063B614 /* startup.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = startup.png; sourceTree = ""; }; - 912CF3C40FE44A9B0063B614 /* statarea.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = statarea.png; sourceTree = ""; }; - 912CF3C50FE44A9B0063B614 /* stathelp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = stathelp.png; sourceTree = ""; }; - 912CF3C60FE44A9B0063B614 /* staticonhelp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = staticonhelp.png; sourceTree = ""; }; - 912CF3C70FE44A9B0063B614 /* staticons.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = staticons.png; sourceTree = ""; }; - 912CF3C80FE44A9B0063B614 /* talkportraits.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = talkportraits.png; sourceTree = ""; }; - 912CF3C90FE44A9B0063B614 /* ter1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ter1.png; sourceTree = ""; }; - 912CF3CA0FE44A9B0063B614 /* ter2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ter2.png; sourceTree = ""; }; - 912CF3CB0FE44A9B0063B614 /* ter3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ter3.png; sourceTree = ""; }; - 912CF3CC0FE44A9B0063B614 /* ter4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ter4.png; sourceTree = ""; }; - 912CF3CD0FE44A9B0063B614 /* ter5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ter5.png; sourceTree = ""; }; - 912CF3CE0FE44A9B0063B614 /* ter6.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ter6.png; sourceTree = ""; }; - 912CF3CF0FE44A9B0063B614 /* ter7.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ter7.png; sourceTree = ""; }; - 912CF3D00FE44A9B0063B614 /* ter8.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ter8.png; sourceTree = ""; }; - 912CF3D10FE44A9B0063B614 /* teranim.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = teranim.png; sourceTree = ""; }; - 912CF3D20FE44A9B0063B614 /* termap.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = termap.png; sourceTree = ""; }; - 912CF3D30FE44A9B0063B614 /* terscreen.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = terscreen.png; sourceTree = ""; }; - 912CF3D40FE44A9B0063B614 /* textbar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = textbar.png; sourceTree = ""; }; - 912CF3D50FE44A9B0063B614 /* tinyobj.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tinyobj.png; sourceTree = ""; }; - 912CF3D60FE44A9B0063B614 /* townhelp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = townhelp.png; sourceTree = ""; }; - 912CF3D70FE44A9B0063B614 /* transcript.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = transcript.png; sourceTree = ""; }; - 912CF3D80FE44A9B0063B614 /* trim.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = trim.png; sourceTree = ""; }; - 912CF3D90FE44A9B0063B614 /* vehicle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = vehicle.png; sourceTree = ""; }; 912DFE8918E24B4C00B00D75 /* resmgr.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = resmgr.hpp; sourceTree = ""; }; 912DFE8A18E24B4C00B00D75 /* restypes.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = restypes.hpp; sourceTree = ""; }; 912DFE8E18E2872300B00D75 /* boe.menus.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = boe.menus.mac.mm; sourceTree = ""; }; @@ -1146,107 +656,7 @@ 914B2AA118E7E500007B6799 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 914B2AA218E7E500007B6799 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; 914B2AAE18E7E529007B6799 /* sndfile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = sndfile.framework; path = /Library/Frameworks/sndfile.framework; sourceTree = ""; }; - 914B2ACC18E7FFEF007B6799 /* SND1.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND1.WAV; sourceTree = ""; }; - 914B2ACD18E7FFEF007B6799 /* SND10.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND10.WAV; sourceTree = ""; }; - 914B2ACE18E7FFEF007B6799 /* SND11.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND11.WAV; sourceTree = ""; }; - 914B2ACF18E7FFEF007B6799 /* SND12.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND12.WAV; sourceTree = ""; }; - 914B2AD018E7FFEF007B6799 /* SND13.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND13.WAV; sourceTree = ""; }; - 914B2AD118E7FFEF007B6799 /* SND14.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND14.WAV; sourceTree = ""; }; - 914B2AD218E7FFEF007B6799 /* SND15.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND15.WAV; sourceTree = ""; }; - 914B2AD318E7FFEF007B6799 /* SND16.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND16.WAV; sourceTree = ""; }; - 914B2AD418E7FFEF007B6799 /* SND17.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND17.WAV; sourceTree = ""; }; - 914B2AD518E7FFEF007B6799 /* SND18.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND18.WAV; sourceTree = ""; }; - 914B2AD618E7FFEF007B6799 /* SND19.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND19.WAV; sourceTree = ""; }; - 914B2AD718E7FFEF007B6799 /* SND2.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND2.WAV; sourceTree = ""; }; - 914B2AD818E7FFEF007B6799 /* SND20.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND20.WAV; sourceTree = ""; }; - 914B2AD918E7FFEF007B6799 /* SND21.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND21.WAV; sourceTree = ""; }; - 914B2ADA18E7FFEF007B6799 /* SND22.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND22.WAV; sourceTree = ""; }; - 914B2ADB18E7FFEF007B6799 /* SND23.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND23.WAV; sourceTree = ""; }; - 914B2ADC18E7FFEF007B6799 /* SND24.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND24.WAV; sourceTree = ""; }; - 914B2ADD18E7FFEF007B6799 /* SND25.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND25.WAV; sourceTree = ""; }; - 914B2ADE18E7FFEF007B6799 /* SND26.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND26.WAV; sourceTree = ""; }; - 914B2ADF18E7FFEF007B6799 /* SND27.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND27.WAV; sourceTree = ""; }; - 914B2AE018E7FFEF007B6799 /* SND28.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND28.WAV; sourceTree = ""; }; - 914B2AE118E7FFEF007B6799 /* SND29.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND29.WAV; sourceTree = ""; }; - 914B2AE218E7FFEF007B6799 /* SND3.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND3.WAV; sourceTree = ""; }; - 914B2AE318E7FFEF007B6799 /* SND30.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND30.WAV; sourceTree = ""; }; - 914B2AE418E7FFEF007B6799 /* SND31.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND31.WAV; sourceTree = ""; }; - 914B2AE518E7FFEF007B6799 /* SND32.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND32.WAV; sourceTree = ""; }; - 914B2AE618E7FFEF007B6799 /* SND33.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND33.WAV; sourceTree = ""; }; - 914B2AE718E7FFEF007B6799 /* SND34.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND34.WAV; sourceTree = ""; }; - 914B2AE818E7FFEF007B6799 /* SND35.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND35.WAV; sourceTree = ""; }; - 914B2AE918E7FFEF007B6799 /* SND36.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND36.WAV; sourceTree = ""; }; - 914B2AEA18E7FFEF007B6799 /* SND37.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND37.WAV; sourceTree = ""; }; - 914B2AEB18E7FFEF007B6799 /* SND38.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND38.WAV; sourceTree = ""; }; - 914B2AEC18E7FFEF007B6799 /* SND39.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND39.WAV; sourceTree = ""; }; - 914B2AED18E7FFEF007B6799 /* SND4.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND4.WAV; sourceTree = ""; }; - 914B2AEE18E7FFEF007B6799 /* SND40.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND40.WAV; sourceTree = ""; }; - 914B2AEF18E7FFEF007B6799 /* SND41.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND41.WAV; sourceTree = ""; }; - 914B2AF018E7FFEF007B6799 /* SND42.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND42.WAV; sourceTree = ""; }; - 914B2AF118E7FFEF007B6799 /* SND43.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND43.WAV; sourceTree = ""; }; - 914B2AF218E7FFEF007B6799 /* SND44.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND44.WAV; sourceTree = ""; }; - 914B2AF318E7FFEF007B6799 /* SND45.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND45.WAV; sourceTree = ""; }; - 914B2AF418E7FFEF007B6799 /* SND46.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND46.WAV; sourceTree = ""; }; - 914B2AF518E7FFEF007B6799 /* SND47.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND47.WAV; sourceTree = ""; }; - 914B2AF618E7FFEF007B6799 /* SND48.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND48.WAV; sourceTree = ""; }; - 914B2AF718E7FFEF007B6799 /* SND49.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND49.WAV; sourceTree = ""; }; - 914B2AF818E7FFEF007B6799 /* SND5.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND5.WAV; sourceTree = ""; }; - 914B2AF918E7FFEF007B6799 /* SND50.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND50.WAV; sourceTree = ""; }; - 914B2AFA18E7FFEF007B6799 /* SND51.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND51.WAV; sourceTree = ""; }; - 914B2AFB18E7FFEF007B6799 /* SND52.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND52.WAV; sourceTree = ""; }; - 914B2AFC18E7FFEF007B6799 /* SND53.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND53.WAV; sourceTree = ""; }; - 914B2AFD18E7FFEF007B6799 /* SND54.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND54.WAV; sourceTree = ""; }; - 914B2AFE18E7FFEF007B6799 /* SND55.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND55.WAV; sourceTree = ""; }; - 914B2AFF18E7FFEF007B6799 /* SND56.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND56.WAV; sourceTree = ""; }; - 914B2B0018E7FFEF007B6799 /* SND57.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND57.WAV; sourceTree = ""; }; - 914B2B0118E7FFEF007B6799 /* SND58.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND58.WAV; sourceTree = ""; }; - 914B2B0218E7FFEF007B6799 /* SND59.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND59.WAV; sourceTree = ""; }; - 914B2B0318E7FFEF007B6799 /* SND6.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND6.WAV; sourceTree = ""; }; - 914B2B0418E7FFEF007B6799 /* SND60.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND60.WAV; sourceTree = ""; }; - 914B2B0518E7FFEF007B6799 /* SND61.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND61.WAV; sourceTree = ""; }; - 914B2B0618E7FFEF007B6799 /* SND62.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND62.WAV; sourceTree = ""; }; - 914B2B0718E7FFEF007B6799 /* SND63.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND63.WAV; sourceTree = ""; }; - 914B2B0818E7FFEF007B6799 /* SND64.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND64.WAV; sourceTree = ""; }; - 914B2B0918E7FFEF007B6799 /* SND65.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND65.WAV; sourceTree = ""; }; - 914B2B0A18E7FFEF007B6799 /* SND66.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND66.WAV; sourceTree = ""; }; - 914B2B0B18E7FFEF007B6799 /* SND67.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND67.WAV; sourceTree = ""; }; - 914B2B0C18E7FFEF007B6799 /* SND68.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND68.WAV; sourceTree = ""; }; - 914B2B0D18E7FFEF007B6799 /* SND69.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND69.WAV; sourceTree = ""; }; - 914B2B0E18E7FFEF007B6799 /* SND7.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND7.WAV; sourceTree = ""; }; - 914B2B0F18E7FFEF007B6799 /* SND70.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND70.WAV; sourceTree = ""; }; - 914B2B1018E7FFEF007B6799 /* SND71.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND71.WAV; sourceTree = ""; }; - 914B2B1118E7FFEF007B6799 /* SND72.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND72.WAV; sourceTree = ""; }; - 914B2B1218E7FFEF007B6799 /* SND73.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND73.WAV; sourceTree = ""; }; - 914B2B1318E7FFEF007B6799 /* SND74.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND74.WAV; sourceTree = ""; }; - 914B2B1418E7FFEF007B6799 /* SND75.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND75.WAV; sourceTree = ""; }; - 914B2B1518E7FFEF007B6799 /* SND76.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND76.WAV; sourceTree = ""; }; - 914B2B1618E7FFEF007B6799 /* SND77.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND77.WAV; sourceTree = ""; }; - 914B2B1718E7FFEF007B6799 /* SND78.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND78.WAV; sourceTree = ""; }; - 914B2B1818E7FFEF007B6799 /* SND79.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND79.WAV; sourceTree = ""; }; - 914B2B1918E7FFEF007B6799 /* SND8.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND8.WAV; sourceTree = ""; }; - 914B2B1A18E7FFEF007B6799 /* SND80.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND80.WAV; sourceTree = ""; }; - 914B2B1B18E7FFEF007B6799 /* SND81.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND81.WAV; sourceTree = ""; }; - 914B2B1C18E7FFEF007B6799 /* SND82.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND82.WAV; sourceTree = ""; }; - 914B2B1D18E7FFEF007B6799 /* SND83.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND83.WAV; sourceTree = ""; }; - 914B2B1E18E7FFEF007B6799 /* SND84.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND84.WAV; sourceTree = ""; }; - 914B2B1F18E7FFEF007B6799 /* SND85.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND85.WAV; sourceTree = ""; }; - 914B2B2018E7FFEF007B6799 /* SND86.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND86.WAV; sourceTree = ""; }; - 914B2B2118E7FFEF007B6799 /* SND87.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND87.WAV; sourceTree = ""; }; - 914B2B2218E7FFEF007B6799 /* SND88.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND88.WAV; sourceTree = ""; }; - 914B2B2318E7FFEF007B6799 /* SND89.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND89.WAV; sourceTree = ""; }; - 914B2B2418E7FFEF007B6799 /* SND9.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND9.WAV; sourceTree = ""; }; - 914B2B2518E7FFEF007B6799 /* SND90.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND90.WAV; sourceTree = ""; }; - 914B2B2618E7FFEF007B6799 /* SND91.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND91.WAV; sourceTree = ""; }; - 914B2B2718E7FFEF007B6799 /* SND92.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND92.WAV; sourceTree = ""; }; - 914B2B2818E7FFEF007B6799 /* SND93.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND93.WAV; sourceTree = ""; }; - 914B2B2918E7FFEF007B6799 /* SND94.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND94.WAV; sourceTree = ""; }; - 914B2B2A18E7FFEF007B6799 /* SND95.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND95.WAV; sourceTree = ""; }; - 914B2B2B18E7FFEF007B6799 /* SND96.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND96.WAV; sourceTree = ""; }; - 914B2B2C18E7FFEF007B6799 /* SND97.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND97.WAV; sourceTree = ""; }; - 914B2B2D18E7FFEF007B6799 /* SND98.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND98.WAV; sourceTree = ""; }; - 914B2B2E18E7FFEF007B6799 /* SND99.WAV */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = SND99.WAV; sourceTree = ""; }; 914B2BB518E892AA007B6799 /* dialog-converting.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "dialog-converting.txt"; path = "dialogxml/dialog-converting.txt"; sourceTree = SOURCE_ROOT; }; - 914CA4431905788F00B6ADD1 /* watch.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = watch.gif; sourceTree = ""; }; 914CA45719074D0A00B6ADD1 /* scen.menus.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = scen.menus.mac.mm; sourceTree = ""; }; 914CA4641909B00100B6ADD1 /* scen.menus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = scen.menus.h; sourceTree = ""; }; 914CA49F190C4E9200B6ADD1 /* scen.menu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = scen.menu.xib; sourceTree = ""; }; @@ -1256,6 +666,8 @@ 91597A6E1A3BEDC700BE7BF9 /* spell.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = spell.cpp; sourceTree = ""; }; 915E09071A316D6A008BDF00 /* map_parse.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = map_parse.hpp; sourceTree = ""; }; 915E09081A316D89008BDF00 /* map_parse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_parse.cpp; sourceTree = ""; }; + 9179A45E1A42986200FEF872 /* graphics.exd */ = {isa = PBXFileReference; lastKnownFileType = folder; path = graphics.exd; sourceTree = ""; }; + 9179A45F1A42988200FEF872 /* sounds.exa */ = {isa = PBXFileReference; lastKnownFileType = folder; path = sounds.exa; sourceTree = ""; }; 917B573F100B956C0096C978 /* undo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = undo.h; sourceTree = ""; }; 918D59A718EA513900735B66 /* dialog.keys.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = dialog.keys.h; sourceTree = ""; }; 919145FB18E3A32F005CF3A4 /* boe.appleevents.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = boe.appleevents.mm; sourceTree = ""; }; @@ -1279,7 +691,6 @@ 91AC61C50FA2729900EEAE67 /* universe.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = universe.cpp; sourceTree = ""; }; 91AC62090FA2853700EEAE67 /* creatlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = creatlist.h; sourceTree = ""; }; 91AC620A0FA2853700EEAE67 /* creatlist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = creatlist.cpp; sourceTree = ""; }; - 91ACCE65190004D300FAEF8B /* dlogscroll.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dlogscroll.png; sourceTree = ""; }; 91ACCE82190032E000FAEF8B /* fix_dylibs.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = fix_dylibs.sh; sourceTree = ""; }; 91B3E8A50F938FFE00BF5B67 /* boe.consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = boe.consts.h; sourceTree = ""; }; 91B3EED90F969BA700BF5B67 /* BoE Scenario Editor-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "BoE Scenario Editor-Info.plist"; sourceTree = ""; }; @@ -1508,129 +919,6 @@ path = classes; sourceTree = ""; }; - 912CF37D0FE44A9B0063B614 /* graphics.exd */ = { - isa = PBXGroup; - children = ( - 912CF37E0FE44A9B0063B614 /* mac */, - 912CF3DA0FE44A9B0063B614 /* win */, - ); - path = graphics.exd; - sourceTree = ""; - }; - 912CF37E0FE44A9B0063B614 /* mac */ = { - isa = PBXGroup; - children = ( - 912CF37F0FE44A9B0063B614 /* actionhelp.png */, - 912CF3800FE44A9B0063B614 /* bigscenpics.png */, - 912CF3810FE44A9B0063B614 /* booms.png */, - 912CF3820FE44A9B0063B614 /* buttons.png */, - 912CF3830FE44A9B0063B614 /* cursors */, - 912CF39C0FE44A9B0063B614 /* dlgbtnred.png */, - 912CF39D0FE44A9B0063B614 /* dlogbtnhelp.png */, - 912CF39E0FE44A9B0063B614 /* dlogbtnled.png */, - 912CF39F0FE44A9B0063B614 /* dlogbtnlg.png */, - 912CF3A00FE44A9B0063B614 /* dlogbtnmed.png */, - 912CF3A10FE44A9B0063B614 /* dlogbtnsm.png */, - 912CF3A20FE44A9B0063B614 /* dlogbtntall.png */, - 912CF3A30FE44A9B0063B614 /* dlogpics.png */, - 91ACCE65190004D300FAEF8B /* dlogscroll.png */, - 912CF3A40FE44A9B0063B614 /* edbuttons.png */, - 912CF3A50FE44A9B0063B614 /* edsplash.png */, - 912CF3A60FE44A9B0063B614 /* fields.png */, - 912CF3A70FE44A9B0063B614 /* fighthelp.png */, - 912CF3A80FE44A9B0063B614 /* invenbtns.png */, - 912CF3A90FE44A9B0063B614 /* invenhelp.png */, - 912CF3AA0FE44A9B0063B614 /* inventory.png */, - 912CF3AB0FE44A9B0063B614 /* mapOLD.png */, - 912CF3AC0FE44A9B0063B614 /* missiles.png */, - 912CF3AD0FE44A9B0063B614 /* monst1.png */, - 912CF3B00FE44A9B0063B614 /* monst2.png */, - 912CF3B10FE44A9B0063B614 /* monst3.png */, - 912CF3B20FE44A9B0063B614 /* monst4.png */, - 912CF3B30FE44A9B0063B614 /* monst5.png */, - 912CF3B40FE44A9B0063B614 /* monst6.png */, - 912CF3B50FE44A9B0063B614 /* monst7.png */, - 912CF3B60FE44A9B0063B614 /* monst8.png */, - 912CF3B70FE44A9B0063B614 /* monst9.png */, - 912CF3AE0FE44A9B0063B614 /* monst10.png */, - 912CF3AF0FE44A9B0063B614 /* monst11.png */, - 912CF3B80FE44A9B0063B614 /* objects.png */, - 912CF3B90FE44A9B0063B614 /* outhelp.png */, - 912CF3BA0FE44A9B0063B614 /* pcedbuttons.png */, - 912CF3BB0FE44A9B0063B614 /* pcedtitle.png */, - 912CF3BC0FE44A9B0063B614 /* pcs.png */, - 912CF3BD0FE44A9B0063B614 /* pixpats.png */, - 912CF3BE0FE44A9B0063B614 /* scenpics.png */, - 912CF3BF0FE44A9B0063B614 /* spidlogo.png */, - 912CF3C00FE44A9B0063B614 /* startanim.png */, - 912CF3C10FE44A9B0063B614 /* startbut.png */, - 912CF3C20FE44A9B0063B614 /* startsplash.png */, - 912CF3C30FE44A9B0063B614 /* startup.png */, - 912CF3C40FE44A9B0063B614 /* statarea.png */, - 912CF3C50FE44A9B0063B614 /* stathelp.png */, - 912CF3C60FE44A9B0063B614 /* staticonhelp.png */, - 912CF3C70FE44A9B0063B614 /* staticons.png */, - 912CF3C80FE44A9B0063B614 /* talkportraits.png */, - 912CF3C90FE44A9B0063B614 /* ter1.png */, - 912CF3CA0FE44A9B0063B614 /* ter2.png */, - 912CF3CB0FE44A9B0063B614 /* ter3.png */, - 912CF3CC0FE44A9B0063B614 /* ter4.png */, - 912CF3CD0FE44A9B0063B614 /* ter5.png */, - 912CF3CE0FE44A9B0063B614 /* ter6.png */, - 912CF3CF0FE44A9B0063B614 /* ter7.png */, - 912CF3D00FE44A9B0063B614 /* ter8.png */, - 912CF3D10FE44A9B0063B614 /* teranim.png */, - 912CF3D20FE44A9B0063B614 /* termap.png */, - 912CF3D30FE44A9B0063B614 /* terscreen.png */, - 912CF3D40FE44A9B0063B614 /* textbar.png */, - 912CF3D50FE44A9B0063B614 /* tinyobj.png */, - 912CF3D60FE44A9B0063B614 /* townhelp.png */, - 912CF3D70FE44A9B0063B614 /* transcript.png */, - 912CF3D80FE44A9B0063B614 /* trim.png */, - 912CF3D90FE44A9B0063B614 /* vehicle.png */, - ); - path = mac; - sourceTree = ""; - }; - 912CF3830FE44A9B0063B614 /* cursors */ = { - isa = PBXGroup; - children = ( - 912CF3840FE44A9B0063B614 /* boot.gif */, - 912CF3850FE44A9B0063B614 /* bottomright.gif */, - 912CF3860FE44A9B0063B614 /* brush.gif */, - 912CF3870FE44A9B0063B614 /* drop.gif */, - 912CF3880FE44A9B0063B614 /* E.gif */, - 912CF3890FE44A9B0063B614 /* eraser.gif */, - 912CF38A0FE44A9B0063B614 /* eyedropper.gif */, - 912CF38B0FE44A9B0063B614 /* hand.gif */, - 912CF38C0FE44A9B0063B614 /* key.gif */, - 912CF38D0FE44A9B0063B614 /* look.gif */, - 912CF38E0FE44A9B0063B614 /* N.gif */, - 912CF38F0FE44A9B0063B614 /* NE.gif */, - 912CF3900FE44A9B0063B614 /* NW.gif */, - 912CF3910FE44A9B0063B614 /* S.gif */, - 912CF3920FE44A9B0063B614 /* SE.gif */, - 912CF3930FE44A9B0063B614 /* spraycan.gif */, - 912CF3940FE44A9B0063B614 /* SW.gif */, - 912CF3950FE44A9B0063B614 /* sword.gif */, - 912CF3960FE44A9B0063B614 /* talk.gif */, - 912CF3970FE44A9B0063B614 /* target.gif */, - 912CF3980FE44A9B0063B614 /* topleft.gif */, - 912CF3990FE44A9B0063B614 /* W.gif */, - 912CF39A0FE44A9B0063B614 /* wait.gif */, - 912CF39B0FE44A9B0063B614 /* wand.gif */, - 914CA4431905788F00B6ADD1 /* watch.gif */, - ); - path = cursors; - sourceTree = ""; - }; - 912CF3DA0FE44A9B0063B614 /* win */ = { - isa = PBXGroup; - children = ( - ); - path = win; - sourceTree = ""; - }; 912DFE8718E24B0B00B00D75 /* resmgr */ = { isa = PBXGroup; children = ( @@ -1760,112 +1048,6 @@ name = "Linked Frameworks"; sourceTree = ""; }; - 914B2ACB18E7FFEF007B6799 /* sounds.exa */ = { - isa = PBXGroup; - children = ( - 914B2ACC18E7FFEF007B6799 /* SND1.WAV */, - 914B2AD718E7FFEF007B6799 /* SND2.WAV */, - 914B2AE218E7FFEF007B6799 /* SND3.WAV */, - 914B2AED18E7FFEF007B6799 /* SND4.WAV */, - 914B2AF818E7FFEF007B6799 /* SND5.WAV */, - 914B2B0318E7FFEF007B6799 /* SND6.WAV */, - 914B2B0E18E7FFEF007B6799 /* SND7.WAV */, - 914B2B1918E7FFEF007B6799 /* SND8.WAV */, - 914B2B2418E7FFEF007B6799 /* SND9.WAV */, - 914B2ACD18E7FFEF007B6799 /* SND10.WAV */, - 914B2ACE18E7FFEF007B6799 /* SND11.WAV */, - 914B2ACF18E7FFEF007B6799 /* SND12.WAV */, - 914B2AD018E7FFEF007B6799 /* SND13.WAV */, - 914B2AD118E7FFEF007B6799 /* SND14.WAV */, - 914B2AD218E7FFEF007B6799 /* SND15.WAV */, - 914B2AD318E7FFEF007B6799 /* SND16.WAV */, - 914B2AD418E7FFEF007B6799 /* SND17.WAV */, - 914B2AD518E7FFEF007B6799 /* SND18.WAV */, - 914B2AD618E7FFEF007B6799 /* SND19.WAV */, - 914B2AD818E7FFEF007B6799 /* SND20.WAV */, - 914B2AD918E7FFEF007B6799 /* SND21.WAV */, - 914B2ADA18E7FFEF007B6799 /* SND22.WAV */, - 914B2ADB18E7FFEF007B6799 /* SND23.WAV */, - 914B2ADC18E7FFEF007B6799 /* SND24.WAV */, - 914B2ADD18E7FFEF007B6799 /* SND25.WAV */, - 914B2ADE18E7FFEF007B6799 /* SND26.WAV */, - 914B2ADF18E7FFEF007B6799 /* SND27.WAV */, - 914B2AE018E7FFEF007B6799 /* SND28.WAV */, - 914B2AE118E7FFEF007B6799 /* SND29.WAV */, - 914B2AE318E7FFEF007B6799 /* SND30.WAV */, - 914B2AE418E7FFEF007B6799 /* SND31.WAV */, - 914B2AE518E7FFEF007B6799 /* SND32.WAV */, - 914B2AE618E7FFEF007B6799 /* SND33.WAV */, - 914B2AE718E7FFEF007B6799 /* SND34.WAV */, - 914B2AE818E7FFEF007B6799 /* SND35.WAV */, - 914B2AE918E7FFEF007B6799 /* SND36.WAV */, - 914B2AEA18E7FFEF007B6799 /* SND37.WAV */, - 914B2AEB18E7FFEF007B6799 /* SND38.WAV */, - 914B2AEC18E7FFEF007B6799 /* SND39.WAV */, - 914B2AEE18E7FFEF007B6799 /* SND40.WAV */, - 914B2AEF18E7FFEF007B6799 /* SND41.WAV */, - 914B2AF018E7FFEF007B6799 /* SND42.WAV */, - 914B2AF118E7FFEF007B6799 /* SND43.WAV */, - 914B2AF218E7FFEF007B6799 /* SND44.WAV */, - 914B2AF318E7FFEF007B6799 /* SND45.WAV */, - 914B2AF418E7FFEF007B6799 /* SND46.WAV */, - 914B2AF518E7FFEF007B6799 /* SND47.WAV */, - 914B2AF618E7FFEF007B6799 /* SND48.WAV */, - 914B2AF718E7FFEF007B6799 /* SND49.WAV */, - 914B2AF918E7FFEF007B6799 /* SND50.WAV */, - 914B2AFA18E7FFEF007B6799 /* SND51.WAV */, - 914B2AFB18E7FFEF007B6799 /* SND52.WAV */, - 914B2AFC18E7FFEF007B6799 /* SND53.WAV */, - 914B2AFD18E7FFEF007B6799 /* SND54.WAV */, - 914B2AFE18E7FFEF007B6799 /* SND55.WAV */, - 914B2AFF18E7FFEF007B6799 /* SND56.WAV */, - 914B2B0018E7FFEF007B6799 /* SND57.WAV */, - 914B2B0118E7FFEF007B6799 /* SND58.WAV */, - 914B2B0218E7FFEF007B6799 /* SND59.WAV */, - 914B2B0418E7FFEF007B6799 /* SND60.WAV */, - 914B2B0518E7FFEF007B6799 /* SND61.WAV */, - 914B2B0618E7FFEF007B6799 /* SND62.WAV */, - 914B2B0718E7FFEF007B6799 /* SND63.WAV */, - 914B2B0818E7FFEF007B6799 /* SND64.WAV */, - 914B2B0918E7FFEF007B6799 /* SND65.WAV */, - 914B2B0A18E7FFEF007B6799 /* SND66.WAV */, - 914B2B0B18E7FFEF007B6799 /* SND67.WAV */, - 914B2B0C18E7FFEF007B6799 /* SND68.WAV */, - 914B2B0D18E7FFEF007B6799 /* SND69.WAV */, - 914B2B0F18E7FFEF007B6799 /* SND70.WAV */, - 914B2B1018E7FFEF007B6799 /* SND71.WAV */, - 914B2B1118E7FFEF007B6799 /* SND72.WAV */, - 914B2B1218E7FFEF007B6799 /* SND73.WAV */, - 914B2B1318E7FFEF007B6799 /* SND74.WAV */, - 914B2B1418E7FFEF007B6799 /* SND75.WAV */, - 914B2B1518E7FFEF007B6799 /* SND76.WAV */, - 914B2B1618E7FFEF007B6799 /* SND77.WAV */, - 914B2B1718E7FFEF007B6799 /* SND78.WAV */, - 914B2B1818E7FFEF007B6799 /* SND79.WAV */, - 914B2B1A18E7FFEF007B6799 /* SND80.WAV */, - 914B2B1B18E7FFEF007B6799 /* SND81.WAV */, - 914B2B1C18E7FFEF007B6799 /* SND82.WAV */, - 914B2B1D18E7FFEF007B6799 /* SND83.WAV */, - 914B2B1E18E7FFEF007B6799 /* SND84.WAV */, - 914B2B1F18E7FFEF007B6799 /* SND85.WAV */, - 914B2B2018E7FFEF007B6799 /* SND86.WAV */, - 914B2B2118E7FFEF007B6799 /* SND87.WAV */, - 914B2B2218E7FFEF007B6799 /* SND88.WAV */, - 914B2B2318E7FFEF007B6799 /* SND89.WAV */, - 914B2B2518E7FFEF007B6799 /* SND90.WAV */, - 914B2B2618E7FFEF007B6799 /* SND91.WAV */, - 914B2B2718E7FFEF007B6799 /* SND92.WAV */, - 914B2B2818E7FFEF007B6799 /* SND93.WAV */, - 914B2B2918E7FFEF007B6799 /* SND94.WAV */, - 914B2B2A18E7FFEF007B6799 /* SND95.WAV */, - 914B2B2B18E7FFEF007B6799 /* SND96.WAV */, - 914B2B2C18E7FFEF007B6799 /* SND97.WAV */, - 914B2B2D18E7FFEF007B6799 /* SND98.WAV */, - 914B2B2E18E7FFEF007B6799 /* SND99.WAV */, - ); - path = sounds.exa; - sourceTree = ""; - }; 914B2BAE18E801E4007B6799 /* dialogs */ = { isa = PBXGroup; children = ( @@ -2015,9 +1197,9 @@ 91C749B71A2D6432008E0E10 /* strings */, 91C749B91A2D66F7008E0E10 /* dialogs */, 914701A318F629D4008A6DC9 /* fonts */, - 914B2ACB18E7FFEF007B6799 /* sounds.exa */, + 9179A45F1A42988200FEF872 /* sounds.exa */, + 9179A45E1A42986200FEF872 /* graphics.exd */, 91B3EF250F969CE300BF5B67 /* bladbase.exs */, - 912CF37D0FE44A9B0063B614 /* graphics.exd */, 91D635A90F90E7B500674AB3 /* Blades of Exile Scenarios */, 914B2BB518E892AA007B6799 /* dialog-converting.txt */, ); diff --git a/osx/boe.graphics.cpp b/osx/boe.graphics.cpp index fd5e31d7..f7a6188d 100644 --- a/osx/boe.graphics.cpp +++ b/osx/boe.graphics.cpp @@ -1232,13 +1232,13 @@ void draw_trim(short q,short r,short which_trim,ter_num_t ground_ter) { // if((which_trim == 3) && (current_ground == 2)) // trim corner walls with grass instead of cave floor // OffsetRect(&from_rect,0,36); unsigned short pic = scenario.ter_types[ground_ter].picture; - if(pic < 400){ + if(pic < 960){ from_gworld = &terrain_gworld[pic / 50]; pic %= 50; from_rect.offset(28 * (pic % 10), 36 * (pic / 10)); }else if(pic < 1000){ from_gworld = &anim_gworld; - pic %= 400; + pic -= 960; from_rect.offset(112 * (pic / 5),36 * (pic % 5)); }else{ pic %= 1000; diff --git a/osx/boe.graphutil.cpp b/osx/boe.graphutil.cpp index b8758f49..8b7e234f 100644 --- a/osx/boe.graphutil.cpp +++ b/osx/boe.graphutil.cpp @@ -123,10 +123,10 @@ void draw_one_terrain_spot (short i,short j,short terrain_to_draw) { graf_pos_ref(source_gworld, source_rect) = spec_scen_g.find_graphic(scenario.ter_types[terrain_to_draw].picture - 1000); terrain_there[i][j] = -1; } - else if(scenario.ter_types[terrain_to_draw].picture >= 400) { // animated + else if(scenario.ter_types[terrain_to_draw].picture >= 960) { // animated source_gworld = &anim_gworld; terrain_to_draw = scenario.ter_types[terrain_to_draw].picture; - source_rect = calc_rect(4 * ((terrain_to_draw - 400) / 5) + (anim_ticks % 4),(terrain_to_draw - 400) % 5); + source_rect = calc_rect(4 * ((terrain_to_draw - 960) / 5) + (anim_ticks % 4),(terrain_to_draw - 960) % 5); terrain_there[i][j] = -1; anim_type = 0; } diff --git a/osx/boe.locutils.cpp b/osx/boe.locutils.cpp index 54f2bcdc..3f48c26e 100644 --- a/osx/boe.locutils.cpp +++ b/osx/boe.locutils.cpp @@ -22,7 +22,6 @@ extern eGameMode overall_mode; //extern cOutdoors outdoors[2][2]; //extern unsigned char out[96][96], out_e[96][96]; extern location center; -extern unsigned char map_graphic_placed[8][64]; // keeps track of what's been filled on map extern cScenario scenario; extern cUniverse univ; @@ -638,9 +637,6 @@ void alter_space(short i,short j,ter_num_t ter) { l.x = i; l.y = j; - map_graphic_placed[i / 8][j] = 0; -// map_graphic_placed[i / 8][j] = -// map_graphic_placed[i / 8][j] & ~((unsigned char)(s_pow(2,i % 8))); if(is_out()) { l = local_to_global(l); diff --git a/osx/boe.town.cpp b/osx/boe.town.cpp index f4b4b4ff..59a8b20e 100644 --- a/osx/boe.town.cpp +++ b/osx/boe.town.cpp @@ -63,7 +63,8 @@ extern location golem_m_locs[16]; extern cScenario scenario; extern cUniverse univ; //extern piles_of_stuff_dumping_type *data_store; -extern sf::Texture bg_gworld; +extern sf::Texture anim_gworld; +extern sf::Texture terrain_gworld[NUM_TER_SHEETS]; extern cCustomGraphics spec_scen_g; bool need_map_full_refresh = true,forcing_map_button_redraw = false; extern sf::RenderTexture map_gworld; @@ -111,7 +112,6 @@ location town_force_loc; bool shop_button_active[12]; rectangle map_title_rect = {3,50,15,300}; rectangle map_bar_rect = {15,50,27,300}; -unsigned char map_graphic_placed[8][64]; // keeps track of what's been filled on map void force_town_enter(short which_town,location where_start) { town_force = which_town; @@ -1276,11 +1276,12 @@ void clear_map() { void draw_map(bool need_refresh) { if(!map_visible) return; - short i,j,pic,pic2; + short i,j; + pic_num_t pic; rectangle the_rect,map_world_rect = {0,0,384,384}; location where; location kludge; - rectangle draw_rect,orig_draw_rect = {0,0,6,6},ter_temp_from; + rectangle draw_rect,orig_draw_rect = {0,0,6,6},ter_temp_from,base_source_rect = {0,0,12,12}; rectangle dlogpicrect = {6,6,42,42}; bool draw_pcs = true,out_mode; rectangle view_rect= {0,0,48,48},tiny_rect = {0,0,32,32}, @@ -1288,8 +1289,8 @@ void draw_map(bool need_refresh) { rectangle area_to_draw_from,area_to_draw_on = {29,47,269,287}; short small_adj = 0; - ter_num_t what_ter,what_ter2; - bool draw_surroundings = false,expl,expl2; + ter_num_t what_ter; + bool draw_surroundings = false,expl; short total_size = 48; // if full redraw, use this to figure out everything rectangle area_to_put_on_map_rect; rectangle custom_from; @@ -1297,13 +1298,6 @@ void draw_map(bool need_refresh) { draw_surroundings = true; - if(need_refresh) { - for(i = 0; i < 8; i++) - for(j = 0; j < 64; j++) - map_graphic_placed[i][j] = 0; - // TODO: I suspect we don't need to save this info - } - town_map_adj.x = 0; town_map_adj.y = 0; @@ -1399,8 +1393,7 @@ void draw_map(bool need_refresh) { area_to_put_on_map_rect.right = area_to_put_on_map_rect.bottom = total_size; for(where.x= area_to_put_on_map_rect.left; where.x < area_to_put_on_map_rect.right; where.x++) - for(where.y= area_to_put_on_map_rect.top; where.y < area_to_put_on_map_rect.bottom; where.y++) - if((map_graphic_placed[where.x / 8][where.y] & (unsigned char)(s_pow(2,where.x % 8))) == 0) { + for(where.y= area_to_put_on_map_rect.top; where.y < area_to_put_on_map_rect.bottom; where.y++) { draw_rect = orig_draw_rect; draw_rect.offset(6 * where.x + small_adj, 6 * where.y + small_adj); @@ -1408,67 +1401,65 @@ void draw_map(bool need_refresh) { what_ter = univ.out[where.x + 48 * univ.party.i_w_c.x][where.y + 48 * univ.party.i_w_c.y]; else what_ter = univ.town->terrain(where.x,where.y); - ter_temp_from = orig_draw_rect; + ter_temp_from = base_source_rect; if(out_mode) expl = univ.out.out_e[where.x + 48 * univ.party.i_w_c.x][where.y + 48 * univ.party.i_w_c.y]; else expl = is_explored(where.x,where.y); if(expl != 0) { - map_graphic_placed[where.x / 8][where.y] = - map_graphic_placed[where.x / 8][where.y] | (unsigned char)(s_pow(2,where.x % 8)); - pic = scenario.ter_types[what_ter].picture; + pic = scenario.ter_types[what_ter].map_pic; + bool drawLargeIcon = false; + if(pic == NO_PIC) { + pic = scenario.ter_types[what_ter].picture; + drawLargeIcon = true; + } if(pic >= 1000) { if(spec_scen_g) { //print_nums(0,99,pic); pic = pic % 1000; sf::Texture* src_gw; - graf_pos_ref(src_gw, custom_from) = spec_scen_g.find_graphic(pic); - custom_from.offset(-13,-13); - rect_draw_some_item(*src_gw,custom_from,map_gworld,draw_rect); + if(drawLargeIcon) { + graf_pos_ref(src_gw, custom_from) = spec_scen_g.find_graphic(pic); + rect_draw_some_item(*src_gw,custom_from,map_gworld,draw_rect); + } else { + graf_pos_ref(src_gw, custom_from) = spec_scen_g.find_graphic(pic % 1000); + custom_from.right = custom_from.left + 12; + custom_from.bottom = custom_from.top + 12; + pic /= 1000; pic--; + custom_from.offset((pic / 3) * 12, (pic % 3) * 12); + rect_draw_some_item(*src_gw, custom_from, map_gworld, draw_rect); + } } - } - else switch((pic >= 400) ? anim_map_pats[pic - 400] : map_pats[pic]) { + } else if(drawLargeIcon) { + if(pic >= 960) { + custom_from = calc_rect(4 * ((pic - 960) / 5),(pic - 960) % 5); + rect_draw_some_item(anim_gworld, custom_from, map_gworld, draw_rect); + } else { + sf::Texture* src_gw = &terrain_gworld[pic / 50]; + pic %= 50; + custom_from = calc_rect(pic % 10, pic / 10); + rect_draw_some_item(*src_gw, custom_from, map_gworld, draw_rect); + } + } else switch(pic >= 960 ? anim_map_pats[pic - 960] : map_pats[pic]) { case 0: case 10: case 11: - if(scenario.ter_types[what_ter].picture < 400) - ter_temp_from.offset(6 * (scenario.ter_types[what_ter].picture % 10), - 6 * (scenario.ter_types[what_ter].picture / 10)); - else ter_temp_from.offset(24 * ((scenario.ter_types[what_ter].picture - 400) / 5), - 6 * ((scenario.ter_types[what_ter].picture - 400) % 5) + 156); + if(scenario.ter_types[what_ter].picture < 960) + ter_temp_from.offset(12 * (scenario.ter_types[what_ter].picture % 20), + 12 * (scenario.ter_types[what_ter].picture / 20)); + else ter_temp_from.offset(12 * 20, + 12 * (scenario.ter_types[what_ter].picture - 960)); rect_draw_some_item(small_ter_gworld,ter_temp_from,map_gworld,draw_rect); break; default: - if(((pic >= 400) ? anim_map_pats[pic - 400] : map_pats[pic]) < 30) { - // Try a little optimization - if((pic < 400) && (where.x < area_to_put_on_map_rect.right - 1)) { - if(out_mode) - what_ter2 = univ.out[(where.x + 1)+ 48 * univ.party.i_w_c.x][where.y + 48 * univ.party.i_w_c.y]; - else what_ter2 = univ.town->terrain(where.x + 1,where.y); - if(out_mode) - expl2 = univ.out.out_e[(where.x + 1) + 48 * univ.party.i_w_c.x][where.y + 48 * univ.party.i_w_c.y]; - else expl2 = is_explored(where.x + 1,where.y); - pic2 = scenario.ter_types[what_ter2].picture; - if((map_pats[pic2] == map_pats[pic]) && (expl2 != 0)) { - draw_rect.right += 6; - kludge = where; kludge.x++; // I don't know why I need to - // do this, but it seems I do - map_graphic_placed[kludge.x / 8][kludge.y] = - map_graphic_placed[kludge.x / 8][kludge.y] | (unsigned char)(s_pow(2,kludge.x % 8)); - } - } - tileImage(mini_map, draw_rect,map_pat[((pic >= 400) ? anim_map_pats[pic - 400] : map_pats[pic]) - 1]); + if(((pic >= 960) ? anim_map_pats[pic - 960] : map_pats[pic]) < 30) { + tileImage(map_gworld, draw_rect,map_pat[((pic >= 960) ? anim_map_pats[pic - 960] : map_pats[pic]) - 1]); break; } - //OffsetRect(&ter_temp_from, - // 24 * ((map_pats[pic] - 30) / 5), - // 138 + 6 * ((map_pats[pic] - 30) % 5)); - //rect_draw_some_item(small_ter_gworld,ter_temp_from, - // map_gworld,draw_rect,0,0); break; } } - } + } map_gworld.display(); } @@ -1521,8 +1512,6 @@ void draw_map(bool need_refresh) { draw_rect.right = draw_rect.left + 6; draw_rect.bottom = draw_rect.top + 6; - map_graphic_placed[where.x / 8][where.y] = - map_graphic_placed[where.x / 8][where.y] & ~((unsigned char)(s_pow(2,where.x % 8))); fill_rect(mini_map, draw_rect, sf::Color::Green); frame_circle(mini_map, draw_rect, sf::Color::Blue); } @@ -1538,8 +1527,6 @@ void draw_map(bool need_refresh) { //} draw_rect.right = draw_rect.left + 6; draw_rect.bottom = draw_rect.top + 6; - map_graphic_placed[where.x / 8][where.y] = - map_graphic_placed[where.x / 8][where.y] & ~((unsigned char)(s_pow(2,where.x % 8))); fill_rect(mini_map, draw_rect, sf::Color::Red); frame_circle(mini_map, draw_rect, sf::Color::Black); diff --git a/osx/classes/terrain.cpp b/osx/classes/terrain.cpp index f615f674..77d4fbab 100644 --- a/osx/classes/terrain.cpp +++ b/osx/classes/terrain.cpp @@ -106,6 +106,7 @@ cTerrain& cTerrain::operator = (legacy::terrain_type_type& old){ ground_type = ground[picture - 140]; trim_type = (eTrimType) trims[picture - 140]; trim_ter = trim_ters[picture - 140]; + picture += 560; }else{ combat_arena = 1; ground_type = 255; @@ -135,7 +136,7 @@ cTerrain& cTerrain::operator = (legacy::terrain_type_type& old){ special = eTerSpec::BED; flag1.s = 230; flag2.u = flag3.u = 0; - }else if((picture >= 61 && picture <= 66) || picture == 401 || picture == 402){ + }else if((picture >= 61 && picture <= 66) || picture == 961 || picture == 962){ special = eTerSpec::BRIDGE; flag1.u = flag2.u = flag3.u = 0; break; @@ -350,6 +351,8 @@ cTerrain& cTerrain::operator = (legacy::terrain_type_type& old){ picture = 137; break; }; + if(picture < 1000) map_pic = picture; + else map_pic = NO_PIC; return *this; } diff --git a/osx/dialogxml/pict.cpp b/osx/dialogxml/pict.cpp index 8a789a71..1081f2bf 100644 --- a/osx/dialogxml/pict.cpp +++ b/osx/dialogxml/pict.cpp @@ -115,7 +115,8 @@ void cPict::setPict(pic_num_t num, ePicType type){ if(m_pic_index[num].y == 2) picType += PIC_TALL; } if(picType != PIC_FULL && picNum >= 1000) { - picNum -= 1000; + if(picType != PIC_CUSTOM_TER_MAP) + picNum -= 1000; picType += PIC_CUSTOM; } recalcRect(); @@ -447,6 +448,10 @@ void cPict::recalcRect() { bounds.height() = 64; break; case PIC_TER_MAP: case PIC_CUSTOM_TER_MAP: + // These are 12x12, but in the dialog we scale them up. + bounds.width() = 24; + bounds.height() = 24; + break; case PIC_STATUS: bounds.width() = 12; bounds.height() = 12; @@ -805,7 +810,9 @@ void cPict::drawPresetTerMap(short num, rectangle to_rect){ // TODO: Should probably fill black somewhere in here...? to_rect.right = to_rect.left + 24; to_rect.bottom = to_rect.top + 24; - from_rect.offset(12 * (num % 10), 12 * (num / 10)); + if(num >= 960) + from_rect.offset(12 * 20, 12 * (num - 960)); + else from_rect.offset(12 * (num % 20), 12 * (num / 20)); rect_draw_some_item(*from_gw, from_rect, *inWindow, to_rect); } @@ -989,7 +996,7 @@ void cPict::drawCustomMissile(short num, rectangle to_rect){ void cPict::drawCustomTerMap(short num, rectangle to_rect){ rectangle from_rect; sf::Texture* from_gw; - graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num); + graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(num % 1000); from_rect.right = from_rect.left + 12; from_rect.bottom = from_rect.top + 12; num /= 1000; num--; diff --git a/osx/scenedit/scen.actions.cpp b/osx/scenedit/scen.actions.cpp index 6b06df3e..2f6fb846 100644 --- a/osx/scenedit/scen.actions.cpp +++ b/osx/scenedit/scen.actions.cpp @@ -23,6 +23,7 @@ #include "scen.btnmg.h" extern char current_string[256]; +extern short mini_map_scales[3]; rectangle world_screen; // border rects order: top, left, bottom, right // rectangle border_rect[4]; @@ -434,11 +435,21 @@ bool handle_action(location the_point,sf::Event /*event*/) { spot_hit.x = -1; } else { - - i = (the_point.x - TER_RECT_UL_X - 8) / 4; - j = (the_point.y - TER_RECT_UL_Y - 8) / 4; - spot_hit.x = i; - spot_hit.y = j; + short scale = mini_map_scales[cur_viewing_mode - 1]; + i = (the_point.x - TER_RECT_UL_X - 8) / scale; + j = (the_point.y - TER_RECT_UL_Y - 8) / scale; + if(scale > 4) { + short dim = editing_town ? town->max_dim() : 48; + if(cen_x + 5 > 256 / scale) + spot_hit.x = cen_x + 5 - 256/scale + i; + else spot_hit.x = i; + if(cen_y + 5 > 324 / scale) + spot_hit.y = cen_y + 5 - 324/scale + j; + else spot_hit.y = j; + } else { + spot_hit.x = i; + spot_hit.y = j; + } } if((mouse_button_held) && (spot_hit.x == last_spot_hit.x) && @@ -1027,7 +1038,7 @@ bool handle_action(location the_point,sf::Event /*event*/) { else set_string("Fill rectangle (solid)","Select upper left corner"); break; case 100: // switch view - cur_viewing_mode = 1 - cur_viewing_mode; + cur_viewing_mode = (cur_viewing_mode + 1) % 4; need_redraw = true; break; case 101: diff --git a/osx/scenedit/scen.core.cpp b/osx/scenedit/scen.core.cpp index c07ca287..3d2789d3 100644 --- a/osx/scenedit/scen.core.cpp +++ b/osx/scenedit/scen.core.cpp @@ -312,10 +312,10 @@ static void fill_ter_info(cDialog& me, short ter){ { cPict& pic_ctrl = dynamic_cast(me["graphic"]); pic_num_t pic = ter_type.picture; - if(pic < 400) + if(pic < 960) pic_ctrl.setPict(pic, PIC_TER); else if(pic < 1000) - pic_ctrl.setPict(pic % 400, PIC_TER_ANIM); + pic_ctrl.setPict(pic - 960, PIC_TER_ANIM); else if(pic < 2000) pic_ctrl.setPict(pic % 1000, PIC_CUSTOM_TER); else @@ -430,7 +430,7 @@ short edit_ter_type(ter_num_t which_ter) { // Attach handlers ter_dlg["pict"].attachFocusHandler(std::bind(check_range,_1,_2,_3,0,2999,"terrain graphic")); ter_dlg["pickpict"].attachClickHandler(std::bind(pick_picture,PIC_TER,_1,"pict","graphic",0)); - ter_dlg["pickanim"].attachClickHandler(std::bind(pick_picture,PIC_TER_ANIM,_1,"pict","graphic",400)); + ter_dlg["pickanim"].attachClickHandler(std::bind(pick_picture,PIC_TER_ANIM,_1,"pict","graphic",960)); ter_dlg["light"].attachFocusHandler(std::bind(check_range,_1,_2,_3,0,255,"light radius")); ter_dlg["trans"].attachFocusHandler(std::bind(check_range,_1,_2,_3,0,65535,"\"transform to what?\"")); ter_dlg["ground"].attachFocusHandler(std::bind(check_range,_1,_2,_3,0,255,"ground type")); diff --git a/osx/scenedit/scen.graphics.cpp b/osx/scenedit/scen.graphics.cpp index 1b624670..c6470d41 100644 --- a/osx/scenedit/scen.graphics.cpp +++ b/osx/scenedit/scen.graphics.cpp @@ -58,6 +58,7 @@ extern std::shared_ptr right_sbar; extern bool left_buttons_active,right_buttons_active; extern short left_button_status[NLS]; // 0 - clear, 1 - text, 2 - title text, +10 - button extern short right_button_status[NRS]; +short mini_map_scales[3] = {12, 6, 4}; //extern unsigned char m_pic_index[200]; // TODO: What is this for? //extern btn_t buttons[]; @@ -520,14 +521,14 @@ void set_up_terrain_buttons() { rect_draw_some_item(*source_gworld, ter_from,terrain_buttons_gworld,terrain_rects[i]); } - else if(pic < 400) { + else if(pic < 960) { pic = pic % 50; ter_from.offset(28 * (pic % 10), 36 * (pic / 10)); rect_draw_some_item(terrain_gworld[scenario.ter_types[i].picture/50], ter_from,terrain_buttons_gworld,terrain_rects[i]); } else { - pic = pic % 50; + pic = (pic - 560) % 50; ter_from.left = 112 * (pic / 5); ter_from.right = ter_from.left + 28; ter_from.top = 36 * (pic % 5); @@ -813,18 +814,27 @@ void draw_terrain(){ // draw_frames(); } - if(cur_viewing_mode == 1) { - if(!small_any_drawn) { + else { tileImage(ter_draw_gworld, terrain_rect,bg[17]); frame_rect(ter_draw_gworld, terrain_rect, sf::Color::Black); - } - for(q = 0; q < (editing_town ? town->max_dim() : 48); q++) - for(r = 0; r < (editing_town ? town->max_dim() : 48); r++) { + // Width available: 64 4x4 tiles, 42 6x6 tiles, or 21 12x12 tiles -- 256 pixels + // Height available: 81 4x4 tiles, 54 6x6 tiles, or 27 12x12 tiles -- 324 pixels + short size = mini_map_scales[cur_viewing_mode - 1]; + int xMin = 0, yMin = 0, xMax = (editing_town ? town->max_dim() : 48), yMax = xMax; + if(cen_x + 5 > 256 / size) { + xMin = cen_x + 5 - (256 / size); + xMax = cen_x + 5; + } else xMax = std::min(xMax, 256 / size); + if(cen_y + 5 > 324 / size) { + yMin = cen_y + 5 - (324 / size); + yMax = cen_y + 5; + } else yMax = std::min(yMax, 324 / size); + printf("Drawing map for x = %d...%d and y = %d...%d\n", xMin, xMax, yMin, yMax); + for(q = xMin; q < xMax; q++) + for(r = yMin; r < yMax; r++) { t_to_draw = editing_town ? town->terrain(q,r) : current_terrain.terrain[q][r]; - if(!small_what_drawn[q][r] != t_to_draw || small_any_drawn) { - draw_one_tiny_terrain_spot(q,r,t_to_draw); + draw_one_tiny_terrain_spot(q-xMin,r-yMin,t_to_draw,size); small_what_drawn[q][r] = t_to_draw; - } } small_any_drawn = true; } @@ -963,9 +973,9 @@ void draw_one_terrain_spot (short i,short j,ter_num_t terrain_to_draw) { if(picture_wanted >= 1000 && spec_scen_g) { graf_pos_ref(source_gworld, source_rect) = spec_scen_g.find_graphic(picture_wanted % 1000); } - else if(picture_wanted >= 400) { + else if(picture_wanted >= 960) { source_gworld = &anim_gworld; - picture_wanted -= 400; + picture_wanted -= 960; source_rect.left = 112 * (picture_wanted / 5); source_rect.right = source_rect.left + 28; source_rect.top = 36 * (picture_wanted % 5); @@ -979,20 +989,37 @@ void draw_one_terrain_spot (short i,short j,ter_num_t terrain_to_draw) { Draw_Some_Item(*source_gworld, source_rect, ter_draw_gworld, where_draw); } -void draw_one_tiny_terrain_spot (short i,short j,ter_num_t terrain_to_draw) { +void draw_one_tiny_terrain_spot (short i,short j,ter_num_t terrain_to_draw,short size) { location where_draw; // TODO: Update for new 12x12 map graphics, rather than 4x4 - rectangle dest_rect = {0,0,4,4},from_rect = {0,0,4,4}; + rectangle dest_rect = {0,0,size,size},from_rect = {0,0,12,12}; short picture_wanted; + bool drawLargeIcon = false; sf::Texture* source_gworld; - picture_wanted = scenario.ter_types[terrain_to_draw].picture; + picture_wanted = scenario.ter_types[terrain_to_draw].map_pic; + if(picture_wanted == NO_PIC) { + drawLargeIcon = true; + picture_wanted = scenario.ter_types[terrain_to_draw].picture; + } where_draw.x = (char) i; where_draw.y = (char) j; - dest_rect.offset(8 + 4 * i,8 + 4 * j); - switch(picture_wanted) { + dest_rect.offset(8 + size * i,8 + size * j); + if(drawLargeIcon) { + if(picture_wanted >= 1000) { + graf_pos_ref(source_gworld, from_rect) = spec_scen_g.find_graphic(picture_wanted % 1000); + } else if(picture_wanted >= 960) { + source_gworld = &anim_gworld; + from_rect = calc_rect(4 * ((picture_wanted - 960) / 5),(picture_wanted - 960) % 5); + } else { + source_gworld = &terrain_gworld[picture_wanted / 50]; + picture_wanted %= 50; + from_rect = calc_rect(picture_wanted % 10, picture_wanted / 10); + } + rect_draw_some_item(*source_gworld, from_rect, ter_draw_gworld, dest_rect); + } else switch(picture_wanted) { case 0: case 1: case 73: case 72: tileImage(ter_draw_gworld, dest_rect,map_pat[0]); @@ -1006,12 +1033,16 @@ void draw_one_tiny_terrain_spot (short i,short j,ter_num_t terrain_to_draw) { tileImage(ter_draw_gworld, dest_rect,map_pat[map_pats[picture_wanted]]); } else if(picture_wanted >= 1000) { - graf_pos_ref(source_gworld, from_rect) = spec_scen_g.find_graphic(picture_wanted % 1000); - rect_draw_some_item(*source_gworld, from_rect, ter_draw_gworld, dest_rect); + sf::Texture* from_gw; + graf_pos_ref(from_gw, from_rect) = spec_scen_g.find_graphic(picture_wanted % 1000); + from_rect.right = from_rect.left + 12; + from_rect.bottom = from_rect.top + 12; + picture_wanted /= 1000; picture_wanted--; + from_rect.offset((picture_wanted / 3) * 12, (picture_wanted % 3) * 12); + rect_draw_some_item(*from_gw, from_rect, ter_draw_gworld, dest_rect); } - else if(picture_wanted >= 400) { - source_gworld = &anim_gworld; - picture_wanted -= 400; + else if(picture_wanted >= 960) { + picture_wanted -= 960; if(picture_wanted == 0) tileImage(ter_draw_gworld, dest_rect,map_pat[13]); else if(picture_wanted == 4) tileImage(ter_draw_gworld, dest_rect,map_pat[21]); else if(picture_wanted == 7) tileImage(ter_draw_gworld, dest_rect,map_pat[20]); @@ -1023,7 +1054,7 @@ void draw_one_tiny_terrain_spot (short i,short j,ter_num_t terrain_to_draw) { //source_rect.right = source_rect.left + 28; //source_rect.top = 36 * (picture_wanted % 5); //source_rect.bottom = source_rect.top + 36; - from_rect.offset((picture_wanted / 5) * 24 + 1,(picture_wanted % 5) * 6 + 1 + 156); + from_rect.offset(12 * 20, (picture_wanted - 960) * 12); rect_draw_some_item(small_ter_gworld, from_rect, ter_draw_gworld, dest_rect); //rect_draw_some_item(source_gworld, source_rect, ter_draw_gworld, dest_rect, 0, 0); } @@ -1031,7 +1062,7 @@ void draw_one_tiny_terrain_spot (short i,short j,ter_num_t terrain_to_draw) { else { //source_rect = get_template_rect(terrain_to_draw); //source_gworld = terrain_gworld[picture_wanted / 50]; - from_rect.offset((picture_wanted % 10) * 6 + 1,(picture_wanted / 10) * 6 + 1); + from_rect.offset((picture_wanted % 20) * 12,(picture_wanted / 20) * 12); rect_draw_some_item(small_ter_gworld, from_rect, ter_draw_gworld, dest_rect); } break; @@ -1180,8 +1211,8 @@ void place_location() { rect_draw_some_item(*source_gworld, source_rect,terrain_buttons_gworld,draw_rect); } - else if(picture_wanted >= 400) { - picture_wanted -= 400; + else if(picture_wanted >= 960) { + picture_wanted -= 960; source_rect.left = 112 * (picture_wanted / 5); source_rect.right = source_rect.left + 28; source_rect.top = 36 * (picture_wanted % 5); diff --git a/osx/scenedit/scen.graphics.h b/osx/scenedit/scen.graphics.h index 52ea08ac..ccbd81dc 100644 --- a/osx/scenedit/scen.graphics.h +++ b/osx/scenedit/scen.graphics.h @@ -16,7 +16,7 @@ void draw_items(); void force_tiny_redraw(); void redraw_selected_ter(); void draw_one_terrain_spot (short i,short j,ter_num_t terrain_to_draw); -void draw_one_tiny_terrain_spot (short i,short j,ter_num_t terrain_to_draw); +void draw_one_tiny_terrain_spot (short i,short j,ter_num_t terrain_to_draw,short size); void Draw_Some_Item(sf::Texture& src_gworld,rectangle src_rect,sf::RenderTarget& targ_gworld,location target,sf::BlendMode mode = sf::BlendNone); rectangle get_template_rect (unsigned short type_wanted); void draw_frames(); diff --git a/osx/scenedit/scen.townout.cpp b/osx/scenedit/scen.townout.cpp index d1a8f328..51dae88c 100644 --- a/osx/scenedit/scen.townout.cpp +++ b/osx/scenedit/scen.townout.cpp @@ -352,7 +352,7 @@ void edit_sign(short which_sign,short picture) { sign_dlg["cancel"].attachClickHandler(std::bind(&cDialog::toast, &sign_dlg, false)); sign_dlg["okay"].attachClickHandler(std::bind(edit_sign_event_filter, _1, which_sign)); cPict& icon = dynamic_cast(sign_dlg["pic"]); - if(picture >= 400 && picture < 1000) + if(picture >= 960 && picture < 1000) icon.setPict(picture, PIC_TER_ANIM); else if(picture >= 2000) icon.setPict(picture - 2000, PIC_CUSTOM_TER_ANIM); diff --git a/osx/tools/fileio.cpp b/osx/tools/fileio.cpp index 4cdf2169..d4d779d7 100644 --- a/osx/tools/fileio.cpp +++ b/osx/tools/fileio.cpp @@ -816,7 +816,7 @@ void load_spec_graphics() { talkfaces_gworld.loadFromImage(*ResMgr::get("talkportraits")); pc_gworld.loadFromImage(*ResMgr::get("pcs")); vehicle_gworld.loadFromImage(*ResMgr::get("vehicle")); - small_ter_gworld.loadFromImage(*ResMgr::get("mapOLD")); // TODO: Should use the new map graphics instead + small_ter_gworld.loadFromImage(*ResMgr::get("termap")); // TODO: Scenario icons ... } diff --git a/osx/tools/graphtool.cpp b/osx/tools/graphtool.cpp index fbadb06e..11209eb4 100644 --- a/osx/tools/graphtool.cpp +++ b/osx/tools/graphtool.cpp @@ -100,16 +100,16 @@ void init_graph_tool(){ bg_rects[1].bottom -= 32; bg_rects[18].right -= 32; bg_rects[18].top -= 32; - map_pat_rects[7].left -= 32; - map_pat_rects[7].top -= 32; + map_pat_rects[7].left += 32; + map_pat_rects[7].top += 32; tmp_rect.offset(0, 64); map_pat_rects[8] = map_pat_rects[23] = map_pat_rects[26] = tmp_rect; map_pat_rects[8].right -= 32; map_pat_rects[8].bottom -= 32; - map_pat_rects[23].left -= 32; + map_pat_rects[23].left += 32; map_pat_rects[23].right -= 16; map_pat_rects[23].bottom -= 32; - map_pat_rects[26].left -= 32 + 16; + map_pat_rects[26].left += 32 + 16; map_pat_rects[26].bottom -= 32; tmp_rect.offset(0, 64); bg_rects[7] = tmp_rect; diff --git a/osx/tools/graphtool.h b/osx/tools/graphtool.h index cadd827f..ba4f1f11 100644 --- a/osx/tools/graphtool.h +++ b/osx/tools/graphtool.h @@ -18,7 +18,7 @@ namespace fs = boost::filesystem; #define LINES_IN_TEXT_WIN 11 -#define NUM_TER_SHEETS 7 +#define NUM_TER_SHEETS 19 #define NUM_MONST_SHEETS 11 struct m_pic_index_t {