diff --git a/rsrc/graphics.exd/mac/cursors/E.gif b/rsrc/cursors/E.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/E.gif rename to rsrc/cursors/E.gif diff --git a/rsrc/graphics.exd/mac/cursors/N.gif b/rsrc/cursors/N.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/N.gif rename to rsrc/cursors/N.gif diff --git a/rsrc/graphics.exd/mac/cursors/NE.gif b/rsrc/cursors/NE.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/NE.gif rename to rsrc/cursors/NE.gif diff --git a/rsrc/graphics.exd/mac/cursors/NW.gif b/rsrc/cursors/NW.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/NW.gif rename to rsrc/cursors/NW.gif diff --git a/rsrc/graphics.exd/mac/cursors/READ_BEFORE_EDITING.txt b/rsrc/cursors/READ_BEFORE_EDITING.txt similarity index 100% rename from rsrc/graphics.exd/mac/cursors/READ_BEFORE_EDITING.txt rename to rsrc/cursors/READ_BEFORE_EDITING.txt diff --git a/rsrc/graphics.exd/mac/cursors/S.gif b/rsrc/cursors/S.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/S.gif rename to rsrc/cursors/S.gif diff --git a/rsrc/graphics.exd/mac/cursors/SE.gif b/rsrc/cursors/SE.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/SE.gif rename to rsrc/cursors/SE.gif diff --git a/rsrc/graphics.exd/mac/cursors/SW.gif b/rsrc/cursors/SW.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/SW.gif rename to rsrc/cursors/SW.gif diff --git a/rsrc/graphics.exd/mac/cursors/W.gif b/rsrc/cursors/W.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/W.gif rename to rsrc/cursors/W.gif diff --git a/rsrc/graphics.exd/mac/cursors/boot.gif b/rsrc/cursors/boot.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/boot.gif rename to rsrc/cursors/boot.gif diff --git a/rsrc/graphics.exd/mac/cursors/bottomright.gif b/rsrc/cursors/bottomright.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/bottomright.gif rename to rsrc/cursors/bottomright.gif diff --git a/rsrc/graphics.exd/mac/cursors/brush.gif b/rsrc/cursors/brush.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/brush.gif rename to rsrc/cursors/brush.gif diff --git a/rsrc/graphics.exd/mac/cursors/drop.gif b/rsrc/cursors/drop.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/drop.gif rename to rsrc/cursors/drop.gif diff --git a/rsrc/graphics.exd/mac/cursors/eraser.gif b/rsrc/cursors/eraser.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/eraser.gif rename to rsrc/cursors/eraser.gif diff --git a/rsrc/graphics.exd/mac/cursors/eyedropper.gif b/rsrc/cursors/eyedropper.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/eyedropper.gif rename to rsrc/cursors/eyedropper.gif diff --git a/rsrc/graphics.exd/mac/cursors/hand.gif b/rsrc/cursors/hand.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/hand.gif rename to rsrc/cursors/hand.gif diff --git a/rsrc/graphics.exd/mac/cursors/key.gif b/rsrc/cursors/key.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/key.gif rename to rsrc/cursors/key.gif diff --git a/rsrc/graphics.exd/mac/cursors/look.gif b/rsrc/cursors/look.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/look.gif rename to rsrc/cursors/look.gif diff --git a/rsrc/graphics.exd/mac/cursors/spraycan.gif b/rsrc/cursors/spraycan.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/spraycan.gif rename to rsrc/cursors/spraycan.gif diff --git a/rsrc/graphics.exd/mac/cursors/sword.gif b/rsrc/cursors/sword.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/sword.gif rename to rsrc/cursors/sword.gif diff --git a/rsrc/graphics.exd/mac/cursors/talk.gif b/rsrc/cursors/talk.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/talk.gif rename to rsrc/cursors/talk.gif diff --git a/rsrc/graphics.exd/mac/cursors/target.gif b/rsrc/cursors/target.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/target.gif rename to rsrc/cursors/target.gif diff --git a/rsrc/graphics.exd/mac/cursors/topleft.gif b/rsrc/cursors/topleft.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/topleft.gif rename to rsrc/cursors/topleft.gif diff --git a/rsrc/graphics.exd/mac/cursors/wait.gif b/rsrc/cursors/wait.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/wait.gif rename to rsrc/cursors/wait.gif diff --git a/rsrc/graphics.exd/mac/cursors/wand.gif b/rsrc/cursors/wand.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/wand.gif rename to rsrc/cursors/wand.gif diff --git a/rsrc/graphics.exd/mac/cursors/watch.gif b/rsrc/cursors/watch.gif similarity index 100% rename from rsrc/graphics.exd/mac/cursors/watch.gif rename to rsrc/cursors/watch.gif diff --git a/rsrc/graphics.exd/mac/CREDITS.md b/rsrc/graphics/CREDITS.md similarity index 100% rename from rsrc/graphics.exd/mac/CREDITS.md rename to rsrc/graphics/CREDITS.md diff --git a/rsrc/graphics.exd/mac/actionhelp.png b/rsrc/graphics/actionhelp.png similarity index 100% rename from rsrc/graphics.exd/mac/actionhelp.png rename to rsrc/graphics/actionhelp.png diff --git a/rsrc/graphics.exd/mac/bigscenpics.png b/rsrc/graphics/bigscenpics.png similarity index 100% rename from rsrc/graphics.exd/mac/bigscenpics.png rename to rsrc/graphics/bigscenpics.png diff --git a/rsrc/graphics.exd/mac/booms.png b/rsrc/graphics/booms.png similarity index 100% rename from rsrc/graphics.exd/mac/booms.png rename to rsrc/graphics/booms.png diff --git a/rsrc/graphics.exd/mac/buttons.png b/rsrc/graphics/buttons.png similarity index 100% rename from rsrc/graphics.exd/mac/buttons.png rename to rsrc/graphics/buttons.png diff --git a/rsrc/graphics.exd/mac/bwpats.png b/rsrc/graphics/bwpats.png similarity index 100% rename from rsrc/graphics.exd/mac/bwpats.png rename to rsrc/graphics/bwpats.png diff --git a/rsrc/graphics.exd/mac/dlgbtnred.png b/rsrc/graphics/dlgbtnred.png similarity index 100% rename from rsrc/graphics.exd/mac/dlgbtnred.png rename to rsrc/graphics/dlgbtnred.png diff --git a/rsrc/graphics.exd/mac/dlogbtnhelp.png b/rsrc/graphics/dlogbtnhelp.png similarity index 100% rename from rsrc/graphics.exd/mac/dlogbtnhelp.png rename to rsrc/graphics/dlogbtnhelp.png diff --git a/rsrc/graphics.exd/mac/dlogbtnled.png b/rsrc/graphics/dlogbtnled.png similarity index 100% rename from rsrc/graphics.exd/mac/dlogbtnled.png rename to rsrc/graphics/dlogbtnled.png diff --git a/rsrc/graphics.exd/mac/dlogbtnlg.png b/rsrc/graphics/dlogbtnlg.png similarity index 100% rename from rsrc/graphics.exd/mac/dlogbtnlg.png rename to rsrc/graphics/dlogbtnlg.png diff --git a/rsrc/graphics.exd/mac/dlogbtnmed.png b/rsrc/graphics/dlogbtnmed.png similarity index 100% rename from rsrc/graphics.exd/mac/dlogbtnmed.png rename to rsrc/graphics/dlogbtnmed.png diff --git a/rsrc/graphics.exd/mac/dlogbtnsm.png b/rsrc/graphics/dlogbtnsm.png similarity index 100% rename from rsrc/graphics.exd/mac/dlogbtnsm.png rename to rsrc/graphics/dlogbtnsm.png diff --git a/rsrc/graphics.exd/mac/dlogbtntall.png b/rsrc/graphics/dlogbtntall.png similarity index 100% rename from rsrc/graphics.exd/mac/dlogbtntall.png rename to rsrc/graphics/dlogbtntall.png diff --git a/rsrc/graphics.exd/mac/dlogpics.png b/rsrc/graphics/dlogpics.png similarity index 100% rename from rsrc/graphics.exd/mac/dlogpics.png rename to rsrc/graphics/dlogpics.png diff --git a/rsrc/graphics.exd/mac/dlogscroll.png b/rsrc/graphics/dlogscroll.png similarity index 100% rename from rsrc/graphics.exd/mac/dlogscroll.png rename to rsrc/graphics/dlogscroll.png diff --git a/rsrc/graphics.exd/mac/edbuttons.png b/rsrc/graphics/edbuttons.png similarity index 100% rename from rsrc/graphics.exd/mac/edbuttons.png rename to rsrc/graphics/edbuttons.png diff --git a/rsrc/graphics.exd/mac/edsplash.png b/rsrc/graphics/edsplash.png similarity index 100% rename from rsrc/graphics.exd/mac/edsplash.png rename to rsrc/graphics/edsplash.png diff --git a/rsrc/graphics.exd/mac/fields.png b/rsrc/graphics/fields.png similarity index 100% rename from rsrc/graphics.exd/mac/fields.png rename to rsrc/graphics/fields.png diff --git a/rsrc/graphics.exd/mac/fighthelp.png b/rsrc/graphics/fighthelp.png similarity index 100% rename from rsrc/graphics.exd/mac/fighthelp.png rename to rsrc/graphics/fighthelp.png diff --git a/rsrc/graphics.exd/mac/invenbtns.png b/rsrc/graphics/invenbtns.png similarity index 100% rename from rsrc/graphics.exd/mac/invenbtns.png rename to rsrc/graphics/invenbtns.png diff --git a/rsrc/graphics.exd/mac/invenhelp.png b/rsrc/graphics/invenhelp.png similarity index 100% rename from rsrc/graphics.exd/mac/invenhelp.png rename to rsrc/graphics/invenhelp.png diff --git a/rsrc/graphics.exd/mac/inventory.png b/rsrc/graphics/inventory.png similarity index 100% rename from rsrc/graphics.exd/mac/inventory.png rename to rsrc/graphics/inventory.png diff --git a/rsrc/graphics.exd/mac/missiles.png b/rsrc/graphics/missiles.png similarity index 100% rename from rsrc/graphics.exd/mac/missiles.png rename to rsrc/graphics/missiles.png diff --git a/rsrc/graphics.exd/mac/monst1.png b/rsrc/graphics/monst1.png similarity index 100% rename from rsrc/graphics.exd/mac/monst1.png rename to rsrc/graphics/monst1.png diff --git a/rsrc/graphics.exd/mac/monst10.png b/rsrc/graphics/monst10.png similarity index 100% rename from rsrc/graphics.exd/mac/monst10.png rename to rsrc/graphics/monst10.png diff --git a/rsrc/graphics.exd/mac/monst11.png b/rsrc/graphics/monst11.png similarity index 100% rename from rsrc/graphics.exd/mac/monst11.png rename to rsrc/graphics/monst11.png diff --git a/rsrc/graphics.exd/mac/monst2.png b/rsrc/graphics/monst2.png similarity index 100% rename from rsrc/graphics.exd/mac/monst2.png rename to rsrc/graphics/monst2.png diff --git a/rsrc/graphics.exd/mac/monst3.png b/rsrc/graphics/monst3.png similarity index 100% rename from rsrc/graphics.exd/mac/monst3.png rename to rsrc/graphics/monst3.png diff --git a/rsrc/graphics.exd/mac/monst4.png b/rsrc/graphics/monst4.png similarity index 100% rename from rsrc/graphics.exd/mac/monst4.png rename to rsrc/graphics/monst4.png diff --git a/rsrc/graphics.exd/mac/monst5.png b/rsrc/graphics/monst5.png similarity index 100% rename from rsrc/graphics.exd/mac/monst5.png rename to rsrc/graphics/monst5.png diff --git a/rsrc/graphics.exd/mac/monst6.png b/rsrc/graphics/monst6.png similarity index 100% rename from rsrc/graphics.exd/mac/monst6.png rename to rsrc/graphics/monst6.png diff --git a/rsrc/graphics.exd/mac/monst7.png b/rsrc/graphics/monst7.png similarity index 100% rename from rsrc/graphics.exd/mac/monst7.png rename to rsrc/graphics/monst7.png diff --git a/rsrc/graphics.exd/mac/monst8.png b/rsrc/graphics/monst8.png similarity index 100% rename from rsrc/graphics.exd/mac/monst8.png rename to rsrc/graphics/monst8.png diff --git a/rsrc/graphics.exd/mac/monst9.png b/rsrc/graphics/monst9.png similarity index 100% rename from rsrc/graphics.exd/mac/monst9.png rename to rsrc/graphics/monst9.png diff --git a/rsrc/graphics.exd/mac/objects.png b/rsrc/graphics/objects.png similarity index 100% rename from rsrc/graphics.exd/mac/objects.png rename to rsrc/graphics/objects.png diff --git a/rsrc/graphics.exd/mac/outhelp.png b/rsrc/graphics/outhelp.png similarity index 100% rename from rsrc/graphics.exd/mac/outhelp.png rename to rsrc/graphics/outhelp.png diff --git a/rsrc/graphics.exd/mac/pcedbuttons.png b/rsrc/graphics/pcedbuttons.png similarity index 100% rename from rsrc/graphics.exd/mac/pcedbuttons.png rename to rsrc/graphics/pcedbuttons.png diff --git a/rsrc/graphics.exd/mac/pcedtitle.png b/rsrc/graphics/pcedtitle.png similarity index 100% rename from rsrc/graphics.exd/mac/pcedtitle.png rename to rsrc/graphics/pcedtitle.png diff --git a/rsrc/graphics.exd/mac/pcs.png b/rsrc/graphics/pcs.png similarity index 100% rename from rsrc/graphics.exd/mac/pcs.png rename to rsrc/graphics/pcs.png diff --git a/rsrc/graphics.exd/mac/pixpats.png b/rsrc/graphics/pixpats.png similarity index 100% rename from rsrc/graphics.exd/mac/pixpats.png rename to rsrc/graphics/pixpats.png diff --git a/rsrc/graphics.exd/mac/scenpics.png b/rsrc/graphics/scenpics.png similarity index 100% rename from rsrc/graphics.exd/mac/scenpics.png rename to rsrc/graphics/scenpics.png diff --git a/rsrc/graphics.exd/mac/spidlogo.png b/rsrc/graphics/spidlogo.png similarity index 100% rename from rsrc/graphics.exd/mac/spidlogo.png rename to rsrc/graphics/spidlogo.png diff --git a/rsrc/graphics.exd/mac/startanim.png b/rsrc/graphics/startanim.png similarity index 100% rename from rsrc/graphics.exd/mac/startanim.png rename to rsrc/graphics/startanim.png diff --git a/rsrc/graphics.exd/mac/startbut.png b/rsrc/graphics/startbut.png similarity index 100% rename from rsrc/graphics.exd/mac/startbut.png rename to rsrc/graphics/startbut.png diff --git a/rsrc/graphics.exd/mac/startsplash.png b/rsrc/graphics/startsplash.png similarity index 100% rename from rsrc/graphics.exd/mac/startsplash.png rename to rsrc/graphics/startsplash.png diff --git a/rsrc/graphics.exd/mac/startup.png b/rsrc/graphics/startup.png similarity index 100% rename from rsrc/graphics.exd/mac/startup.png rename to rsrc/graphics/startup.png diff --git a/rsrc/graphics.exd/mac/statarea.png b/rsrc/graphics/statarea.png similarity index 100% rename from rsrc/graphics.exd/mac/statarea.png rename to rsrc/graphics/statarea.png diff --git a/rsrc/graphics.exd/mac/stathelp.png b/rsrc/graphics/stathelp.png similarity index 100% rename from rsrc/graphics.exd/mac/stathelp.png rename to rsrc/graphics/stathelp.png diff --git a/rsrc/graphics.exd/mac/staticons.png b/rsrc/graphics/staticons.png similarity index 100% rename from rsrc/graphics.exd/mac/staticons.png rename to rsrc/graphics/staticons.png diff --git a/rsrc/graphics.exd/mac/talkportraits.png b/rsrc/graphics/talkportraits.png similarity index 100% rename from rsrc/graphics.exd/mac/talkportraits.png rename to rsrc/graphics/talkportraits.png diff --git a/rsrc/graphics.exd/mac/ter1.png b/rsrc/graphics/ter1.png similarity index 100% rename from rsrc/graphics.exd/mac/ter1.png rename to rsrc/graphics/ter1.png diff --git a/rsrc/graphics.exd/mac/ter10.png b/rsrc/graphics/ter10.png similarity index 100% rename from rsrc/graphics.exd/mac/ter10.png rename to rsrc/graphics/ter10.png diff --git a/rsrc/graphics.exd/mac/ter11.png b/rsrc/graphics/ter11.png similarity index 100% rename from rsrc/graphics.exd/mac/ter11.png rename to rsrc/graphics/ter11.png diff --git a/rsrc/graphics.exd/mac/ter12.png b/rsrc/graphics/ter12.png similarity index 100% rename from rsrc/graphics.exd/mac/ter12.png rename to rsrc/graphics/ter12.png diff --git a/rsrc/graphics.exd/mac/ter19.png b/rsrc/graphics/ter19.png similarity index 100% rename from rsrc/graphics.exd/mac/ter19.png rename to rsrc/graphics/ter19.png diff --git a/rsrc/graphics.exd/mac/ter2.png b/rsrc/graphics/ter2.png similarity index 100% rename from rsrc/graphics.exd/mac/ter2.png rename to rsrc/graphics/ter2.png diff --git a/rsrc/graphics.exd/mac/ter3.png b/rsrc/graphics/ter3.png similarity index 100% rename from rsrc/graphics.exd/mac/ter3.png rename to rsrc/graphics/ter3.png diff --git a/rsrc/graphics.exd/mac/ter4.png b/rsrc/graphics/ter4.png similarity index 100% rename from rsrc/graphics.exd/mac/ter4.png rename to rsrc/graphics/ter4.png diff --git a/rsrc/graphics.exd/mac/ter5.png b/rsrc/graphics/ter5.png similarity index 100% rename from rsrc/graphics.exd/mac/ter5.png rename to rsrc/graphics/ter5.png diff --git a/rsrc/graphics.exd/mac/ter6.png b/rsrc/graphics/ter6.png similarity index 100% rename from rsrc/graphics.exd/mac/ter6.png rename to rsrc/graphics/ter6.png diff --git a/rsrc/graphics.exd/mac/ter7.png b/rsrc/graphics/ter7.png similarity index 100% rename from rsrc/graphics.exd/mac/ter7.png rename to rsrc/graphics/ter7.png diff --git a/rsrc/graphics.exd/mac/ter8.png b/rsrc/graphics/ter8.png similarity index 100% rename from rsrc/graphics.exd/mac/ter8.png rename to rsrc/graphics/ter8.png diff --git a/rsrc/graphics.exd/mac/ter9.png b/rsrc/graphics/ter9.png similarity index 100% rename from rsrc/graphics.exd/mac/ter9.png rename to rsrc/graphics/ter9.png diff --git a/rsrc/graphics.exd/mac/teranim.png b/rsrc/graphics/teranim.png similarity index 100% rename from rsrc/graphics.exd/mac/teranim.png rename to rsrc/graphics/teranim.png diff --git a/rsrc/graphics.exd/mac/termap.png b/rsrc/graphics/termap.png similarity index 100% rename from rsrc/graphics.exd/mac/termap.png rename to rsrc/graphics/termap.png diff --git a/rsrc/graphics.exd/mac/terscreen.png b/rsrc/graphics/terscreen.png similarity index 100% rename from rsrc/graphics.exd/mac/terscreen.png rename to rsrc/graphics/terscreen.png diff --git a/rsrc/graphics.exd/mac/textbar.png b/rsrc/graphics/textbar.png similarity index 100% rename from rsrc/graphics.exd/mac/textbar.png rename to rsrc/graphics/textbar.png diff --git a/rsrc/graphics.exd/mac/tinyobj.png b/rsrc/graphics/tinyobj.png similarity index 100% rename from rsrc/graphics.exd/mac/tinyobj.png rename to rsrc/graphics/tinyobj.png diff --git a/rsrc/graphics.exd/mac/townhelp.png b/rsrc/graphics/townhelp.png similarity index 100% rename from rsrc/graphics.exd/mac/townhelp.png rename to rsrc/graphics/townhelp.png diff --git a/rsrc/graphics.exd/mac/transcript.png b/rsrc/graphics/transcript.png similarity index 100% rename from rsrc/graphics.exd/mac/transcript.png rename to rsrc/graphics/transcript.png diff --git a/rsrc/graphics.exd/mac/trim.png b/rsrc/graphics/trim.png similarity index 100% rename from rsrc/graphics.exd/mac/trim.png rename to rsrc/graphics/trim.png diff --git a/rsrc/graphics.exd/mac/vehicle.png b/rsrc/graphics/vehicle.png similarity index 100% rename from rsrc/graphics.exd/mac/vehicle.png rename to rsrc/graphics/vehicle.png diff --git a/rsrc/graphics.exd/win/APPIC.BMP b/rsrc/legacy/win-graphics/APPIC.BMP similarity index 100% rename from rsrc/graphics.exd/win/APPIC.BMP rename to rsrc/legacy/win-graphics/APPIC.BMP diff --git a/rsrc/graphics.exd/win/BIGSCEN.BMP b/rsrc/legacy/win-graphics/BIGSCEN.BMP similarity index 100% rename from rsrc/graphics.exd/win/BIGSCEN.BMP rename to rsrc/legacy/win-graphics/BIGSCEN.BMP diff --git a/rsrc/graphics.exd/win/BLEDTITL.BMP b/rsrc/legacy/win-graphics/BLEDTITL.BMP similarity index 100% rename from rsrc/graphics.exd/win/BLEDTITL.BMP rename to rsrc/legacy/win-graphics/BLEDTITL.BMP diff --git a/rsrc/graphics.exd/win/BUTTONS.BMP b/rsrc/legacy/win-graphics/BUTTONS.BMP similarity index 100% rename from rsrc/graphics.exd/win/BUTTONS.BMP rename to rsrc/legacy/win-graphics/BUTTONS.BMP diff --git a/rsrc/graphics.exd/win/DLOGBTNS.BMP b/rsrc/legacy/win-graphics/DLOGBTNS.BMP similarity index 100% rename from rsrc/graphics.exd/win/DLOGBTNS.BMP rename to rsrc/legacy/win-graphics/DLOGBTNS.BMP diff --git a/rsrc/graphics.exd/win/DLOGPICS.BMP b/rsrc/legacy/win-graphics/DLOGPICS.BMP similarity index 100% rename from rsrc/graphics.exd/win/DLOGPICS.BMP rename to rsrc/legacy/win-graphics/DLOGPICS.BMP diff --git a/rsrc/graphics.exd/win/EDBTNS.BMP b/rsrc/legacy/win-graphics/EDBTNS.BMP similarity index 100% rename from rsrc/graphics.exd/win/EDBTNS.BMP rename to rsrc/legacy/win-graphics/EDBTNS.BMP diff --git a/rsrc/graphics.exd/win/EDSTART.BMP b/rsrc/legacy/win-graphics/EDSTART.BMP similarity index 100% rename from rsrc/graphics.exd/win/EDSTART.BMP rename to rsrc/legacy/win-graphics/EDSTART.BMP diff --git a/rsrc/graphics.exd/win/FIELDS.BMP b/rsrc/legacy/win-graphics/FIELDS.BMP similarity index 100% rename from rsrc/graphics.exd/win/FIELDS.BMP rename to rsrc/legacy/win-graphics/FIELDS.BMP diff --git a/rsrc/graphics.exd/win/FIELDS_D.bmp b/rsrc/legacy/win-graphics/FIELDS_D.bmp similarity index 100% rename from rsrc/graphics.exd/win/FIELDS_D.bmp rename to rsrc/legacy/win-graphics/FIELDS_D.bmp diff --git a/rsrc/graphics.exd/win/HELPPICS.BMP b/rsrc/legacy/win-graphics/HELPPICS.BMP similarity index 100% rename from rsrc/graphics.exd/win/HELPPICS.BMP rename to rsrc/legacy/win-graphics/HELPPICS.BMP diff --git a/rsrc/graphics.exd/win/MISSILES.BMP b/rsrc/legacy/win-graphics/MISSILES.BMP similarity index 100% rename from rsrc/graphics.exd/win/MISSILES.BMP rename to rsrc/legacy/win-graphics/MISSILES.BMP diff --git a/rsrc/graphics.exd/win/MIXED.BMP b/rsrc/legacy/win-graphics/MIXED.BMP similarity index 100% rename from rsrc/graphics.exd/win/MIXED.BMP rename to rsrc/legacy/win-graphics/MIXED.BMP diff --git a/rsrc/graphics.exd/win/MIXED_D.bmp b/rsrc/legacy/win-graphics/MIXED_D.bmp similarity index 100% rename from rsrc/graphics.exd/win/MIXED_D.bmp rename to rsrc/legacy/win-graphics/MIXED_D.bmp diff --git a/rsrc/graphics.exd/win/MONST1.BMP b/rsrc/legacy/win-graphics/MONST1.BMP similarity index 100% rename from rsrc/graphics.exd/win/MONST1.BMP rename to rsrc/legacy/win-graphics/MONST1.BMP diff --git a/rsrc/graphics.exd/win/MONST10.BMP b/rsrc/legacy/win-graphics/MONST10.BMP similarity index 100% rename from rsrc/graphics.exd/win/MONST10.BMP rename to rsrc/legacy/win-graphics/MONST10.BMP diff --git a/rsrc/graphics.exd/win/MONST2.BMP b/rsrc/legacy/win-graphics/MONST2.BMP similarity index 100% rename from rsrc/graphics.exd/win/MONST2.BMP rename to rsrc/legacy/win-graphics/MONST2.BMP diff --git a/rsrc/graphics.exd/win/MONST3.BMP b/rsrc/legacy/win-graphics/MONST3.BMP similarity index 100% rename from rsrc/graphics.exd/win/MONST3.BMP rename to rsrc/legacy/win-graphics/MONST3.BMP diff --git a/rsrc/graphics.exd/win/MONST4.BMP b/rsrc/legacy/win-graphics/MONST4.BMP similarity index 100% rename from rsrc/graphics.exd/win/MONST4.BMP rename to rsrc/legacy/win-graphics/MONST4.BMP diff --git a/rsrc/graphics.exd/win/MONST5.BMP b/rsrc/legacy/win-graphics/MONST5.BMP similarity index 100% rename from rsrc/graphics.exd/win/MONST5.BMP rename to rsrc/legacy/win-graphics/MONST5.BMP diff --git a/rsrc/graphics.exd/win/MONST6.BMP b/rsrc/legacy/win-graphics/MONST6.BMP similarity index 100% rename from rsrc/graphics.exd/win/MONST6.BMP rename to rsrc/legacy/win-graphics/MONST6.BMP diff --git a/rsrc/graphics.exd/win/MONST7.BMP b/rsrc/legacy/win-graphics/MONST7.BMP similarity index 100% rename from rsrc/graphics.exd/win/MONST7.BMP rename to rsrc/legacy/win-graphics/MONST7.BMP diff --git a/rsrc/graphics.exd/win/MONST8.BMP b/rsrc/legacy/win-graphics/MONST8.BMP similarity index 100% rename from rsrc/graphics.exd/win/MONST8.BMP rename to rsrc/legacy/win-graphics/MONST8.BMP diff --git a/rsrc/graphics.exd/win/MONST9.BMP b/rsrc/legacy/win-graphics/MONST9.BMP similarity index 100% rename from rsrc/graphics.exd/win/MONST9.BMP rename to rsrc/legacy/win-graphics/MONST9.BMP diff --git a/rsrc/graphics.exd/win/OBJECTS.BMP b/rsrc/legacy/win-graphics/OBJECTS.BMP similarity index 100% rename from rsrc/graphics.exd/win/OBJECTS.BMP rename to rsrc/legacy/win-graphics/OBJECTS.BMP diff --git a/rsrc/graphics.exd/win/PCEDBTNS.BMP b/rsrc/legacy/win-graphics/PCEDBTNS.BMP similarity index 100% rename from rsrc/graphics.exd/win/PCEDBTNS.BMP rename to rsrc/legacy/win-graphics/PCEDBTNS.BMP diff --git a/rsrc/graphics.exd/win/PCS.BMP b/rsrc/legacy/win-graphics/PCS.BMP similarity index 100% rename from rsrc/graphics.exd/win/PCS.BMP rename to rsrc/legacy/win-graphics/PCS.BMP diff --git a/rsrc/graphics.exd/win/SCENPICS.BMP b/rsrc/legacy/win-graphics/SCENPICS.BMP similarity index 100% rename from rsrc/graphics.exd/win/SCENPICS.BMP rename to rsrc/legacy/win-graphics/SCENPICS.BMP diff --git a/rsrc/graphics.exd/win/SPIDLOGO.BMP b/rsrc/legacy/win-graphics/SPIDLOGO.BMP similarity index 100% rename from rsrc/graphics.exd/win/SPIDLOGO.BMP rename to rsrc/legacy/win-graphics/SPIDLOGO.BMP diff --git a/rsrc/graphics.exd/win/STANIM.BMP b/rsrc/legacy/win-graphics/STANIM.BMP similarity index 100% rename from rsrc/graphics.exd/win/STANIM.BMP rename to rsrc/legacy/win-graphics/STANIM.BMP diff --git a/rsrc/graphics.exd/win/START.BMP b/rsrc/legacy/win-graphics/START.BMP similarity index 100% rename from rsrc/graphics.exd/win/START.BMP rename to rsrc/legacy/win-graphics/START.BMP diff --git a/rsrc/graphics.exd/win/STARTBUT.BMP b/rsrc/legacy/win-graphics/STARTBUT.BMP similarity index 100% rename from rsrc/graphics.exd/win/STARTBUT.BMP rename to rsrc/legacy/win-graphics/STARTBUT.BMP diff --git a/rsrc/graphics.exd/win/STARTUP.BMP b/rsrc/legacy/win-graphics/STARTUP.BMP similarity index 100% rename from rsrc/graphics.exd/win/STARTUP.BMP rename to rsrc/legacy/win-graphics/STARTUP.BMP diff --git a/rsrc/graphics.exd/win/STATAREA.BMP b/rsrc/legacy/win-graphics/STATAREA.BMP similarity index 100% rename from rsrc/graphics.exd/win/STATAREA.BMP rename to rsrc/legacy/win-graphics/STATAREA.BMP diff --git a/rsrc/graphics.exd/win/STSCICON.BMP b/rsrc/legacy/win-graphics/STSCICON.BMP similarity index 100% rename from rsrc/graphics.exd/win/STSCICON.BMP rename to rsrc/legacy/win-graphics/STSCICON.BMP diff --git a/rsrc/graphics.exd/win/TALKPORT.BMP b/rsrc/legacy/win-graphics/TALKPORT.BMP similarity index 100% rename from rsrc/graphics.exd/win/TALKPORT.BMP rename to rsrc/legacy/win-graphics/TALKPORT.BMP diff --git a/rsrc/graphics.exd/win/TER1.BMP b/rsrc/legacy/win-graphics/TER1.BMP similarity index 100% rename from rsrc/graphics.exd/win/TER1.BMP rename to rsrc/legacy/win-graphics/TER1.BMP diff --git a/rsrc/graphics.exd/win/TER1_D.BMP b/rsrc/legacy/win-graphics/TER1_D.BMP similarity index 100% rename from rsrc/graphics.exd/win/TER1_D.BMP rename to rsrc/legacy/win-graphics/TER1_D.BMP diff --git a/rsrc/graphics.exd/win/TER2.BMP b/rsrc/legacy/win-graphics/TER2.BMP similarity index 100% rename from rsrc/graphics.exd/win/TER2.BMP rename to rsrc/legacy/win-graphics/TER2.BMP diff --git a/rsrc/graphics.exd/win/TER2_D.BMP b/rsrc/legacy/win-graphics/TER2_D.BMP similarity index 100% rename from rsrc/graphics.exd/win/TER2_D.BMP rename to rsrc/legacy/win-graphics/TER2_D.BMP diff --git a/rsrc/graphics.exd/win/TER3.BMP b/rsrc/legacy/win-graphics/TER3.BMP similarity index 100% rename from rsrc/graphics.exd/win/TER3.BMP rename to rsrc/legacy/win-graphics/TER3.BMP diff --git a/rsrc/graphics.exd/win/TER3_D.BMP b/rsrc/legacy/win-graphics/TER3_D.BMP similarity index 100% rename from rsrc/graphics.exd/win/TER3_D.BMP rename to rsrc/legacy/win-graphics/TER3_D.BMP diff --git a/rsrc/graphics.exd/win/TER4.BMP b/rsrc/legacy/win-graphics/TER4.BMP similarity index 100% rename from rsrc/graphics.exd/win/TER4.BMP rename to rsrc/legacy/win-graphics/TER4.BMP diff --git a/rsrc/graphics.exd/win/TER4_D.BMP b/rsrc/legacy/win-graphics/TER4_D.BMP similarity index 100% rename from rsrc/graphics.exd/win/TER4_D.BMP rename to rsrc/legacy/win-graphics/TER4_D.BMP diff --git a/rsrc/graphics.exd/win/TER5.BMP b/rsrc/legacy/win-graphics/TER5.BMP similarity index 100% rename from rsrc/graphics.exd/win/TER5.BMP rename to rsrc/legacy/win-graphics/TER5.BMP diff --git a/rsrc/graphics.exd/win/TER5_D.BMP b/rsrc/legacy/win-graphics/TER5_D.BMP similarity index 100% rename from rsrc/graphics.exd/win/TER5_D.BMP rename to rsrc/legacy/win-graphics/TER5_D.BMP diff --git a/rsrc/graphics.exd/win/TER6.BMP b/rsrc/legacy/win-graphics/TER6.BMP similarity index 100% rename from rsrc/graphics.exd/win/TER6.BMP rename to rsrc/legacy/win-graphics/TER6.BMP diff --git a/rsrc/graphics.exd/win/TER6_D.bmp b/rsrc/legacy/win-graphics/TER6_D.bmp similarity index 100% rename from rsrc/graphics.exd/win/TER6_D.bmp rename to rsrc/legacy/win-graphics/TER6_D.bmp diff --git a/rsrc/graphics.exd/win/TER7.BMP b/rsrc/legacy/win-graphics/TER7.BMP similarity index 100% rename from rsrc/graphics.exd/win/TER7.BMP rename to rsrc/legacy/win-graphics/TER7.BMP diff --git a/rsrc/graphics.exd/win/TER7_D.bmp b/rsrc/legacy/win-graphics/TER7_D.bmp similarity index 100% rename from rsrc/graphics.exd/win/TER7_D.bmp rename to rsrc/legacy/win-graphics/TER7_D.bmp diff --git a/rsrc/graphics.exd/win/TERANIM.BMP b/rsrc/legacy/win-graphics/TERANIM.BMP similarity index 100% rename from rsrc/graphics.exd/win/TERANIM.BMP rename to rsrc/legacy/win-graphics/TERANIM.BMP diff --git a/rsrc/graphics.exd/win/TERANIM_D.bmp b/rsrc/legacy/win-graphics/TERANIM_D.bmp similarity index 100% rename from rsrc/graphics.exd/win/TERANIM_D.bmp rename to rsrc/legacy/win-graphics/TERANIM_D.bmp diff --git a/rsrc/graphics.exd/win/TERSCRN.BMP b/rsrc/legacy/win-graphics/TERSCRN.BMP similarity index 100% rename from rsrc/graphics.exd/win/TERSCRN.BMP rename to rsrc/legacy/win-graphics/TERSCRN.BMP diff --git a/rsrc/graphics.exd/win/TEXTBAR.BMP b/rsrc/legacy/win-graphics/TEXTBAR.BMP similarity index 100% rename from rsrc/graphics.exd/win/TEXTBAR.BMP rename to rsrc/legacy/win-graphics/TEXTBAR.BMP diff --git a/rsrc/graphics.exd/win/TINYOBJ.BMP b/rsrc/legacy/win-graphics/TINYOBJ.BMP similarity index 100% rename from rsrc/graphics.exd/win/TINYOBJ.BMP rename to rsrc/legacy/win-graphics/TINYOBJ.BMP diff --git a/rsrc/graphics.exd/win/TRIMS.bmp b/rsrc/legacy/win-graphics/TRIMS.bmp similarity index 100% rename from rsrc/graphics.exd/win/TRIMS.bmp rename to rsrc/legacy/win-graphics/TRIMS.bmp diff --git a/rsrc/graphics.exd/win/TRIMS_D.bmp b/rsrc/legacy/win-graphics/TRIMS_D.bmp similarity index 100% rename from rsrc/graphics.exd/win/TRIMS_D.bmp rename to rsrc/legacy/win-graphics/TRIMS_D.bmp diff --git a/rsrc/graphics.exd/win/booms.PNG b/rsrc/legacy/win-graphics/booms.PNG similarity index 100% rename from rsrc/graphics.exd/win/booms.PNG rename to rsrc/legacy/win-graphics/booms.PNG diff --git a/rsrc/graphics.exd/win/fields.PNG b/rsrc/legacy/win-graphics/fields.PNG similarity index 100% rename from rsrc/graphics.exd/win/fields.PNG rename to rsrc/legacy/win-graphics/fields.PNG diff --git a/rsrc/graphics.exd/win/ter1.PNG b/rsrc/legacy/win-graphics/ter1.PNG similarity index 100% rename from rsrc/graphics.exd/win/ter1.PNG rename to rsrc/legacy/win-graphics/ter1.PNG diff --git a/rsrc/graphics.exd/win/ter2.PNG b/rsrc/legacy/win-graphics/ter2.PNG similarity index 100% rename from rsrc/graphics.exd/win/ter2.PNG rename to rsrc/legacy/win-graphics/ter2.PNG diff --git a/rsrc/graphics.exd/win/ter3.PNG b/rsrc/legacy/win-graphics/ter3.PNG similarity index 100% rename from rsrc/graphics.exd/win/ter3.PNG rename to rsrc/legacy/win-graphics/ter3.PNG diff --git a/rsrc/graphics.exd/win/ter4.PNG b/rsrc/legacy/win-graphics/ter4.PNG similarity index 100% rename from rsrc/graphics.exd/win/ter4.PNG rename to rsrc/legacy/win-graphics/ter4.PNG diff --git a/rsrc/graphics.exd/win/ter5.PNG b/rsrc/legacy/win-graphics/ter5.PNG similarity index 100% rename from rsrc/graphics.exd/win/ter5.PNG rename to rsrc/legacy/win-graphics/ter5.PNG diff --git a/rsrc/graphics.exd/win/ter6.PNG b/rsrc/legacy/win-graphics/ter6.PNG similarity index 100% rename from rsrc/graphics.exd/win/ter6.PNG rename to rsrc/legacy/win-graphics/ter6.PNG diff --git a/rsrc/graphics.exd/win/ter7.PNG b/rsrc/legacy/win-graphics/ter7.PNG similarity index 100% rename from rsrc/graphics.exd/win/ter7.PNG rename to rsrc/legacy/win-graphics/ter7.PNG diff --git a/rsrc/graphics.exd/win/teranim.PNG b/rsrc/legacy/win-graphics/teranim.PNG similarity index 100% rename from rsrc/graphics.exd/win/teranim.PNG rename to rsrc/legacy/win-graphics/teranim.PNG diff --git a/rsrc/sounds.exa/SND0.WAV b/rsrc/sounds/SND0.WAV similarity index 100% rename from rsrc/sounds.exa/SND0.WAV rename to rsrc/sounds/SND0.WAV diff --git a/rsrc/sounds.exa/SND1.WAV b/rsrc/sounds/SND1.WAV similarity index 100% rename from rsrc/sounds.exa/SND1.WAV rename to rsrc/sounds/SND1.WAV diff --git a/rsrc/sounds.exa/SND10.WAV b/rsrc/sounds/SND10.WAV similarity index 100% rename from rsrc/sounds.exa/SND10.WAV rename to rsrc/sounds/SND10.WAV diff --git a/rsrc/sounds.exa/SND11.WAV b/rsrc/sounds/SND11.WAV similarity index 100% rename from rsrc/sounds.exa/SND11.WAV rename to rsrc/sounds/SND11.WAV diff --git a/rsrc/sounds.exa/SND12.WAV b/rsrc/sounds/SND12.WAV similarity index 100% rename from rsrc/sounds.exa/SND12.WAV rename to rsrc/sounds/SND12.WAV diff --git a/rsrc/sounds.exa/SND13.WAV b/rsrc/sounds/SND13.WAV similarity index 100% rename from rsrc/sounds.exa/SND13.WAV rename to rsrc/sounds/SND13.WAV diff --git a/rsrc/sounds.exa/SND14.WAV b/rsrc/sounds/SND14.WAV similarity index 100% rename from rsrc/sounds.exa/SND14.WAV rename to rsrc/sounds/SND14.WAV diff --git a/rsrc/sounds.exa/SND15.WAV b/rsrc/sounds/SND15.WAV similarity index 100% rename from rsrc/sounds.exa/SND15.WAV rename to rsrc/sounds/SND15.WAV diff --git a/rsrc/sounds.exa/SND16.WAV b/rsrc/sounds/SND16.WAV similarity index 100% rename from rsrc/sounds.exa/SND16.WAV rename to rsrc/sounds/SND16.WAV diff --git a/rsrc/sounds.exa/SND17.WAV b/rsrc/sounds/SND17.WAV similarity index 100% rename from rsrc/sounds.exa/SND17.WAV rename to rsrc/sounds/SND17.WAV diff --git a/rsrc/sounds.exa/SND18.WAV b/rsrc/sounds/SND18.WAV similarity index 100% rename from rsrc/sounds.exa/SND18.WAV rename to rsrc/sounds/SND18.WAV diff --git a/rsrc/sounds.exa/SND19.WAV b/rsrc/sounds/SND19.WAV similarity index 100% rename from rsrc/sounds.exa/SND19.WAV rename to rsrc/sounds/SND19.WAV diff --git a/rsrc/sounds.exa/SND2.WAV b/rsrc/sounds/SND2.WAV similarity index 100% rename from rsrc/sounds.exa/SND2.WAV rename to rsrc/sounds/SND2.WAV diff --git a/rsrc/sounds.exa/SND20.WAV b/rsrc/sounds/SND20.WAV similarity index 100% rename from rsrc/sounds.exa/SND20.WAV rename to rsrc/sounds/SND20.WAV diff --git a/rsrc/sounds.exa/SND21.WAV b/rsrc/sounds/SND21.WAV similarity index 100% rename from rsrc/sounds.exa/SND21.WAV rename to rsrc/sounds/SND21.WAV diff --git a/rsrc/sounds.exa/SND22.WAV b/rsrc/sounds/SND22.WAV similarity index 100% rename from rsrc/sounds.exa/SND22.WAV rename to rsrc/sounds/SND22.WAV diff --git a/rsrc/sounds.exa/SND23.WAV b/rsrc/sounds/SND23.WAV similarity index 100% rename from rsrc/sounds.exa/SND23.WAV rename to rsrc/sounds/SND23.WAV diff --git a/rsrc/sounds.exa/SND24.WAV b/rsrc/sounds/SND24.WAV similarity index 100% rename from rsrc/sounds.exa/SND24.WAV rename to rsrc/sounds/SND24.WAV diff --git a/rsrc/sounds.exa/SND25.WAV b/rsrc/sounds/SND25.WAV similarity index 100% rename from rsrc/sounds.exa/SND25.WAV rename to rsrc/sounds/SND25.WAV diff --git a/rsrc/sounds.exa/SND26.WAV b/rsrc/sounds/SND26.WAV similarity index 100% rename from rsrc/sounds.exa/SND26.WAV rename to rsrc/sounds/SND26.WAV diff --git a/rsrc/sounds.exa/SND27.WAV b/rsrc/sounds/SND27.WAV similarity index 100% rename from rsrc/sounds.exa/SND27.WAV rename to rsrc/sounds/SND27.WAV diff --git a/rsrc/sounds.exa/SND28.WAV b/rsrc/sounds/SND28.WAV similarity index 100% rename from rsrc/sounds.exa/SND28.WAV rename to rsrc/sounds/SND28.WAV diff --git a/rsrc/sounds.exa/SND29.WAV b/rsrc/sounds/SND29.WAV similarity index 100% rename from rsrc/sounds.exa/SND29.WAV rename to rsrc/sounds/SND29.WAV diff --git a/rsrc/sounds.exa/SND3.WAV b/rsrc/sounds/SND3.WAV similarity index 100% rename from rsrc/sounds.exa/SND3.WAV rename to rsrc/sounds/SND3.WAV diff --git a/rsrc/sounds.exa/SND30.WAV b/rsrc/sounds/SND30.WAV similarity index 100% rename from rsrc/sounds.exa/SND30.WAV rename to rsrc/sounds/SND30.WAV diff --git a/rsrc/sounds.exa/SND31.WAV b/rsrc/sounds/SND31.WAV similarity index 100% rename from rsrc/sounds.exa/SND31.WAV rename to rsrc/sounds/SND31.WAV diff --git a/rsrc/sounds.exa/SND32.WAV b/rsrc/sounds/SND32.WAV similarity index 100% rename from rsrc/sounds.exa/SND32.WAV rename to rsrc/sounds/SND32.WAV diff --git a/rsrc/sounds.exa/SND33.WAV b/rsrc/sounds/SND33.WAV similarity index 100% rename from rsrc/sounds.exa/SND33.WAV rename to rsrc/sounds/SND33.WAV diff --git a/rsrc/sounds.exa/SND34.WAV b/rsrc/sounds/SND34.WAV similarity index 100% rename from rsrc/sounds.exa/SND34.WAV rename to rsrc/sounds/SND34.WAV diff --git a/rsrc/sounds.exa/SND35.WAV b/rsrc/sounds/SND35.WAV similarity index 100% rename from rsrc/sounds.exa/SND35.WAV rename to rsrc/sounds/SND35.WAV diff --git a/rsrc/sounds.exa/SND36.WAV b/rsrc/sounds/SND36.WAV similarity index 100% rename from rsrc/sounds.exa/SND36.WAV rename to rsrc/sounds/SND36.WAV diff --git a/rsrc/sounds.exa/SND37.WAV b/rsrc/sounds/SND37.WAV similarity index 100% rename from rsrc/sounds.exa/SND37.WAV rename to rsrc/sounds/SND37.WAV diff --git a/rsrc/sounds.exa/SND38.WAV b/rsrc/sounds/SND38.WAV similarity index 100% rename from rsrc/sounds.exa/SND38.WAV rename to rsrc/sounds/SND38.WAV diff --git a/rsrc/sounds.exa/SND39.WAV b/rsrc/sounds/SND39.WAV similarity index 100% rename from rsrc/sounds.exa/SND39.WAV rename to rsrc/sounds/SND39.WAV diff --git a/rsrc/sounds.exa/SND4.WAV b/rsrc/sounds/SND4.WAV similarity index 100% rename from rsrc/sounds.exa/SND4.WAV rename to rsrc/sounds/SND4.WAV diff --git a/rsrc/sounds.exa/SND40.WAV b/rsrc/sounds/SND40.WAV similarity index 100% rename from rsrc/sounds.exa/SND40.WAV rename to rsrc/sounds/SND40.WAV diff --git a/rsrc/sounds.exa/SND41.WAV b/rsrc/sounds/SND41.WAV similarity index 100% rename from rsrc/sounds.exa/SND41.WAV rename to rsrc/sounds/SND41.WAV diff --git a/rsrc/sounds.exa/SND42.WAV b/rsrc/sounds/SND42.WAV similarity index 100% rename from rsrc/sounds.exa/SND42.WAV rename to rsrc/sounds/SND42.WAV diff --git a/rsrc/sounds.exa/SND43.WAV b/rsrc/sounds/SND43.WAV similarity index 100% rename from rsrc/sounds.exa/SND43.WAV rename to rsrc/sounds/SND43.WAV diff --git a/rsrc/sounds.exa/SND44.WAV b/rsrc/sounds/SND44.WAV similarity index 100% rename from rsrc/sounds.exa/SND44.WAV rename to rsrc/sounds/SND44.WAV diff --git a/rsrc/sounds.exa/SND45.WAV b/rsrc/sounds/SND45.WAV similarity index 100% rename from rsrc/sounds.exa/SND45.WAV rename to rsrc/sounds/SND45.WAV diff --git a/rsrc/sounds.exa/SND46.WAV b/rsrc/sounds/SND46.WAV similarity index 100% rename from rsrc/sounds.exa/SND46.WAV rename to rsrc/sounds/SND46.WAV diff --git a/rsrc/sounds.exa/SND47.WAV b/rsrc/sounds/SND47.WAV similarity index 100% rename from rsrc/sounds.exa/SND47.WAV rename to rsrc/sounds/SND47.WAV diff --git a/rsrc/sounds.exa/SND48.WAV b/rsrc/sounds/SND48.WAV similarity index 100% rename from rsrc/sounds.exa/SND48.WAV rename to rsrc/sounds/SND48.WAV diff --git a/rsrc/sounds.exa/SND49.WAV b/rsrc/sounds/SND49.WAV similarity index 100% rename from rsrc/sounds.exa/SND49.WAV rename to rsrc/sounds/SND49.WAV diff --git a/rsrc/sounds.exa/SND5.WAV b/rsrc/sounds/SND5.WAV similarity index 100% rename from rsrc/sounds.exa/SND5.WAV rename to rsrc/sounds/SND5.WAV diff --git a/rsrc/sounds.exa/SND50.WAV b/rsrc/sounds/SND50.WAV similarity index 100% rename from rsrc/sounds.exa/SND50.WAV rename to rsrc/sounds/SND50.WAV diff --git a/rsrc/sounds.exa/SND51.WAV b/rsrc/sounds/SND51.WAV similarity index 100% rename from rsrc/sounds.exa/SND51.WAV rename to rsrc/sounds/SND51.WAV diff --git a/rsrc/sounds.exa/SND52.WAV b/rsrc/sounds/SND52.WAV similarity index 100% rename from rsrc/sounds.exa/SND52.WAV rename to rsrc/sounds/SND52.WAV diff --git a/rsrc/sounds.exa/SND53.WAV b/rsrc/sounds/SND53.WAV similarity index 100% rename from rsrc/sounds.exa/SND53.WAV rename to rsrc/sounds/SND53.WAV diff --git a/rsrc/sounds.exa/SND54.WAV b/rsrc/sounds/SND54.WAV similarity index 100% rename from rsrc/sounds.exa/SND54.WAV rename to rsrc/sounds/SND54.WAV diff --git a/rsrc/sounds.exa/SND55.WAV b/rsrc/sounds/SND55.WAV similarity index 100% rename from rsrc/sounds.exa/SND55.WAV rename to rsrc/sounds/SND55.WAV diff --git a/rsrc/sounds.exa/SND56.WAV b/rsrc/sounds/SND56.WAV similarity index 100% rename from rsrc/sounds.exa/SND56.WAV rename to rsrc/sounds/SND56.WAV diff --git a/rsrc/sounds.exa/SND57.WAV b/rsrc/sounds/SND57.WAV similarity index 100% rename from rsrc/sounds.exa/SND57.WAV rename to rsrc/sounds/SND57.WAV diff --git a/rsrc/sounds.exa/SND58.WAV b/rsrc/sounds/SND58.WAV similarity index 100% rename from rsrc/sounds.exa/SND58.WAV rename to rsrc/sounds/SND58.WAV diff --git a/rsrc/sounds.exa/SND59.WAV b/rsrc/sounds/SND59.WAV similarity index 100% rename from rsrc/sounds.exa/SND59.WAV rename to rsrc/sounds/SND59.WAV diff --git a/rsrc/sounds.exa/SND6.WAV b/rsrc/sounds/SND6.WAV similarity index 100% rename from rsrc/sounds.exa/SND6.WAV rename to rsrc/sounds/SND6.WAV diff --git a/rsrc/sounds.exa/SND60.WAV b/rsrc/sounds/SND60.WAV similarity index 100% rename from rsrc/sounds.exa/SND60.WAV rename to rsrc/sounds/SND60.WAV diff --git a/rsrc/sounds.exa/SND61.WAV b/rsrc/sounds/SND61.WAV similarity index 100% rename from rsrc/sounds.exa/SND61.WAV rename to rsrc/sounds/SND61.WAV diff --git a/rsrc/sounds.exa/SND62.WAV b/rsrc/sounds/SND62.WAV similarity index 100% rename from rsrc/sounds.exa/SND62.WAV rename to rsrc/sounds/SND62.WAV diff --git a/rsrc/sounds.exa/SND63.WAV b/rsrc/sounds/SND63.WAV similarity index 100% rename from rsrc/sounds.exa/SND63.WAV rename to rsrc/sounds/SND63.WAV diff --git a/rsrc/sounds.exa/SND64.WAV b/rsrc/sounds/SND64.WAV similarity index 100% rename from rsrc/sounds.exa/SND64.WAV rename to rsrc/sounds/SND64.WAV diff --git a/rsrc/sounds.exa/SND65.WAV b/rsrc/sounds/SND65.WAV similarity index 100% rename from rsrc/sounds.exa/SND65.WAV rename to rsrc/sounds/SND65.WAV diff --git a/rsrc/sounds.exa/SND66.WAV b/rsrc/sounds/SND66.WAV similarity index 100% rename from rsrc/sounds.exa/SND66.WAV rename to rsrc/sounds/SND66.WAV diff --git a/rsrc/sounds.exa/SND67.WAV b/rsrc/sounds/SND67.WAV similarity index 100% rename from rsrc/sounds.exa/SND67.WAV rename to rsrc/sounds/SND67.WAV diff --git a/rsrc/sounds.exa/SND68.WAV b/rsrc/sounds/SND68.WAV similarity index 100% rename from rsrc/sounds.exa/SND68.WAV rename to rsrc/sounds/SND68.WAV diff --git a/rsrc/sounds.exa/SND69.WAV b/rsrc/sounds/SND69.WAV similarity index 100% rename from rsrc/sounds.exa/SND69.WAV rename to rsrc/sounds/SND69.WAV diff --git a/rsrc/sounds.exa/SND7.WAV b/rsrc/sounds/SND7.WAV similarity index 100% rename from rsrc/sounds.exa/SND7.WAV rename to rsrc/sounds/SND7.WAV diff --git a/rsrc/sounds.exa/SND70.WAV b/rsrc/sounds/SND70.WAV similarity index 100% rename from rsrc/sounds.exa/SND70.WAV rename to rsrc/sounds/SND70.WAV diff --git a/rsrc/sounds.exa/SND71.WAV b/rsrc/sounds/SND71.WAV similarity index 100% rename from rsrc/sounds.exa/SND71.WAV rename to rsrc/sounds/SND71.WAV diff --git a/rsrc/sounds.exa/SND72.WAV b/rsrc/sounds/SND72.WAV similarity index 100% rename from rsrc/sounds.exa/SND72.WAV rename to rsrc/sounds/SND72.WAV diff --git a/rsrc/sounds.exa/SND73.WAV b/rsrc/sounds/SND73.WAV similarity index 100% rename from rsrc/sounds.exa/SND73.WAV rename to rsrc/sounds/SND73.WAV diff --git a/rsrc/sounds.exa/SND74.WAV b/rsrc/sounds/SND74.WAV similarity index 100% rename from rsrc/sounds.exa/SND74.WAV rename to rsrc/sounds/SND74.WAV diff --git a/rsrc/sounds.exa/SND75.WAV b/rsrc/sounds/SND75.WAV similarity index 100% rename from rsrc/sounds.exa/SND75.WAV rename to rsrc/sounds/SND75.WAV diff --git a/rsrc/sounds.exa/SND76.WAV b/rsrc/sounds/SND76.WAV similarity index 100% rename from rsrc/sounds.exa/SND76.WAV rename to rsrc/sounds/SND76.WAV diff --git a/rsrc/sounds.exa/SND77.WAV b/rsrc/sounds/SND77.WAV similarity index 100% rename from rsrc/sounds.exa/SND77.WAV rename to rsrc/sounds/SND77.WAV diff --git a/rsrc/sounds.exa/SND78.WAV b/rsrc/sounds/SND78.WAV similarity index 100% rename from rsrc/sounds.exa/SND78.WAV rename to rsrc/sounds/SND78.WAV diff --git a/rsrc/sounds.exa/SND79.WAV b/rsrc/sounds/SND79.WAV similarity index 100% rename from rsrc/sounds.exa/SND79.WAV rename to rsrc/sounds/SND79.WAV diff --git a/rsrc/sounds.exa/SND8.WAV b/rsrc/sounds/SND8.WAV similarity index 100% rename from rsrc/sounds.exa/SND8.WAV rename to rsrc/sounds/SND8.WAV diff --git a/rsrc/sounds.exa/SND80.WAV b/rsrc/sounds/SND80.WAV similarity index 100% rename from rsrc/sounds.exa/SND80.WAV rename to rsrc/sounds/SND80.WAV diff --git a/rsrc/sounds.exa/SND81.WAV b/rsrc/sounds/SND81.WAV similarity index 100% rename from rsrc/sounds.exa/SND81.WAV rename to rsrc/sounds/SND81.WAV diff --git a/rsrc/sounds.exa/SND82.WAV b/rsrc/sounds/SND82.WAV similarity index 100% rename from rsrc/sounds.exa/SND82.WAV rename to rsrc/sounds/SND82.WAV diff --git a/rsrc/sounds.exa/SND83.WAV b/rsrc/sounds/SND83.WAV similarity index 100% rename from rsrc/sounds.exa/SND83.WAV rename to rsrc/sounds/SND83.WAV diff --git a/rsrc/sounds.exa/SND84.WAV b/rsrc/sounds/SND84.WAV similarity index 100% rename from rsrc/sounds.exa/SND84.WAV rename to rsrc/sounds/SND84.WAV diff --git a/rsrc/sounds.exa/SND85.WAV b/rsrc/sounds/SND85.WAV similarity index 100% rename from rsrc/sounds.exa/SND85.WAV rename to rsrc/sounds/SND85.WAV diff --git a/rsrc/sounds.exa/SND86.WAV b/rsrc/sounds/SND86.WAV similarity index 100% rename from rsrc/sounds.exa/SND86.WAV rename to rsrc/sounds/SND86.WAV diff --git a/rsrc/sounds.exa/SND87.WAV b/rsrc/sounds/SND87.WAV similarity index 100% rename from rsrc/sounds.exa/SND87.WAV rename to rsrc/sounds/SND87.WAV diff --git a/rsrc/sounds.exa/SND88.WAV b/rsrc/sounds/SND88.WAV similarity index 100% rename from rsrc/sounds.exa/SND88.WAV rename to rsrc/sounds/SND88.WAV diff --git a/rsrc/sounds.exa/SND89.WAV b/rsrc/sounds/SND89.WAV similarity index 100% rename from rsrc/sounds.exa/SND89.WAV rename to rsrc/sounds/SND89.WAV diff --git a/rsrc/sounds.exa/SND9.WAV b/rsrc/sounds/SND9.WAV similarity index 100% rename from rsrc/sounds.exa/SND9.WAV rename to rsrc/sounds/SND9.WAV diff --git a/rsrc/sounds.exa/SND90.WAV b/rsrc/sounds/SND90.WAV similarity index 100% rename from rsrc/sounds.exa/SND90.WAV rename to rsrc/sounds/SND90.WAV diff --git a/rsrc/sounds.exa/SND91.WAV b/rsrc/sounds/SND91.WAV similarity index 100% rename from rsrc/sounds.exa/SND91.WAV rename to rsrc/sounds/SND91.WAV diff --git a/rsrc/sounds.exa/SND92.WAV b/rsrc/sounds/SND92.WAV similarity index 100% rename from rsrc/sounds.exa/SND92.WAV rename to rsrc/sounds/SND92.WAV diff --git a/rsrc/sounds.exa/SND93.WAV b/rsrc/sounds/SND93.WAV similarity index 100% rename from rsrc/sounds.exa/SND93.WAV rename to rsrc/sounds/SND93.WAV diff --git a/rsrc/sounds.exa/SND94.WAV b/rsrc/sounds/SND94.WAV similarity index 100% rename from rsrc/sounds.exa/SND94.WAV rename to rsrc/sounds/SND94.WAV diff --git a/rsrc/sounds.exa/SND95.WAV b/rsrc/sounds/SND95.WAV similarity index 100% rename from rsrc/sounds.exa/SND95.WAV rename to rsrc/sounds/SND95.WAV diff --git a/rsrc/sounds.exa/SND96.WAV b/rsrc/sounds/SND96.WAV similarity index 100% rename from rsrc/sounds.exa/SND96.WAV rename to rsrc/sounds/SND96.WAV diff --git a/rsrc/sounds.exa/SND97.WAV b/rsrc/sounds/SND97.WAV similarity index 100% rename from rsrc/sounds.exa/SND97.WAV rename to rsrc/sounds/SND97.WAV diff --git a/rsrc/sounds.exa/SND98.WAV b/rsrc/sounds/SND98.WAV similarity index 100% rename from rsrc/sounds.exa/SND98.WAV rename to rsrc/sounds/SND98.WAV diff --git a/rsrc/sounds.exa/SND99.WAV b/rsrc/sounds/SND99.WAV similarity index 100% rename from rsrc/sounds.exa/SND99.WAV rename to rsrc/sounds/SND99.WAV diff --git a/src/BoE-Info.plist b/src/BoE-Info.plist index 8cc18daf..28b8f664 100644 --- a/src/BoE-Info.plist +++ b/src/BoE-Info.plist @@ -149,46 +149,6 @@ NSPersistentStoreTypeKey XML - - CFBundleTypeExtensions - - exd - - CFBundleTypeIconFile - boegraphics - CFBundleTypeName - Blades of Exile Graphics - CFBundleTypeRole - None - LSItemContentTypes - - com.spidweb.bladesofexile.graphics - - LSTypeIsPackage - - NSPersistentStoreTypeKey - Binary - - - CFBundleTypeExtensions - - exa - - CFBundleTypeIconFile - boesounds - CFBundleTypeName - Blades of Exile Sounds - CFBundleTypeRole - None - LSItemContentTypes - - com.spidweb.bladesofexile.sounds - - LSTypeIsPackage - - NSPersistentStoreTypeKey - Binary - CFBundleExecutable ${EXECUTABLE_NAME} @@ -278,46 +238,6 @@ - - UTTypeConformsTo - - com.apple.package - - UTTypeDescription - Blades of Exile Graphics - UTTypeIconFile - boegraphics - UTTypeIdentifier - com.spidweb.bladesofexile.graphics - UTTypeReferenceURL - - UTTypeTagSpecification - - public.filename-extension - - exd - - - - - UTTypeConformsTo - - com.apple.package - - UTTypeDescription - Blades of Exile Sounds - UTTypeIconFile - boesounds - UTTypeIdentifier - com.spidweb.bladesofexile.sounds - UTTypeTagSpecification - - public.filename-extension - - exa - - - diff --git a/src/BoE.vsproj/Common/CopyFiles.bat b/src/BoE.vsproj/Common/CopyFiles.bat index 1b89ec5d..23139d87 100644 --- a/src/BoE.vsproj/Common/CopyFiles.bat +++ b/src/BoE.vsproj/Common/CopyFiles.bat @@ -7,30 +7,32 @@ set VCDir=%~f3 set ResourceDir=%SolutionDir%%Config%\..\..\..\rsrc set TargetDir=%SolutionDir%%Config% -set ScenEdDir=%TargetDir%\"Scenario Editor" set DllSrcDir=%VCDir%bin @echo on @echo Copying graphics... -xcopy %ResourceDir%\graphics.exd %ScenEdDir%\graphics.exd /s /y /i /d +xcopy %ResourceDir%\graphics\*.png %TargetDir%\data\graphics /s /y /i /d + +@echo Copying cursors... +xcopy %ResourceDir%\cursors\*.gif %TargetDir%\data\cursors /s /y /i /d @echo Copying sound effects... -xcopy %ResourceDir%\sounds.exa %ScenEdDir%\sounds.exa /s /y /i /d +xcopy %ResourceDir%\sounds\*.WAV %TargetDir%\data\sounds /s /y /i /d @echo Copying dialog definitions... xcopy %ResourceDir%\dialogs\*.xml %TargetDir%\data\dialogs /s /y /i /d @echo Copying fonts... -xcopy %ResourceDir%\fonts %TargetDir%\data\fonts /s /y /i /d +xcopy %ResourceDir%\fonts\*.ttf %TargetDir%\data\fonts /s /y /i /d @echo Copying string lists... -xcopy %ResourceDir%\strings %TargetDir%\data\strings /s /y /i /d +xcopy %ResourceDir%\strings\*.txt %TargetDir%\data\strings /s /y /i /d @echo Copying shaders... xcopy %ResourceDir%\..\src\tools\mask.* %TargetDir%\data\shaders /s /y /i /d @echo Copying base scenarios... -xcopy %ResourceDir%\"Blades of Exile Bases" %ScenEdDir%\"Blades of Exile Base" /s /y /i /d +xcopy %ResourceDir%\"Blades of Exile Bases" %TargetDir%\"Blades of Exile Base" /s /y /i /d @echo Copying scenario files... xcopy %ResourceDir%\"Blades of Exile Scenarios"\*.exs %TargetDir%\"Blades of Exile Scenarios" /s /y /i /d diff --git a/src/BoE.vsproj/Installer/gen-data.py b/src/BoE.vsproj/Installer/gen-data.py index 8ccc136a..9abe122e 100644 --- a/src/BoE.vsproj/Installer/gen-data.py +++ b/src/BoE.vsproj/Installer/gen-data.py @@ -17,9 +17,9 @@ files = { 'data/strings': '*.txt', 'data/fonts': '*.ttf', 'data/shaders': ['mask.frag', 'mask.vert'], - 'Scenario Editor/graphics.exd/mac': '*.png', - 'Scenario Editor/graphics.exd/mac/cursors': '*.gif', - 'Scenario Editor/sounds.exa': '*.WAV', + 'data/graphics': '*.png', + 'data/cursors': '*.gif', + 'data/sounds': '*.WAV', } for path, pattern in files.items(): diff --git a/src/BoE.vsproj/Installer/main.nsi b/src/BoE.vsproj/Installer/main.nsi index 803c314e..33eae984 100644 --- a/src/BoE.vsproj/Installer/main.nsi +++ b/src/BoE.vsproj/Installer/main.nsi @@ -99,8 +99,8 @@ Section "Scenario Editor" Section3 ; Set Section Files and Shortcuts SetOutPath "$INSTDIR\" File "..\Release\Scen Editor.exe" - SetOutPath "$INSTDIR\Scenario Editor\Blades of Exile Base\" - File "..\Release\Scenario Editor\Blades of Exile Base\bladbase.exs" + SetOutPath "$INSTDIR\Blades of Exile Base\" + File "..\Release\Blades of Exile Base\bladbase.exs" SetShellVarContext all CreateShortCut "$SMPROGRAMS\Blades of Exile\Scenario Editor.lnk" "$INSTDIR\Scen Editor.exe" @@ -249,20 +249,17 @@ Section Uninstall Delete "$INSTDIR\openal32.dll" RMDir /r "$INSTDIR\doc" RMDir /r "$INSTDIR\data" - RMDir /r "$INSTDIR\Scenario Editor\graphics.exd" - RMDir /r "$INSTDIR\Scenario Editor\sounds.exa" ; Clean up Character Editor Delete "$INSTDIR\Char Editor.exe" ; Clean up Scenario Editor Delete "$INSTDIR\Scen Editor.exe" - Delete "$INSTDIR\Scenario Editor\Blades of Exile Base\bladbase.exs" + Delete "$INSTDIR\Blades of Exile Base\bladbase.exs" ; Remove remaining directories RMDir "$INSTDIR\Blades of Exile Scenarios\" - RMDir "$INSTDIR\Scenario Editor\Blades of Exile Base\" - RMDir "$INSTDIR\Scenario Editor\" + RMDir "$INSTDIR\Blades of Exile Base\" RMDir "$INSTDIR\" ; Delete Shortcuts diff --git a/src/BoE.xcodeproj/project.pbxproj b/src/BoE.xcodeproj/project.pbxproj index f7654cac..e87e1678 100755 --- a/src/BoE.xcodeproj/project.pbxproj +++ b/src/BoE.xcodeproj/project.pbxproj @@ -14,11 +14,8 @@ 91A0B15F1900FFDA00EF438F /* Copy Shaders */, 912CF3560FE4494C0063B614 /* Copy Scenarios */, 91ACCE6218FFB5F300FAEF8B /* Copy Base Scenarios */, - 912CF36D0FE44A2A0063B614 /* Copy Sounds and Graphics */, - 9192C13918F32E6E0088A580 /* Copy Strings */, - 914701A618F62A52008A6DC9 /* Copy Fonts */, 914B2BB718E8BF99007B6799 /* Validate Dialog Definitions */, - 914B2B9518E8008A007B6799 /* Copy Dialog Definitions */, + 914B2B9518E8008A007B6799 /* Copy Data Files */, 91C2A6E01B823C7B00346948 /* Generate Git Revision Information */, ); dependencies = ( @@ -73,6 +70,10 @@ 911F2D9E1B98F44700E3102E /* libCommon-Party.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 911F2D9D1B98F44700E3102E /* libCommon-Party.a */; }; 911F2D9F1B98F44700E3102E /* libCommon-Party.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 911F2D9D1B98F44700E3102E /* libCommon-Party.a */; }; 911F2DA01B98F44700E3102E /* libCommon-Party.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 911F2D9D1B98F44700E3102E /* libCommon-Party.a */; }; + 911F2DA61B98FF5600E3102E /* fonts in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 911F2DA51B98FF2700E3102E /* fonts */; }; + 911F2DA71B98FF5600E3102E /* cursors in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 911F2DA21B98FF2300E3102E /* cursors */; }; + 911F2DA81B98FF5600E3102E /* graphics in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 911F2DA31B98FF2300E3102E /* graphics */; }; + 911F2DA91B98FF5600E3102E /* sounds in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 911F2DA41B98FF2300E3102E /* sounds */; }; 9127903E0F9B7F49007B0D52 /* boe.actions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BF04ACF0BF51923006C0831 /* boe.actions.cpp */; }; 9127903F0F9B7F50007B0D52 /* boe.graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BF04AD30BF51923006C0831 /* boe.graphics.cpp */; }; 91279BAE0F9CFCBA007B0D52 /* boescenario.icns in Resources */ = {isa = PBXBuildFile; fileRef = 91279BAD0F9CFCBA007B0D52 /* boescenario.icns */; }; @@ -88,8 +89,6 @@ 912CF3660FE449900063B614 /* zakhazi.meg in Copy Scenarios */ = {isa = PBXBuildFile; fileRef = 91D635AF0F90E7B500674AB3 /* zakhazi.meg */; }; 912DFE8F18E2872400B00D75 /* boe.menus.mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 912DFE8E18E2872300B00D75 /* boe.menus.mac.mm */; }; 913D6C050FC57A8E00E12527 /* boeresources.icns in Resources */ = {isa = PBXBuildFile; fileRef = 913D6C040FC57A8E00E12527 /* boeresources.icns */; }; - 914701A718F62ABF008A6DC9 /* dungeon.ttf in Copy Fonts */ = {isa = PBXBuildFile; fileRef = 914701A418F629D4008A6DC9 /* dungeon.ttf */; }; - 914701A818F62AC0008A6DC9 /* maidenword.ttf in Copy Fonts */ = {isa = PBXBuildFile; fileRef = 914701A518F629D4008A6DC9 /* maidenword.ttf */; }; 914B2AA318E7E507007B6799 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 914B2AA118E7E500007B6799 /* Cocoa.framework */; }; 914B2AA418E7E509007B6799 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 914B2AA118E7E500007B6799 /* Cocoa.framework */; }; 914B2AA518E7E50A007B6799 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 914B2AA118E7E500007B6799 /* Cocoa.framework */; }; @@ -134,8 +133,6 @@ 917823801B2F33EB007F3444 /* FLAC.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 9178237C1B2F33E9007F3444 /* FLAC.framework */; }; 917823811B2F33F1007F3444 /* FLAC.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 9178237C1B2F33E9007F3444 /* FLAC.framework */; }; 917823821B2F33F5007F3444 /* FLAC.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 9178237C1B2F33E9007F3444 /* FLAC.framework */; }; - 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 */; }; 91870F84190C90980081C150 /* scenedit.xib in Resources */ = {isa = PBXBuildFile; fileRef = 914CA49F190C4E9200B6ADD1 /* scenedit.xib */; }; 919145FC18E3AB1B005CF3A4 /* boe.appleevents.mm in Sources */ = {isa = PBXBuildFile; fileRef = 919145FB18E3A32F005CF3A4 /* boe.appleevents.mm */; }; 9192C12018F2745C0088A580 /* game.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9192C11E18F271920088A580 /* game.xib */; }; @@ -251,8 +248,7 @@ 91BC33981B4481EF0008882C /* scen.fileio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91B3EEF20F969BA700BF5B67 /* scen.fileio.cpp */; }; 91BFA3D71901B18F001686E4 /* mask.vert in Copy Shaders */ = {isa = PBXBuildFile; fileRef = 91BFA3D61901B024001686E4 /* mask.vert */; }; 91C6864A0FD5EEFD000F6D01 /* pc.graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91B3EF0A0F969BD300BF5B67 /* pc.graphics.cpp */; }; - 91C749B81A2D6670008E0E10 /* strings in Copy Strings */ = {isa = PBXBuildFile; fileRef = 91C749B71A2D6432008E0E10 /* strings */; }; - 91C749BA1A2D670D008E0E10 /* dialogs in Copy Dialog Definitions */ = {isa = PBXBuildFile; fileRef = 91C749B91A2D66F7008E0E10 /* dialogs */; }; + 91C749BA1A2D670D008E0E10 /* dialogs in Copy Data Files */ = {isa = PBXBuildFile; fileRef = 91C749B91A2D66F7008E0E10 /* dialogs */; }; 91C763D91B4C50710086D879 /* enums.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91C763D81B4C4BB30086D879 /* enums.cpp */; }; 91C763DB1B4EE77F0086D879 /* map_read.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91C763DA1B4EE6E00086D879 /* map_read.cpp */; }; 91C763DD1B4EE7950086D879 /* map_write.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91C763DC1B4EE7950086D879 /* map_write.cpp */; }; @@ -263,8 +259,6 @@ 91E381461B97673700F69B81 /* town_write.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E381451B97671E00F69B81 /* town_write.cpp */; }; 91E381481B97677900F69B81 /* talk_write.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E381471B97675900F69B81 /* talk_write.cpp */; }; 91E3814A1B97679800F69B81 /* out_write.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E381491B97678D00F69B81 /* out_write.cpp */; }; - 91EF052C1904D099001BEF85 /* bold.ttf in Copy Fonts */ = {isa = PBXBuildFile; fileRef = 91EF05291904D082001BEF85 /* bold.ttf */; }; - 91EF052D1904D099001BEF85 /* plain.ttf in Copy Fonts */ = {isa = PBXBuildFile; fileRef = 91EF052A1904D082001BEF85 /* plain.ttf */; }; 91EF27731B693D3900666469 /* ter_read.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91EF27721B693D3800666469 /* ter_read.cpp */; }; 91EF27751B693D4800666469 /* ter_write.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91EF27741B693D4800666469 /* ter_write.cpp */; }; 91EF27771B693D5500666469 /* item_read.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91EF27761B693D5500666469 /* item_read.cpp */; }; @@ -406,52 +400,19 @@ name = "Copy Scenarios"; runOnlyForDeploymentPostprocessing = 0; }; - 912CF36D0FE44A2A0063B614 /* Copy Sounds and Graphics */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = "Scenario Editor"; - dstSubfolderSpec = 16; - files = ( - 9179A4601A42988500FEF872 /* sounds.exa in Copy Sounds and Graphics */, - 9179A4611A42988800FEF872 /* graphics.exd in Copy Sounds and Graphics */, - ); - name = "Copy Sounds and Graphics"; - runOnlyForDeploymentPostprocessing = 0; - }; - 914701A618F62A52008A6DC9 /* Copy Fonts */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = data/fonts; - dstSubfolderSpec = 16; - files = ( - 914701A718F62ABF008A6DC9 /* dungeon.ttf in Copy Fonts */, - 914701A818F62AC0008A6DC9 /* maidenword.ttf in Copy Fonts */, - 91EF052C1904D099001BEF85 /* bold.ttf in Copy Fonts */, - 91EF052D1904D099001BEF85 /* plain.ttf in Copy Fonts */, - ); - name = "Copy Fonts"; - runOnlyForDeploymentPostprocessing = 0; - }; - 914B2B9518E8008A007B6799 /* Copy Dialog Definitions */ = { + 914B2B9518E8008A007B6799 /* Copy Data Files */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = data; dstSubfolderSpec = 16; files = ( - 91C749BA1A2D670D008E0E10 /* dialogs in Copy Dialog Definitions */, + 91C749BA1A2D670D008E0E10 /* dialogs in Copy Data Files */, + 911F2DA61B98FF5600E3102E /* fonts in Copy Data Files */, + 911F2DA71B98FF5600E3102E /* cursors in Copy Data Files */, + 911F2DA81B98FF5600E3102E /* graphics in Copy Data Files */, + 911F2DA91B98FF5600E3102E /* sounds in Copy Data Files */, ); - name = "Copy Dialog Definitions"; - runOnlyForDeploymentPostprocessing = 0; - }; - 9192C13918F32E6E0088A580 /* Copy Strings */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = data; - dstSubfolderSpec = 16; - files = ( - 91C749B81A2D6670008E0E10 /* strings in Copy Strings */, - ); - name = "Copy Strings"; + name = "Copy Data Files"; runOnlyForDeploymentPostprocessing = 0; }; 91A0B15F1900FFDA00EF438F /* Copy Shaders */ = { @@ -469,7 +430,7 @@ 91ACCE6218FFB5F300FAEF8B /* Copy Base Scenarios */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; - dstPath = "Scenario Editor/Blades of Exile Base"; + dstPath = "Blades of Exile Base"; dstSubfolderSpec = 16; files = ( 91ACCE6418FFB61A00FAEF8B /* bladbase.exs in Copy Base Scenarios */, @@ -619,6 +580,10 @@ 910D9CA31B36439100414B17 /* libboost_thread.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libboost_thread.dylib; path = ../../../../../../usr/local/lib/libboost_thread.dylib; sourceTree = ""; }; 911F2D981B98F43B00E3102E /* libCommon.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libCommon.a; path = lib/libCommon.a; sourceTree = ""; }; 911F2D9D1B98F44700E3102E /* libCommon-Party.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libCommon-Party.a"; path = "lib/libCommon-Party.a"; sourceTree = ""; }; + 911F2DA21B98FF2300E3102E /* cursors */ = {isa = PBXFileReference; lastKnownFileType = folder; path = cursors; sourceTree = ""; }; + 911F2DA31B98FF2300E3102E /* graphics */ = {isa = PBXFileReference; lastKnownFileType = folder; path = graphics; sourceTree = ""; }; + 911F2DA41B98FF2300E3102E /* sounds */ = {isa = PBXFileReference; lastKnownFileType = folder; path = sounds; sourceTree = ""; }; + 911F2DA51B98FF2700E3102E /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = fonts; sourceTree = ""; }; 9122832D0FCF6C7200B21642 /* busywork.exs */ = {isa = PBXFileReference; lastKnownFileType = file; path = busywork.exs; sourceTree = ""; }; 912283C80FD0E16C00B21642 /* undo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = undo.cpp; sourceTree = ""; }; 912287850FD41A2300B21642 /* simpletypes.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = simpletypes.hpp; sourceTree = ""; }; @@ -655,8 +620,6 @@ 914698FB1A7362D900F20F5E /* living.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = living.cpp; sourceTree = ""; }; 914698FD1A747BED00F20F5E /* creature.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = creature.hpp; sourceTree = ""; }; 914698FE1A747C4500F20F5E /* creature.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = creature.cpp; sourceTree = ""; }; - 914701A418F629D4008A6DC9 /* dungeon.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = dungeon.ttf; sourceTree = ""; }; - 914701A518F629D4008A6DC9 /* maidenword.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = maidenword.ttf; sourceTree = ""; }; 914701A918F64A85008A6DC9 /* dialog.xsd */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = dialog.xsd; path = schemas/dialog.xsd; sourceTree = ""; }; 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 = ""; }; @@ -678,8 +641,6 @@ 9178236E1B2F331D007F3444 /* vorbis.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = vorbis.framework; path = ../../../../../../Library/Frameworks/vorbis.framework; sourceTree = ""; }; 917823751B2F334C007F3444 /* ogg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ogg.framework; path = ../../../../../../Library/Frameworks/ogg.framework; sourceTree = ""; }; 9178237C1B2F33E9007F3444 /* FLAC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FLAC.framework; path = ../../../../../../Library/Frameworks/FLAC.framework; sourceTree = ""; }; - 9179A45E1A42986200FEF872 /* graphics.exd */ = {isa = PBXFileReference; lastKnownFileType = folder; path = graphics.exd; sourceTree = ""; }; - 9179A45F1A42988200FEF872 /* sounds.exa */ = {isa = PBXFileReference; lastKnownFileType = folder; path = sounds.exa; sourceTree = ""; }; 9179A4621A47D4E200FEF872 /* vector2d.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = vector2d.hpp; sourceTree = ""; }; 9179A4631A4867E200FEF872 /* stack.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = stack.hpp; sourceTree = ""; }; 9179A4641A48681800FEF872 /* stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stack.cpp; sourceTree = ""; }; @@ -792,8 +753,6 @@ 91E5C7B70F9F619D00C21460 /* talking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = talking.cpp; sourceTree = ""; }; 91EC480E18FBAA8700BB1E86 /* prefs.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = prefs.hpp; sourceTree = ""; }; 91EC481018FBABB100BB1E86 /* prefs.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = prefs.mac.mm; sourceTree = ""; }; - 91EF05291904D082001BEF85 /* bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = bold.ttf; sourceTree = ""; }; - 91EF052A1904D082001BEF85 /* plain.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = plain.ttf; sourceTree = ""; }; 91EF27721B693D3800666469 /* ter_read.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ter_read.cpp; sourceTree = ""; }; 91EF27741B693D4800666469 /* ter_write.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ter_write.cpp; sourceTree = ""; }; 91EF27761B693D5500666469 /* item_read.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = item_read.cpp; sourceTree = ""; }; @@ -1143,17 +1102,6 @@ name = headers; sourceTree = ""; }; - 914701A318F629D4008A6DC9 /* fonts */ = { - isa = PBXGroup; - children = ( - 91EF05291904D082001BEF85 /* bold.ttf */, - 914701A418F629D4008A6DC9 /* dungeon.ttf */, - 914701A518F629D4008A6DC9 /* maidenword.ttf */, - 91EF052A1904D082001BEF85 /* plain.ttf */, - ); - path = fonts; - sourceTree = ""; - }; 914B2AA018E7E4A3007B6799 /* Linked Frameworks */ = { isa = PBXGroup; children = ( @@ -1290,9 +1238,10 @@ 914701A918F64A85008A6DC9 /* dialog.xsd */, 91C749B71A2D6432008E0E10 /* strings */, 91C749B91A2D66F7008E0E10 /* dialogs */, - 914701A318F629D4008A6DC9 /* fonts */, - 9179A45F1A42988200FEF872 /* sounds.exa */, - 9179A45E1A42986200FEF872 /* graphics.exd */, + 911F2DA51B98FF2700E3102E /* fonts */, + 911F2DA21B98FF2300E3102E /* cursors */, + 911F2DA31B98FF2300E3102E /* graphics */, + 911F2DA41B98FF2300E3102E /* sounds */, 91B3EF250F969CE300BF5B67 /* bladbase.exs */, 91D635A90F90E7B500674AB3 /* Blades of Exile Scenarios */, 914B2BB518E892AA007B6799 /* dialog-converting.txt */, @@ -2197,7 +2146,6 @@ 91B3EF1B0F969C2300BF5B67 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Scenario Editor"; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2223,7 +2171,6 @@ 91B3EF1C0F969C2300BF5B67 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Scenario Editor"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( @@ -2249,7 +2196,6 @@ 91B3EF420F969F0100BF5B67 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Scenario Editor"; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -2274,7 +2220,6 @@ 91B3EF430F969F0100BF5B67 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Scenario Editor"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( diff --git a/src/boe.fileio.cpp b/src/boe.fileio.cpp index 97df1f12..54aec0d0 100644 --- a/src/boe.fileio.cpp +++ b/src/boe.fileio.cpp @@ -460,9 +460,15 @@ void start_data_dump() { } } +extern const fs::path scenDir; fs::path locate_scenario(std::string scen_name) { + fs::create_directories(scenDir); std::transform(scen_name.begin(), scen_name.end(), scen_name.begin(), tolower); - fs::path scenDir = progDir/"Blades of Exile Scenarios", scenPath; + size_t dot = scen_name.find_first_of('.'); + std::string base_name = scen_name.substr(0,dot); + if(base_name == "valleydy" || base_name == "stealth" || base_name == "zakhazi"/* || base_name == "busywork" */) + return progDir/"Blades of Exile Scenarios"/scen_name; + fs::path scenPath; for(fs::recursive_directory_iterator iter(scenDir); iter != fs::recursive_directory_iterator(); iter++) { fs::file_status stat = iter->status(); std::string fname = iter->path().filename().string().c_str(); @@ -494,8 +500,7 @@ fs::path locate_scenario(std::string scen_name) { } void build_scen_headers() { - fs::path scenDir = progDir; - scenDir /= "Blades of Exile Scenarios"; + fs::create_directories(scenDir); std::cout << progDir << '\n' << scenDir << std::endl; scen_headers.clear(); fs::recursive_directory_iterator iter(scenDir); diff --git a/src/pcedit/pc.fileio.cpp b/src/pcedit/pc.fileio.cpp index 91b1db36..72865cec 100644 --- a/src/pcedit/pc.fileio.cpp +++ b/src/pcedit/pc.fileio.cpp @@ -62,6 +62,6 @@ void remove_party_from_scen() { } void load_base_item_defs(){ - fs::path basePath = progDir/"Scenario Editor"/"Blades of Exile Base"/"bladbase.exs"; + fs::path basePath = progDir/"Blades of Exile Base"/"bladbase.exs"; scen_items_loaded = load_scenario(basePath, univ.scenario); } diff --git a/src/scenedit/scen.core.cpp b/src/scenedit/scen.core.cpp index 6c3c3141..fe16592d 100644 --- a/src/scenedit/scen.core.cpp +++ b/src/scenedit/scen.core.cpp @@ -2917,7 +2917,7 @@ bool build_scenario() { scenario.contact_info[0] = author; scenario.default_ground = grass ? 2 : 0; - fs::path basePath = progDir/"Scenario Editor"/"Blades of Exile Base"/"bladbase.boes"; + fs::path basePath = progDir/"Blades of Exile Base"/"bladbase.boes"; if(!fs::exists(basePath)) { basePath = basePath.parent_path()/"bladbase.exs"; if(!fs::exists(basePath)) { diff --git a/src/scenedit/scen.fileio.cpp b/src/scenedit/scen.fileio.cpp index 96acc942..061fbc26 100644 --- a/src/scenedit/scen.fileio.cpp +++ b/src/scenedit/scen.fileio.cpp @@ -933,12 +933,13 @@ struct overrides_sheet { }; extern std::string scenario_temp_dir_name; +extern const fs::path scenDir; void save_scenario(bool rename) { fs::path toFile = scenario.scen_file; if(rename || toFile.empty()) { fs::path def = scenario.scen_file; if(def.empty()) - def = progDir/"Blades of Exile Scenarios/myscenario.boes"; + def = scenDir/"myscenario.boes"; toFile = nav_put_scenario(def); if(toFile.empty()) return; } @@ -1040,7 +1041,7 @@ void save_scenario(bool rename) { if(fs::exists(picPath) && fs::is_directory(picPath)) { // First build a list of overridable sheets std::set sheet_names; - fs::directory_iterator sheet_iter(progDir/"Scenario Editor"/"graphics.exd"/"mac"); + fs::directory_iterator sheet_iter(progDir/"data"/"graphics"); for(; sheet_iter != fs::directory_iterator(); sheet_iter++) { std::string fname = sheet_iter->path().filename().string(); size_t dot = fname.find_last_of('.'); diff --git a/src/tools/fileio.cpp b/src/tools/fileio.cpp index 7a19b994..2c0cd2a9 100644 --- a/src/tools/fileio.cpp +++ b/src/tools/fileio.cpp @@ -15,7 +15,7 @@ #include "cursors.hpp" bool mac_is_intel; -fs::path progDir, tempDir; +fs::path progDir, tempDir, scenDir; // Cursors included here so that they needn't be unnecessarily duplicated in platform-specific files cursor_type current_cursor = sword_curs; @@ -36,13 +36,12 @@ void init_directories(const char* exec_path) { progDir = progDir.parent_path().parent_path().parent_path(); #endif progDir = progDir.parent_path(); - if(progDir.filename() == "Scenario Editor") progDir = progDir.parent_path(); // Initialize the resource manager paths - ResMgr::pushPath(progDir/"Scenario Editor"/"graphics.exd"/"mac"); - ResMgr::pushPath(progDir/"Scenario Editor"/"graphics.exd"/"mac"/"cursors"); + ResMgr::pushPath(progDir/"data"/"graphics"); + ResMgr::pushPath(progDir/"data"/"cursors"); ResMgr::pushPath(progDir/"data"/"fonts"); ResMgr::pushPath(progDir/"data"/"strings"); - ResMgr::pushPath(progDir/"Scenario Editor"/"sounds.exa"); + ResMgr::pushPath(progDir/"data"/"sounds"); // We need a location for temporary files, primarily for loading and saving operations // The scenario editor may also use this location as "scratch space" @@ -57,6 +56,7 @@ void init_directories(const char* exec_path) { tempDir /= ".oboe/blades"; #endif // __APPLE__ #endif // _Win32||_Win64 + scenDir = tempDir/"Scenarios"; tempDir /= "Temporary Files"; // Depending on the build environment, we may need to redirect stdout and stderr. diff --git a/src/tools/fileio_scen.cpp b/src/tools/fileio_scen.cpp index 0f1e5cba..b5eb82bc 100644 --- a/src/tools/fileio_scen.cpp +++ b/src/tools/fileio_scen.cpp @@ -64,14 +64,14 @@ bool load_scenario(fs::path file_to_load, cScenario& scenario, bool only_header) // Before loading a scenario, we may need to pop scenario resource paths. fs::path graphics_path = ResMgr::popPath(); for(auto p : graphics_path) { - if(p.string() == "graphics.exd") { + if(p.string() == "graphics") { ResMgr::pushPath(graphics_path); break; } } fs::path sounds_path = ResMgr::popPath(); for(auto p : sounds_path) { - if(p.string() == "sounds.exa") { + if(p.string() == "sounds") { ResMgr::pushPath(sounds_path); break; }