From 49aaa21b87d93541a4cf441d41880881a8db0b84 Mon Sep 17 00:00:00 2001 From: Douglas Mencken Date: Fri, 16 Feb 2024 17:32:14 +0000 Subject: [PATCH] =?UTF-8?q?one=20of=20two=20identical=20files=20for=20?= =?UTF-8?q?=E2=80=9Cno=20floor=E2=80=9D=20tiles=20are=20enough,=20yeah?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and be sure, it’s —(somehow)— related to the issue #61 for each’n‘every set of graphics except for gfx.simple which I’ll deal with later all of such pairs are (were) really the same files, up to every single bit ... all but “blacktooth-nofloor-east|west” in gfx.2009 and gfx $ sha256sum gamedata/gfx.2009/blacktooth.png/blacktooth-nofloor-*st.png 1afce93d02f7dbb2333331b74bf7c7267b477ec4fcfb4bf96747428718add714 gamedata/gfx.2009/blacktooth.png/blacktooth-nofloor-east.png e6df4bab14032d9e96dd97bfffa79269724152539a531dfc236e08b39d54e269 gamedata/gfx.2009/blacktooth.png/blacktooth-nofloor-west.png to figure out the difference in pixels, I used imagemagick’s compare $ compare -metric ae \ gamedata/gfx.2009/blacktooth.png/blacktooth-nofloor-east.png \ gamedata/gfx.2009/blacktooth.png/blacktooth-nofloor-west.png \ blacktooth-nofloor-east-west-diff.png and finally gfx/blacktooth-nofloor-east.png became gfx/blacktooth-nofloor-y.png gfx.2009/blacktooth-nofloor-west.png became gfx.2009/blacktooth-nofloor-y.png --- gamedata/gfx.2003/Makefile.am | 44 +++++++----------- .../blacktooth-nofloor-south.png | Bin 516 -> 0 bytes .../blacktooth-nofloor-west.png | Bin 516 -> 0 bytes ...oor-north.png => blacktooth-nofloor-x.png} | Bin ...loor-east.png => blacktooth-nofloor-y.png} | Bin .../byblos.png/byblos-nofloor-south.png | Bin 481 -> 0 bytes .../byblos.png/byblos-nofloor-west.png | Bin 536 -> 0 bytes ...nofloor-north.png => byblos-nofloor-x.png} | Bin ...-nofloor-east.png => byblos-nofloor-y.png} | Bin .../egyptus.png/egyptus-nofloor-south.png | Bin 518 -> 0 bytes .../egyptus.png/egyptus-nofloor-west.png | Bin 602 -> 0 bytes ...ofloor-north.png => egyptus-nofloor-x.png} | Bin ...nofloor-east.png => egyptus-nofloor-y.png} | Bin .../gfx.2003/jail.png/jail-nofloor-south.png | Bin 454 -> 0 bytes .../gfx.2003/jail.png/jail-nofloor-west.png | Bin 463 -> 0 bytes ...l-nofloor-north.png => jail-nofloor-x.png} | Bin ...il-nofloor-east.png => jail-nofloor-y.png} | Bin ...nofloor-north.png => market-nofloor-x.png} | Bin ...-nofloor-east.png => market-nofloor-y.png} | Bin ...n-nofloor-north.png => moon-nofloor-x.png} | Bin ...on-nofloor-east.png => moon-nofloor-y.png} | Bin .../penitentiary-nofloor-south.png | Bin 534 -> 0 bytes .../penitentiary-nofloor-west.png | Bin 560 -> 0 bytes ...r-north.png => penitentiary-nofloor-x.png} | Bin ...or-east.png => penitentiary-nofloor-y.png} | Bin .../safari.png/safari-nofloor-south.png | Bin 493 -> 0 bytes .../safari.png/safari-nofloor-west.png | Bin 544 -> 0 bytes ...nofloor-north.png => safari-nofloor-x.png} | Bin ...-nofloor-east.png => safari-nofloor-y.png} | Bin gamedata/gfx.2009/Makefile.am | 44 +++++++----------- ...oor-north.png => blacktooth-nofloor-x.png} | Bin ...loor-west.png => blacktooth-nofloor-y.png} | Bin ...nofloor-north.png => byblos-nofloor-x.png} | Bin ...-nofloor-east.png => byblos-nofloor-y.png} | Bin ...ofloor-north.png => egyptus-nofloor-x.png} | Bin ...nofloor-east.png => egyptus-nofloor-y.png} | Bin .../gfx.2009/jail.png/jail-nofloor-south.png | Bin 304 -> 0 bytes .../gfx.2009/jail.png/jail-nofloor-west.png | Bin 309 -> 0 bytes ...l-nofloor-north.png => jail-nofloor-x.png} | Bin ...il-nofloor-east.png => jail-nofloor-y.png} | Bin ...nofloor-north.png => market-nofloor-x.png} | Bin ...-nofloor-east.png => market-nofloor-y.png} | Bin ...n-nofloor-north.png => moon-nofloor-x.png} | Bin ...on-nofloor-east.png => moon-nofloor-y.png} | Bin ...r-north.png => penitentiary-nofloor-x.png} | Bin ...or-east.png => penitentiary-nofloor-y.png} | Bin ...nofloor-north.png => safari-nofloor-x.png} | Bin ...-nofloor-east.png => safari-nofloor-y.png} | Bin gamedata/gfx.riderx/Makefile.am | 44 +++++++----------- .../blacktooth-nofloor-south.png | Bin 548 -> 0 bytes .../blacktooth-nofloor-west.png | Bin 685 -> 0 bytes ...oor-north.png => blacktooth-nofloor-x.png} | Bin ...loor-east.png => blacktooth-nofloor-y.png} | Bin .../byblos.png/byblos-nofloor-south.png | Bin 689 -> 0 bytes .../byblos.png/byblos-nofloor-west.png | Bin 813 -> 0 bytes ...nofloor-north.png => byblos-nofloor-x.png} | Bin ...-nofloor-east.png => byblos-nofloor-y.png} | Bin .../egyptus.png/egyptus-nofloor-south.png | Bin 761 -> 0 bytes .../egyptus.png/egyptus-nofloor-west.png | Bin 554 -> 0 bytes ...ofloor-north.png => egyptus-nofloor-x.png} | Bin ...nofloor-east.png => egyptus-nofloor-y.png} | Bin .../jail.png/jail-nofloor-south.png | Bin 537 -> 0 bytes .../gfx.riderx/jail.png/jail-nofloor-west.png | Bin 703 -> 0 bytes ...l-nofloor-north.png => jail-nofloor-x.png} | Bin ...il-nofloor-east.png => jail-nofloor-y.png} | Bin ...nofloor-north.png => market-nofloor-x.png} | Bin ...-nofloor-east.png => market-nofloor-y.png} | Bin ...n-nofloor-north.png => moon-nofloor-x.png} | Bin ...on-nofloor-east.png => moon-nofloor-y.png} | Bin ...r-north.png => penitentiary-nofloor-x.png} | Bin ...or-east.png => penitentiary-nofloor-y.png} | Bin .../safari.png/safari-nofloor-south.png | Bin 551 -> 0 bytes .../safari.png/safari-nofloor-west.png | Bin 758 -> 0 bytes ...nofloor-north.png => safari-nofloor-x.png} | Bin ...-nofloor-east.png => safari-nofloor-y.png} | Bin gamedata/gfx/Makefile.am | 44 +++++++----------- .../blacktooth-nofloor-east.png | Bin 324 -> 0 bytes .../blacktooth-nofloor-north.png | Bin 324 -> 0 bytes .../blacktooth-nofloor-south.png | Bin 324 -> 0 bytes .../blacktooth-nofloor-west.png | Bin 326 -> 0 bytes .../blacktooth.png/blacktooth-nofloor-x.png} | Bin .../blacktooth.png/blacktooth-nofloor-y.png} | Bin .../gfx/byblos.png/byblos-nofloor-east.png | Bin 309 -> 0 bytes .../gfx/byblos.png/byblos-nofloor-north.png | Bin 304 -> 0 bytes .../gfx/byblos.png/byblos-nofloor-south.png | Bin 304 -> 0 bytes .../gfx/byblos.png/byblos-nofloor-west.png | Bin 309 -> 0 bytes .../byblos.png/byblos-nofloor-x.png} | Bin .../byblos.png/byblos-nofloor-y.png} | Bin .../gfx/egyptus.png/egyptus-nofloor-east.png | Bin 309 -> 0 bytes .../gfx/egyptus.png/egyptus-nofloor-north.png | Bin 304 -> 0 bytes .../gfx/egyptus.png/egyptus-nofloor-south.png | Bin 304 -> 0 bytes .../gfx/egyptus.png/egyptus-nofloor-west.png | Bin 309 -> 0 bytes .../egyptus.png/egyptus-nofloor-x.png} | Bin .../egyptus.png/egyptus-nofloor-y.png} | Bin gamedata/gfx/jail.png/jail-nofloor-east.png | Bin 313 -> 0 bytes gamedata/gfx/jail.png/jail-nofloor-north.png | Bin 309 -> 0 bytes gamedata/gfx/jail.png/jail-nofloor-south.png | Bin 309 -> 0 bytes gamedata/gfx/jail.png/jail-nofloor-west.png | Bin 313 -> 0 bytes .../jail.png/jail-nofloor-x.png} | Bin .../jail.png/jail-nofloor-y.png} | Bin ...nofloor-north.png => market-nofloor-x.png} | Bin ...-nofloor-east.png => market-nofloor-y.png} | Bin ...n-nofloor-north.png => moon-nofloor-x.png} | Bin ...on-nofloor-east.png => moon-nofloor-y.png} | Bin .../penitentiary-nofloor-east.png | Bin 357 -> 0 bytes .../penitentiary-nofloor-north.png | Bin 354 -> 0 bytes .../penitentiary-nofloor-south.png | Bin 354 -> 0 bytes .../penitentiary-nofloor-west.png | Bin 357 -> 0 bytes .../penitentiary-nofloor-x.png} | Bin .../penitentiary-nofloor-y.png} | Bin .../gfx/safari.png/safari-nofloor-east.png | Bin 313 -> 0 bytes .../gfx/safari.png/safari-nofloor-north.png | Bin 309 -> 0 bytes .../gfx/safari.png/safari-nofloor-south.png | Bin 309 -> 0 bytes .../gfx/safari.png/safari-nofloor-west.png | Bin 313 -> 0 bytes .../safari.png/safari-nofloor-x.png} | Bin .../safari.png/safari-nofloor-y.png} | Bin source/FloorTile.cpp | 2 +- source/FloorTile.hpp | 4 +- source/GameManager.hpp | 2 +- source/Mediator.cpp | 15 +++--- source/PoolOfPictures.cpp | 37 +++++++++++---- source/PoolOfPictures.hpp | 4 ++ source/Room.cpp | 4 +- source/RoomBuilder.cpp | 27 ++++++----- source/guiactions/ShowAuthors.cpp | 4 +- 125 files changed, 123 insertions(+), 152 deletions(-) delete mode 100644 gamedata/gfx.2003/blacktooth.png/blacktooth-nofloor-south.png delete mode 100644 gamedata/gfx.2003/blacktooth.png/blacktooth-nofloor-west.png rename gamedata/gfx.2003/blacktooth.png/{blacktooth-nofloor-north.png => blacktooth-nofloor-x.png} (100%) rename gamedata/gfx.2003/blacktooth.png/{blacktooth-nofloor-east.png => blacktooth-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx.2003/byblos.png/byblos-nofloor-south.png delete mode 100644 gamedata/gfx.2003/byblos.png/byblos-nofloor-west.png rename gamedata/gfx.2003/byblos.png/{byblos-nofloor-north.png => byblos-nofloor-x.png} (100%) rename gamedata/gfx.2003/byblos.png/{byblos-nofloor-east.png => byblos-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx.2003/egyptus.png/egyptus-nofloor-south.png delete mode 100644 gamedata/gfx.2003/egyptus.png/egyptus-nofloor-west.png rename gamedata/gfx.2003/egyptus.png/{egyptus-nofloor-north.png => egyptus-nofloor-x.png} (100%) rename gamedata/gfx.2003/egyptus.png/{egyptus-nofloor-east.png => egyptus-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx.2003/jail.png/jail-nofloor-south.png delete mode 100644 gamedata/gfx.2003/jail.png/jail-nofloor-west.png rename gamedata/gfx.2003/jail.png/{jail-nofloor-north.png => jail-nofloor-x.png} (100%) rename gamedata/gfx.2003/jail.png/{jail-nofloor-east.png => jail-nofloor-y.png} (100%) rename gamedata/gfx.2003/market.png/{market-nofloor-north.png => market-nofloor-x.png} (100%) rename gamedata/gfx.2003/market.png/{market-nofloor-east.png => market-nofloor-y.png} (100%) rename gamedata/gfx.2003/moon.png/{moon-nofloor-north.png => moon-nofloor-x.png} (100%) rename gamedata/gfx.2003/moon.png/{moon-nofloor-east.png => moon-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx.2003/penitentiary.png/penitentiary-nofloor-south.png delete mode 100644 gamedata/gfx.2003/penitentiary.png/penitentiary-nofloor-west.png rename gamedata/gfx.2003/penitentiary.png/{penitentiary-nofloor-north.png => penitentiary-nofloor-x.png} (100%) rename gamedata/gfx.2003/penitentiary.png/{penitentiary-nofloor-east.png => penitentiary-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx.2003/safari.png/safari-nofloor-south.png delete mode 100644 gamedata/gfx.2003/safari.png/safari-nofloor-west.png rename gamedata/gfx.2003/safari.png/{safari-nofloor-north.png => safari-nofloor-x.png} (100%) rename gamedata/gfx.2003/safari.png/{safari-nofloor-east.png => safari-nofloor-y.png} (100%) rename gamedata/gfx.2009/blacktooth.png/{blacktooth-nofloor-north.png => blacktooth-nofloor-x.png} (100%) rename gamedata/gfx.2009/blacktooth.png/{blacktooth-nofloor-west.png => blacktooth-nofloor-y.png} (100%) rename gamedata/gfx.2009/byblos.png/{byblos-nofloor-north.png => byblos-nofloor-x.png} (100%) rename gamedata/gfx.2009/byblos.png/{byblos-nofloor-east.png => byblos-nofloor-y.png} (100%) rename gamedata/gfx.2009/egyptus.png/{egyptus-nofloor-north.png => egyptus-nofloor-x.png} (100%) rename gamedata/gfx.2009/egyptus.png/{egyptus-nofloor-east.png => egyptus-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx.2009/jail.png/jail-nofloor-south.png delete mode 100644 gamedata/gfx.2009/jail.png/jail-nofloor-west.png rename gamedata/gfx.2009/jail.png/{jail-nofloor-north.png => jail-nofloor-x.png} (100%) rename gamedata/gfx.2009/jail.png/{jail-nofloor-east.png => jail-nofloor-y.png} (100%) rename gamedata/gfx.2009/market.png/{market-nofloor-north.png => market-nofloor-x.png} (100%) rename gamedata/gfx.2009/market.png/{market-nofloor-east.png => market-nofloor-y.png} (100%) rename gamedata/gfx.2009/moon.png/{moon-nofloor-north.png => moon-nofloor-x.png} (100%) rename gamedata/gfx.2009/moon.png/{moon-nofloor-east.png => moon-nofloor-y.png} (100%) rename gamedata/gfx.2009/penitentiary.png/{penitentiary-nofloor-north.png => penitentiary-nofloor-x.png} (100%) rename gamedata/gfx.2009/penitentiary.png/{penitentiary-nofloor-east.png => penitentiary-nofloor-y.png} (100%) rename gamedata/gfx.2009/safari.png/{safari-nofloor-north.png => safari-nofloor-x.png} (100%) rename gamedata/gfx.2009/safari.png/{safari-nofloor-east.png => safari-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx.riderx/blacktooth.png/blacktooth-nofloor-south.png delete mode 100644 gamedata/gfx.riderx/blacktooth.png/blacktooth-nofloor-west.png rename gamedata/gfx.riderx/blacktooth.png/{blacktooth-nofloor-north.png => blacktooth-nofloor-x.png} (100%) rename gamedata/gfx.riderx/blacktooth.png/{blacktooth-nofloor-east.png => blacktooth-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx.riderx/byblos.png/byblos-nofloor-south.png delete mode 100644 gamedata/gfx.riderx/byblos.png/byblos-nofloor-west.png rename gamedata/gfx.riderx/byblos.png/{byblos-nofloor-north.png => byblos-nofloor-x.png} (100%) rename gamedata/gfx.riderx/byblos.png/{byblos-nofloor-east.png => byblos-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx.riderx/egyptus.png/egyptus-nofloor-south.png delete mode 100644 gamedata/gfx.riderx/egyptus.png/egyptus-nofloor-west.png rename gamedata/gfx.riderx/egyptus.png/{egyptus-nofloor-north.png => egyptus-nofloor-x.png} (100%) rename gamedata/gfx.riderx/egyptus.png/{egyptus-nofloor-east.png => egyptus-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx.riderx/jail.png/jail-nofloor-south.png delete mode 100644 gamedata/gfx.riderx/jail.png/jail-nofloor-west.png rename gamedata/gfx.riderx/jail.png/{jail-nofloor-north.png => jail-nofloor-x.png} (100%) rename gamedata/gfx.riderx/jail.png/{jail-nofloor-east.png => jail-nofloor-y.png} (100%) rename gamedata/gfx.riderx/market.png/{market-nofloor-north.png => market-nofloor-x.png} (100%) rename gamedata/gfx.riderx/market.png/{market-nofloor-east.png => market-nofloor-y.png} (100%) rename gamedata/gfx.riderx/moon.png/{moon-nofloor-north.png => moon-nofloor-x.png} (100%) rename gamedata/gfx.riderx/moon.png/{moon-nofloor-east.png => moon-nofloor-y.png} (100%) rename gamedata/gfx.riderx/penitentiary.png/{penitentiary-nofloor-north.png => penitentiary-nofloor-x.png} (100%) rename gamedata/gfx.riderx/penitentiary.png/{penitentiary-nofloor-east.png => penitentiary-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx.riderx/safari.png/safari-nofloor-south.png delete mode 100644 gamedata/gfx.riderx/safari.png/safari-nofloor-west.png rename gamedata/gfx.riderx/safari.png/{safari-nofloor-north.png => safari-nofloor-x.png} (100%) rename gamedata/gfx.riderx/safari.png/{safari-nofloor-east.png => safari-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx/blacktooth.png/blacktooth-nofloor-east.png delete mode 100644 gamedata/gfx/blacktooth.png/blacktooth-nofloor-north.png delete mode 100644 gamedata/gfx/blacktooth.png/blacktooth-nofloor-south.png delete mode 100644 gamedata/gfx/blacktooth.png/blacktooth-nofloor-west.png rename gamedata/{gfx.2009/blacktooth.png/blacktooth-nofloor-south.png => gfx/blacktooth.png/blacktooth-nofloor-x.png} (100%) rename gamedata/{gfx.2009/blacktooth.png/blacktooth-nofloor-east.png => gfx/blacktooth.png/blacktooth-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx/byblos.png/byblos-nofloor-east.png delete mode 100644 gamedata/gfx/byblos.png/byblos-nofloor-north.png delete mode 100644 gamedata/gfx/byblos.png/byblos-nofloor-south.png delete mode 100644 gamedata/gfx/byblos.png/byblos-nofloor-west.png rename gamedata/{gfx.2009/egyptus.png/egyptus-nofloor-south.png => gfx/byblos.png/byblos-nofloor-x.png} (100%) rename gamedata/{gfx.2009/egyptus.png/egyptus-nofloor-west.png => gfx/byblos.png/byblos-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx/egyptus.png/egyptus-nofloor-east.png delete mode 100644 gamedata/gfx/egyptus.png/egyptus-nofloor-north.png delete mode 100644 gamedata/gfx/egyptus.png/egyptus-nofloor-south.png delete mode 100644 gamedata/gfx/egyptus.png/egyptus-nofloor-west.png rename gamedata/{gfx.2009/byblos.png/byblos-nofloor-south.png => gfx/egyptus.png/egyptus-nofloor-x.png} (100%) rename gamedata/{gfx.2009/byblos.png/byblos-nofloor-west.png => gfx/egyptus.png/egyptus-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx/jail.png/jail-nofloor-east.png delete mode 100644 gamedata/gfx/jail.png/jail-nofloor-north.png delete mode 100644 gamedata/gfx/jail.png/jail-nofloor-south.png delete mode 100644 gamedata/gfx/jail.png/jail-nofloor-west.png rename gamedata/{gfx.2009/penitentiary.png/penitentiary-nofloor-south.png => gfx/jail.png/jail-nofloor-x.png} (100%) rename gamedata/{gfx.2009/penitentiary.png/penitentiary-nofloor-west.png => gfx/jail.png/jail-nofloor-y.png} (100%) rename gamedata/gfx/market.png/{market-nofloor-north.png => market-nofloor-x.png} (100%) rename gamedata/gfx/market.png/{market-nofloor-east.png => market-nofloor-y.png} (100%) rename gamedata/gfx/moon.png/{moon-nofloor-north.png => moon-nofloor-x.png} (100%) rename gamedata/gfx/moon.png/{moon-nofloor-east.png => moon-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx/penitentiary.png/penitentiary-nofloor-east.png delete mode 100644 gamedata/gfx/penitentiary.png/penitentiary-nofloor-north.png delete mode 100644 gamedata/gfx/penitentiary.png/penitentiary-nofloor-south.png delete mode 100644 gamedata/gfx/penitentiary.png/penitentiary-nofloor-west.png rename gamedata/{gfx.riderx/penitentiary.png/penitentiary-nofloor-south.png => gfx/penitentiary.png/penitentiary-nofloor-x.png} (100%) rename gamedata/{gfx.riderx/penitentiary.png/penitentiary-nofloor-west.png => gfx/penitentiary.png/penitentiary-nofloor-y.png} (100%) delete mode 100644 gamedata/gfx/safari.png/safari-nofloor-east.png delete mode 100644 gamedata/gfx/safari.png/safari-nofloor-north.png delete mode 100644 gamedata/gfx/safari.png/safari-nofloor-south.png delete mode 100644 gamedata/gfx/safari.png/safari-nofloor-west.png rename gamedata/{gfx.2009/safari.png/safari-nofloor-south.png => gfx/safari.png/safari-nofloor-x.png} (100%) rename gamedata/{gfx.2009/safari.png/safari-nofloor-west.png => gfx/safari.png/safari-nofloor-y.png} (100%) diff --git a/gamedata/gfx.2003/Makefile.am b/gamedata/gfx.2003/Makefile.am index f7e9dc62..aa5019cb 100644 --- a/gamedata/gfx.2003/Makefile.am +++ b/gamedata/gfx.2003/Makefile.am @@ -97,8 +97,6 @@ gamedatagfx2003_DATA = item.png/diver-shadows.png \ item.png/toaster.png \ item.png/fish-shadows.png \ blacktooth.png/blacktooth-nofloor-sw.png \ - blacktooth.png/blacktooth-nofloor-south.png \ - blacktooth.png/blacktooth-nofloor-east.png \ blacktooth.png/blacktooth-wall-x-1.png \ blacktooth.png/blacktooth-floor-west.png \ blacktooth.png/blacktooth-door-north.png \ @@ -110,10 +108,10 @@ gamedatagfx2003_DATA = item.png/diver-shadows.png \ blacktooth.png/blacktooth-mortalfloor.png \ blacktooth.png/blacktooth-floor-north.png \ blacktooth.png/blacktooth-wall-y-3.png \ - blacktooth.png/blacktooth-nofloor-west.png \ - blacktooth.png/blacktooth-nofloor-north.png \ + blacktooth.png/blacktooth-nofloor-x.png \ blacktooth.png/blacktooth-wall-x-3.png \ blacktooth.png/blacktooth-column-capital-north.png \ + blacktooth.png/blacktooth-nofloor-y.png \ blacktooth.png/blacktooth-column-capital-east.png \ blacktooth.png/blacktooth-door-south.png \ blacktooth.png/blacktooth-column-capital-west.png \ @@ -124,17 +122,15 @@ gamedatagfx2003_DATA = item.png/diver-shadows.png \ blacktooth.png/blacktooth-wall-y-2.png \ blacktooth.png/blacktooth-column-shaft-north.png \ blacktooth.png/blacktooth-column-capital-south.png \ + jail.png/jail-nofloor-y.png \ jail.png/jail-column-capital-east.png \ jail.png/jail-wall-x.png \ - jail.png/jail-nofloor-west.png \ jail.png/jail-floor-west.png \ jail.png/jail-floor-sw.png \ - jail.png/jail-nofloor-south.png \ jail.png/jail-floor-north.png \ jail.png/jail-door-north.png \ jail.png/jail-floor.png \ jail.png/jail-column-shaft-north.png \ - jail.png/jail-nofloor-north.png \ jail.png/jail-mortalfloor.png \ jail.png/jail-wall-y.png \ jail.png/jail-column-capital-south.png \ @@ -144,10 +140,10 @@ gamedatagfx2003_DATA = item.png/diver-shadows.png \ jail.png/jail-door-west.png \ jail.png/jail-door-south.png \ jail.png/jail-nofloor-sw.png \ + jail.png/jail-nofloor-x.png \ jail.png/jail-door-east.png \ jail.png/jail-floor-south.png \ jail.png/jail-column-capital-north.png \ - jail.png/jail-nofloor-east.png \ market.png/market-door-north.png \ market.png/market-floor-west.png \ market.png/market-column-capital-north.png \ @@ -155,12 +151,12 @@ gamedatagfx2003_DATA = item.png/diver-shadows.png \ market.png/market-wall-y-3.png \ market.png/market-column-shaft-north.png \ market.png/market-wall-x-3.png \ + market.png/market-nofloor-x.png \ market.png/market-column-capital-east.png \ market.png/market-floor-north.png \ market.png/market-mortalfloor.png \ market.png/market-wall-y-1.png \ market.png/market-door-east.png \ - market.png/market-nofloor-east.png \ market.png/market-floor-sw.png \ market.png/market-door-south.png \ market.png/market-wall-x-1.png \ @@ -170,7 +166,7 @@ gamedatagfx2003_DATA = item.png/diver-shadows.png \ market.png/market-wall-y-2.png \ market.png/market-floor-east.png \ market.png/market-floor.png \ - market.png/market-nofloor-north.png \ + market.png/market-nofloor-y.png \ market.png/market-floor-south.png \ market.png/market-column-capital-south.png \ moon.png/moon-wall-y-4.png \ @@ -180,6 +176,7 @@ gamedatagfx2003_DATA = item.png/diver-shadows.png \ moon.png/moon-column-capital-west.png \ moon.png/moon-wall-x-3.png \ moon.png/moon-wall-x-4.png \ + moon.png/moon-nofloor-x.png \ moon.png/moon-door-north.png \ moon.png/moon-wall-y-1.png \ moon.png/moon-column-capital-east.png \ @@ -188,21 +185,21 @@ gamedatagfx2003_DATA = item.png/diver-shadows.png \ moon.png/moon-column-shaft-north.png \ moon.png/moon-wall-y-3.png \ moon.png/moon-door-west.png \ + moon.png/moon-nofloor-y.png \ moon.png/moon-mortalfloor.png \ moon.png/moon-door-south.png \ moon.png/moon-floor-sw.png \ moon.png/moon-column-capital-north.png \ moon.png/moon-column-capital-south.png \ - moon.png/moon-nofloor-north.png \ moon.png/moon-floor.png \ moon.png/moon-floor-north.png \ moon.png/moon-column-shaft-east.png \ - moon.png/moon-nofloor-east.png \ moon.png/moon-wall-y-2.png \ moon.png/moon-wall-x-1.png \ byblos.png/byblos-floor-sw.png \ + byblos.png/byblos-nofloor-y.png \ + byblos.png/byblos-nofloor-x.png \ byblos.png/byblos-column-capital-east.png \ - byblos.png/byblos-nofloor-south.png \ byblos.png/byblos-floor.png \ byblos.png/byblos-wall-x-2.png \ byblos.png/byblos-nofloor-sw.png \ @@ -210,10 +207,8 @@ gamedatagfx2003_DATA = item.png/diver-shadows.png \ byblos.png/byblos-door-west.png \ byblos.png/byblos-column-capital-north.png \ byblos.png/byblos-floor-south.png \ - byblos.png/byblos-nofloor-north.png \ byblos.png/byblos-floor-west.png \ byblos.png/byblos-wall-y-2.png \ - byblos.png/byblos-nofloor-east.png \ byblos.png/byblos-door-south.png \ byblos.png/byblos-door-north.png \ byblos.png/byblos-column-capital-south.png \ @@ -224,18 +219,16 @@ gamedatagfx2003_DATA = item.png/diver-shadows.png \ byblos.png/byblos-door-east.png \ byblos.png/byblos-wall-y-1.png \ byblos.png/byblos-column-shaft-north.png \ - byblos.png/byblos-nofloor-west.png \ byblos.png/byblos-column-capital-west.png \ egyptus.png/egyptus-floor-sw.png \ egyptus.png/egyptus-mortalfloor.png \ egyptus.png/egyptus-column-shaft-north.png \ - egyptus.png/egyptus-nofloor-north.png \ + egyptus.png/egyptus-nofloor-y.png \ egyptus.png/egyptus-door-south.png \ egyptus.png/egyptus-column-capital-west.png \ egyptus.png/egyptus-floor-west.png \ - egyptus.png/egyptus-nofloor-south.png \ + egyptus.png/egyptus-nofloor-x.png \ egyptus.png/egyptus-door-east.png \ - egyptus.png/egyptus-nofloor-east.png \ egyptus.png/egyptus-wall-y-2.png \ egyptus.png/egyptus-door-north.png \ egyptus.png/egyptus-door-west.png \ @@ -245,7 +238,6 @@ gamedatagfx2003_DATA = item.png/diver-shadows.png \ egyptus.png/egyptus-wall-y-1.png \ egyptus.png/egyptus-nofloor-sw.png \ egyptus.png/egyptus-column-capital-north.png \ - egyptus.png/egyptus-nofloor-west.png \ egyptus.png/egyptus-floor-north.png \ egyptus.png/egyptus-column-capital-south.png \ egyptus.png/egyptus-floor.png \ @@ -259,23 +251,21 @@ gamedatagfx2003_DATA = item.png/diver-shadows.png \ penitentiary.png/penitentiary-column-capital-west.png \ penitentiary.png/penitentiary-floor-sw.png \ penitentiary.png/penitentiary-floor-west.png \ - penitentiary.png/penitentiary-nofloor-south.png \ penitentiary.png/penitentiary-wall-x-2.png \ penitentiary.png/penitentiary-column-capital-south.png \ penitentiary.png/penitentiary-door-south.png \ penitentiary.png/penitentiary-column-shaft-east.png \ penitentiary.png/penitentiary-floor-south.png \ + penitentiary.png/penitentiary-nofloor-y.png \ penitentiary.png/penitentiary-mortalfloor.png \ penitentiary.png/penitentiary-door-east.png \ penitentiary.png/penitentiary-floor-east.png \ penitentiary.png/penitentiary-wall-x-1.png \ penitentiary.png/penitentiary-floor.png \ penitentiary.png/penitentiary-column-capital-east.png \ - penitentiary.png/penitentiary-nofloor-west.png \ - penitentiary.png/penitentiary-nofloor-east.png \ + penitentiary.png/penitentiary-nofloor-x.png \ penitentiary.png/penitentiary-door-west.png \ penitentiary.png/penitentiary-door-north.png \ - penitentiary.png/penitentiary-nofloor-north.png \ penitentiary.png/penitentiary-wall-y-1.png \ penitentiary.png/penitentiary-nofloor-sw.png \ safari.png/safari-wall-x-2.png \ @@ -287,12 +277,11 @@ gamedatagfx2003_DATA = item.png/diver-shadows.png \ safari.png/safari-column-capital-south.png \ safari.png/safari-door-south.png \ safari.png/safari-column-capital-west.png \ + safari.png/safari-nofloor-y.png \ + safari.png/safari-nofloor-x.png \ safari.png/safari-wall-x-1.png \ - safari.png/safari-nofloor-west.png \ safari.png/safari-column-shaft-east.png \ - safari.png/safari-nofloor-north.png \ safari.png/safari-wall-y-2.png \ - safari.png/safari-nofloor-east.png \ safari.png/safari-door-west.png \ safari.png/safari-wall-y-1.png \ safari.png/safari-door-north.png \ @@ -301,7 +290,6 @@ gamedatagfx2003_DATA = item.png/diver-shadows.png \ safari.png/safari-column-capital-north.png \ safari.png/safari-door-east.png \ safari.png/safari-floor-south.png \ - safari.png/safari-nofloor-south.png \ safari.png/safari-floor-north.png \ safari.png/safari-column-shaft-north.png \ safari.png/safari-wall-x-3.png \ diff --git a/gamedata/gfx.2003/blacktooth.png/blacktooth-nofloor-south.png b/gamedata/gfx.2003/blacktooth.png/blacktooth-nofloor-south.png deleted file mode 100644 index e65c7eb687babf91ee14fa51e4af9355e2fb2dcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 516 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!3-pi_Q|sXDaPU;cPEB*=VV?2Ih+L^k;M!Q z+(IDCc-L1;9itikdc|}oS#>gT2zu+q@WRyU!GbN z;HiuT2jU{ehb-=1&({-^9n9t~ERUi2Q#&jiFv9bxB8(;yLTJ3=0;uJf8eTD4&(VIJe@9N8Dpw zhJ<~M*-Myo>j1Lle*1p=Sd$jgEGsB&AcjUE_(~l;9*FE5$KG$sN zZIh$64Xuwa#%|owTgacVv^+J`zPp;?b^hNkCHe~IXTN{PTXQ!4J1Bhq|7T{Hvm@tt TE9)V3AeX_@)z4*}Q$iB}>#x_! diff --git a/gamedata/gfx.2003/blacktooth.png/blacktooth-nofloor-west.png b/gamedata/gfx.2003/blacktooth.png/blacktooth-nofloor-west.png deleted file mode 100644 index f1ebe741354fd436d515f09b1a93b1f6f4dd6739..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 516 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!3-pi_Q|sXDaPU;cPEB*=VV?2Ih+L^k;M!Q z+(IDCc-L1;9itikdc|}oS#>gT2zu+q@WRyU!GbN z;HD0*s$p`q|#GFe=;4ONjX{%h(~2ENFN}ms?6X z;K*geqUCWh-x=DbuyPxgDdcst2q+f$Z1@`Rel~~0+9wjp7yBwAQW?a8RK1qvb}Wz1 z;Fyp${p{P$>B&luVy69m>vcmY|2oG`yJ@XquTtD=EYc@th0f{wdGLmS{QpLe?P}qd zGP=v^Dm9$ew=4`gb4f6xW77%#qPILTnykfHk`9KujrNW%5d@4=$XzuOyBnWwPuQq4P7LnQWra?VcWckE7ou)yr0e7P%0D_ z^}NNgelBlhQXs-HL32ra0xsb^wf`2U}oq3D|h=Z9^xL6OPe>FVdQ I&MBb@0EO($TL1t6 diff --git a/gamedata/gfx.2003/byblos.png/byblos-nofloor-west.png b/gamedata/gfx.2003/byblos.png/byblos-nofloor-west.png deleted file mode 100644 index 91834bff23a1712b08b1e72b267e33b8f16853b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 536 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!3-pi_Q|sXDaPU;cPEB*=VV?2Ih+L^k;M!Q z+(IDCcE(wrq;l%#g<#EowincZEbPd+Tyjh z+G%eK5P9uw3EJBebgaeeSWD0`AY%#;MID=xd~8nCu{p`-rUadv5_N7$^0_%t=YZU$ z+1KU-U7M49Z7C3CUt3yyZEg0owZ+%AR^MBid~a#?y`{zX)@I*ZTYL{FvKNS^Jl|UV zd@m5S{Ac(NblsB7m+yg;a*1n1NpOBzNqJ&XDua7bVnIe`vU7f3S!z*9YLS9QKz?~@ zQGm1Nwq?Z&fy!Tcx;TbZ%z1MqTBu1uqAk(t#(K5Pu9c0FGb5wI-qjaIJ~ok6Z{6)C z_95oL@5XbJ*h?MQOAg#;NY&)b=#pu?V>4Ol!o}tp9s(zPuQ4(gGTlrOwVrlR*>O>o zTP*8U#T_@e1h?~T`KQvu6#v5N^@M~2-4?OS-gZ`ZDjT0N&Z=HM?TGWK3Y(`l8!Ik! zRor4?yL`9WA(H!1s*lTj^_xACZpn{wdqc(VY&1B^+sR*i%$dRI!=Zeanm_yt^7SGe zg6}o___Q!)x5v-6UtJ0TPx#32;bRa{vGf5&!@T5&_cPe*6Fc0E$pdR7L;){~{e3CLkFmAsuULT5eK7gnMg@ zXj6=PYn+T)oQz|flzW_~2lY6z4 zgteT5wVZ^&nTNoqj>epX#+;1CrG&<35 z;m&3FmgOIN_l~P)0Sj2b0@VWO1OSXg2LQmmu47{WAeo;QUTO&7G&EUznC0Q6n4&kBm&#j~aX44mY) zrDVmb*|h=89cK^lPx#32;bRa{vGf5&!@T5&_cPe*6Fc0MAfNR7L;){{a910RaIP5egU+4o^ipSwb~p zR!M7XT77L@e`8UMdux=8W0rt#mw|7alX{$tW1N(GpNn>*h;^fnd!>wXrHp%}lyjw& zd!~(hr8egYUJ3@4aL2!IJdElJ~WQ_r{d}0RI300I2c{I{*LxBXmVrbW?9;ba!ELWdKKV zVQ^?^V?%Flc4cyOWpW@WP;Yl-a!^Alwx)BT0002>Nkl*}UbMGLV@u2_^00O|@0Ky?gK%?L|On_?_Ga=Br zAyl&|dIZXJFKRi;kH8vta;7b+Cu5qRLAW{Kcu4>k3a3XSQ~=w? z3b@!<#>}^idlF#^v#(>x??xV?j9nMUkv|ttU4V_aE=qB7#7miW3g47B=i!{##akOa z7mIR{5b>eT;G!j|hslyi=f`{CYmyGy?L=Q;PzeHMcD*UIjNv?u=k7S%&|$CCkq_KHe|PC~t1f$o9d)ZxX}* z=Yd-}O8hsoD171Tm^AOYi4@1)#Ug9OUe(HR`s}@JyZZTTjRW7${l4%!ac4Kfv3s}E z-=92ir8@uky~&KPYPBD*-Kf3ypIu~s!29?|f(^UQRr|9|+ndg?|2sd>OaK2fGyF*W Vbz!pEQYRpn!PC{xWt~$(698QOwHg2b diff --git a/gamedata/gfx.2003/jail.png/jail-nofloor-west.png b/gamedata/gfx.2003/jail.png/jail-nofloor-west.png deleted file mode 100644 index 38264bc8a7e802542634e5e436071ec227c34228..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 463 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!3-pi_Q|sXDaPU;cPEB*=VV?2Ih+L^k;M!Q z+(IDCc5L6degFs7l3lM;bIcs}>V9wSlAhh>C!+)SvYQAui%f<{1od1_IBv*xyC#S4MTFMGN;hE&XXbLk}C zAq9bkha1=J2ys7FC>ikUpT6c2!?m|urp?x5m$0beJjuVV;2=lO0ggYs7ks!HXJ*b) zIsVgf#Lsu aW`=!93Mom6zT80XF?hQAxvXVc diff --git a/gamedata/gfx.2003/jail.png/jail-nofloor-north.png b/gamedata/gfx.2003/jail.png/jail-nofloor-x.png similarity index 100% rename from gamedata/gfx.2003/jail.png/jail-nofloor-north.png rename to gamedata/gfx.2003/jail.png/jail-nofloor-x.png diff --git a/gamedata/gfx.2003/jail.png/jail-nofloor-east.png b/gamedata/gfx.2003/jail.png/jail-nofloor-y.png similarity index 100% rename from gamedata/gfx.2003/jail.png/jail-nofloor-east.png rename to gamedata/gfx.2003/jail.png/jail-nofloor-y.png diff --git a/gamedata/gfx.2003/market.png/market-nofloor-north.png b/gamedata/gfx.2003/market.png/market-nofloor-x.png similarity index 100% rename from gamedata/gfx.2003/market.png/market-nofloor-north.png rename to gamedata/gfx.2003/market.png/market-nofloor-x.png diff --git a/gamedata/gfx.2003/market.png/market-nofloor-east.png b/gamedata/gfx.2003/market.png/market-nofloor-y.png similarity index 100% rename from gamedata/gfx.2003/market.png/market-nofloor-east.png rename to gamedata/gfx.2003/market.png/market-nofloor-y.png diff --git a/gamedata/gfx.2003/moon.png/moon-nofloor-north.png b/gamedata/gfx.2003/moon.png/moon-nofloor-x.png similarity index 100% rename from gamedata/gfx.2003/moon.png/moon-nofloor-north.png rename to gamedata/gfx.2003/moon.png/moon-nofloor-x.png diff --git a/gamedata/gfx.2003/moon.png/moon-nofloor-east.png b/gamedata/gfx.2003/moon.png/moon-nofloor-y.png similarity index 100% rename from gamedata/gfx.2003/moon.png/moon-nofloor-east.png rename to gamedata/gfx.2003/moon.png/moon-nofloor-y.png diff --git a/gamedata/gfx.2003/penitentiary.png/penitentiary-nofloor-south.png b/gamedata/gfx.2003/penitentiary.png/penitentiary-nofloor-south.png deleted file mode 100644 index f9ee24c8a4de838a546ade834f85472a14cfdcf6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 534 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!3-pi_Q|sXDaPU;cPEB*=VV?2Ih+L^k;M!Q z+(IDCcob8-F{5`yaf`VW;G&D5KKP(Cal7TQP z83@2cayAgArskxjrKKmQXD5UB*MtD^9GCieUf-7~Fv}$6eIG+V^D8x_RnOKw zVo9k!9$eB}zuuC;r8MSstI+1R?*g~7byOKlI;J7G^n9sz!|~mZbt<^o*UM@*9M7-j zZ+@^ho$f)&Bqh diff --git a/gamedata/gfx.2003/penitentiary.png/penitentiary-nofloor-west.png b/gamedata/gfx.2003/penitentiary.png/penitentiary-nofloor-west.png deleted file mode 100644 index 9bbb343f256e7b31ec75515c9b5fe0357121827a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 560 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!3-pi_Q|sXDaPU;cPEB*=VV?2Ih+L^k;M!Q z+(IDCc0u%NK8u&JS`larIPowElJ_g43=?BurM;*Pw$p5o#u#o1Gei|4dd|7Z9QbYsUN z#sxr1xx_W1Bsf24p>1=^?#!z0^+Jk2F0*A-+@0`a+9pM1E{P&n;YY{y zI_4a*5ShpRwKM*7O6mStN8VPHgiZdjxmRZPs_v(UuU6_lI$&iTx@Uq|f7OMxjxsg; zC#(%u_np4H+2YfJ7QGxc(_&W@0gjU&1s`>=oeG+~_k1iPhfA!F2U5x`FUljMJ1_43K{|V<*7vh&YIhn6)yxTf8^=n7*a9k&Bc>KO$Gui0fhmK#(B+# zn>cnn`EP$QaU+X&Ym4@s8SCl-u5LblBHfHp*nm+uz&5I%X-ioK%YoAHM$-eOEtWU_ zFDzS*PwU55v0MSr6w6d!2j#I$^;dtM~JiEGvK82|TFUYps)NF3GZ`EWSRCxuNQN z@aEly0dMCqznyirm+@ZgLT%@#wdboD@730GZ+a1akNZbvd3ka}x&FVWdk=X1J3k-j cz5oB28OjnoEv#fxT7X;zPgg&ebxsLQ0NfG5*8l(j diff --git a/gamedata/gfx.2003/safari.png/safari-nofloor-west.png b/gamedata/gfx.2003/safari.png/safari-nofloor-west.png deleted file mode 100644 index c5f6470433fc67b6a86ce36199cf978fd02b5bdb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!3-pi_Q|sXDaPU;cPEB*=VV?2Ih+L^k;M!Q z+(IDCcRZTXmZgHyav8`q&27ty7Xp>P^K@|xshIQT%I%^i1A&Hz5kVnm!UDx|r)P=q3k2lU{x8?= z^;^zvk6dr$m`tgm19j#wH6gcC)X;kZWt`}1M&fxjx zmeBp6X{{%0)o0I-l6`VqhedLk)?JMZ$3IfbJQ9T-OMg6eWPWCe^IcZcyRJtq?9+F3 zH(u{p@rVDEo?MNbsM8hU|1}!x-Zh12@HC#+Q)>uXU|8@riAAj8ozixuQ+iqN9{}U} c|9@r%F5P{N3g=AT0)5Wl>FVdQ&MBb@05omQRR910 diff --git a/gamedata/gfx.2003/safari.png/safari-nofloor-north.png b/gamedata/gfx.2003/safari.png/safari-nofloor-x.png similarity index 100% rename from gamedata/gfx.2003/safari.png/safari-nofloor-north.png rename to gamedata/gfx.2003/safari.png/safari-nofloor-x.png diff --git a/gamedata/gfx.2003/safari.png/safari-nofloor-east.png b/gamedata/gfx.2003/safari.png/safari-nofloor-y.png similarity index 100% rename from gamedata/gfx.2003/safari.png/safari-nofloor-east.png rename to gamedata/gfx.2003/safari.png/safari-nofloor-y.png diff --git a/gamedata/gfx.2009/Makefile.am b/gamedata/gfx.2009/Makefile.am index bdb43158..8d0cf330 100644 --- a/gamedata/gfx.2009/Makefile.am +++ b/gamedata/gfx.2009/Makefile.am @@ -97,8 +97,6 @@ gamedatagfx2009_DATA = item.png/diver-shadows.png \ item.png/toaster.png \ item.png/fish-shadows.png \ blacktooth.png/blacktooth-nofloor-sw.png \ - blacktooth.png/blacktooth-nofloor-south.png \ - blacktooth.png/blacktooth-nofloor-east.png \ blacktooth.png/blacktooth-wall-x-1.png \ blacktooth.png/blacktooth-floor-west.png \ blacktooth.png/blacktooth-door-north.png \ @@ -110,10 +108,10 @@ gamedatagfx2009_DATA = item.png/diver-shadows.png \ blacktooth.png/blacktooth-mortalfloor.png \ blacktooth.png/blacktooth-floor-north.png \ blacktooth.png/blacktooth-wall-y-3.png \ - blacktooth.png/blacktooth-nofloor-west.png \ - blacktooth.png/blacktooth-nofloor-north.png \ + blacktooth.png/blacktooth-nofloor-x.png \ blacktooth.png/blacktooth-wall-x-3.png \ blacktooth.png/blacktooth-column-capital-north.png \ + blacktooth.png/blacktooth-nofloor-y.png \ blacktooth.png/blacktooth-column-capital-east.png \ blacktooth.png/blacktooth-door-south.png \ blacktooth.png/blacktooth-column-capital-west.png \ @@ -124,17 +122,15 @@ gamedatagfx2009_DATA = item.png/diver-shadows.png \ blacktooth.png/blacktooth-wall-y-2.png \ blacktooth.png/blacktooth-column-shaft-north.png \ blacktooth.png/blacktooth-column-capital-south.png \ + jail.png/jail-nofloor-y.png \ jail.png/jail-column-capital-east.png \ jail.png/jail-wall-x.png \ - jail.png/jail-nofloor-west.png \ jail.png/jail-floor-west.png \ jail.png/jail-floor-sw.png \ - jail.png/jail-nofloor-south.png \ jail.png/jail-floor-north.png \ jail.png/jail-door-north.png \ jail.png/jail-floor.png \ jail.png/jail-column-shaft-north.png \ - jail.png/jail-nofloor-north.png \ jail.png/jail-mortalfloor.png \ jail.png/jail-wall-y.png \ jail.png/jail-column-capital-south.png \ @@ -144,10 +140,10 @@ gamedatagfx2009_DATA = item.png/diver-shadows.png \ jail.png/jail-door-west.png \ jail.png/jail-door-south.png \ jail.png/jail-nofloor-sw.png \ + jail.png/jail-nofloor-x.png \ jail.png/jail-door-east.png \ jail.png/jail-floor-south.png \ jail.png/jail-column-capital-north.png \ - jail.png/jail-nofloor-east.png \ market.png/market-door-north.png \ market.png/market-floor-west.png \ market.png/market-column-capital-north.png \ @@ -155,12 +151,12 @@ gamedatagfx2009_DATA = item.png/diver-shadows.png \ market.png/market-wall-y-3.png \ market.png/market-column-shaft-north.png \ market.png/market-wall-x-3.png \ + market.png/market-nofloor-x.png \ market.png/market-column-capital-east.png \ market.png/market-floor-north.png \ market.png/market-mortalfloor.png \ market.png/market-wall-y-1.png \ market.png/market-door-east.png \ - market.png/market-nofloor-east.png \ market.png/market-floor-sw.png \ market.png/market-door-south.png \ market.png/market-wall-x-1.png \ @@ -170,7 +166,7 @@ gamedatagfx2009_DATA = item.png/diver-shadows.png \ market.png/market-wall-y-2.png \ market.png/market-floor-east.png \ market.png/market-floor.png \ - market.png/market-nofloor-north.png \ + market.png/market-nofloor-y.png \ market.png/market-floor-south.png \ market.png/market-column-capital-south.png \ moon.png/moon-wall-y-4.png \ @@ -180,6 +176,7 @@ gamedatagfx2009_DATA = item.png/diver-shadows.png \ moon.png/moon-column-capital-west.png \ moon.png/moon-wall-x-3.png \ moon.png/moon-wall-x-4.png \ + moon.png/moon-nofloor-x.png \ moon.png/moon-door-north.png \ moon.png/moon-wall-y-1.png \ moon.png/moon-column-capital-east.png \ @@ -188,21 +185,21 @@ gamedatagfx2009_DATA = item.png/diver-shadows.png \ moon.png/moon-column-shaft-north.png \ moon.png/moon-wall-y-3.png \ moon.png/moon-door-west.png \ + moon.png/moon-nofloor-y.png \ moon.png/moon-mortalfloor.png \ moon.png/moon-door-south.png \ moon.png/moon-floor-sw.png \ moon.png/moon-column-capital-north.png \ moon.png/moon-column-capital-south.png \ - moon.png/moon-nofloor-north.png \ moon.png/moon-floor.png \ moon.png/moon-floor-north.png \ moon.png/moon-column-shaft-east.png \ - moon.png/moon-nofloor-east.png \ moon.png/moon-wall-y-2.png \ moon.png/moon-wall-x-1.png \ byblos.png/byblos-floor-sw.png \ + byblos.png/byblos-nofloor-y.png \ + byblos.png/byblos-nofloor-x.png \ byblos.png/byblos-column-capital-east.png \ - byblos.png/byblos-nofloor-south.png \ byblos.png/byblos-floor.png \ byblos.png/byblos-wall-x-2.png \ byblos.png/byblos-nofloor-sw.png \ @@ -210,10 +207,8 @@ gamedatagfx2009_DATA = item.png/diver-shadows.png \ byblos.png/byblos-door-west.png \ byblos.png/byblos-column-capital-north.png \ byblos.png/byblos-floor-south.png \ - byblos.png/byblos-nofloor-north.png \ byblos.png/byblos-floor-west.png \ byblos.png/byblos-wall-y-2.png \ - byblos.png/byblos-nofloor-east.png \ byblos.png/byblos-door-south.png \ byblos.png/byblos-door-north.png \ byblos.png/byblos-column-capital-south.png \ @@ -224,18 +219,16 @@ gamedatagfx2009_DATA = item.png/diver-shadows.png \ byblos.png/byblos-door-east.png \ byblos.png/byblos-wall-y-1.png \ byblos.png/byblos-column-shaft-north.png \ - byblos.png/byblos-nofloor-west.png \ byblos.png/byblos-column-capital-west.png \ egyptus.png/egyptus-floor-sw.png \ egyptus.png/egyptus-mortalfloor.png \ egyptus.png/egyptus-column-shaft-north.png \ - egyptus.png/egyptus-nofloor-north.png \ + egyptus.png/egyptus-nofloor-y.png \ egyptus.png/egyptus-door-south.png \ egyptus.png/egyptus-column-capital-west.png \ egyptus.png/egyptus-floor-west.png \ - egyptus.png/egyptus-nofloor-south.png \ + egyptus.png/egyptus-nofloor-x.png \ egyptus.png/egyptus-door-east.png \ - egyptus.png/egyptus-nofloor-east.png \ egyptus.png/egyptus-wall-y-2.png \ egyptus.png/egyptus-door-north.png \ egyptus.png/egyptus-door-west.png \ @@ -245,7 +238,6 @@ gamedatagfx2009_DATA = item.png/diver-shadows.png \ egyptus.png/egyptus-wall-y-1.png \ egyptus.png/egyptus-nofloor-sw.png \ egyptus.png/egyptus-column-capital-north.png \ - egyptus.png/egyptus-nofloor-west.png \ egyptus.png/egyptus-floor-north.png \ egyptus.png/egyptus-column-capital-south.png \ egyptus.png/egyptus-floor.png \ @@ -259,23 +251,21 @@ gamedatagfx2009_DATA = item.png/diver-shadows.png \ penitentiary.png/penitentiary-column-capital-west.png \ penitentiary.png/penitentiary-floor-sw.png \ penitentiary.png/penitentiary-floor-west.png \ - penitentiary.png/penitentiary-nofloor-south.png \ penitentiary.png/penitentiary-wall-x-2.png \ penitentiary.png/penitentiary-column-capital-south.png \ penitentiary.png/penitentiary-door-south.png \ penitentiary.png/penitentiary-column-shaft-east.png \ penitentiary.png/penitentiary-floor-south.png \ + penitentiary.png/penitentiary-nofloor-y.png \ penitentiary.png/penitentiary-mortalfloor.png \ penitentiary.png/penitentiary-door-east.png \ penitentiary.png/penitentiary-floor-east.png \ penitentiary.png/penitentiary-wall-x-1.png \ penitentiary.png/penitentiary-floor.png \ penitentiary.png/penitentiary-column-capital-east.png \ - penitentiary.png/penitentiary-nofloor-west.png \ - penitentiary.png/penitentiary-nofloor-east.png \ + penitentiary.png/penitentiary-nofloor-x.png \ penitentiary.png/penitentiary-door-west.png \ penitentiary.png/penitentiary-door-north.png \ - penitentiary.png/penitentiary-nofloor-north.png \ penitentiary.png/penitentiary-wall-y-1.png \ penitentiary.png/penitentiary-nofloor-sw.png \ safari.png/safari-wall-x-2.png \ @@ -287,12 +277,11 @@ gamedatagfx2009_DATA = item.png/diver-shadows.png \ safari.png/safari-column-capital-south.png \ safari.png/safari-door-south.png \ safari.png/safari-column-capital-west.png \ + safari.png/safari-nofloor-y.png \ + safari.png/safari-nofloor-x.png \ safari.png/safari-wall-x-1.png \ - safari.png/safari-nofloor-west.png \ safari.png/safari-column-shaft-east.png \ - safari.png/safari-nofloor-north.png \ safari.png/safari-wall-y-2.png \ - safari.png/safari-nofloor-east.png \ safari.png/safari-door-west.png \ safari.png/safari-wall-y-1.png \ safari.png/safari-door-north.png \ @@ -301,7 +290,6 @@ gamedatagfx2009_DATA = item.png/diver-shadows.png \ safari.png/safari-column-capital-north.png \ safari.png/safari-door-east.png \ safari.png/safari-floor-south.png \ - safari.png/safari-nofloor-south.png \ safari.png/safari-floor-north.png \ safari.png/safari-column-shaft-north.png \ safari.png/safari-wall-x-3.png \ diff --git a/gamedata/gfx.2009/blacktooth.png/blacktooth-nofloor-north.png b/gamedata/gfx.2009/blacktooth.png/blacktooth-nofloor-x.png similarity index 100% rename from gamedata/gfx.2009/blacktooth.png/blacktooth-nofloor-north.png rename to gamedata/gfx.2009/blacktooth.png/blacktooth-nofloor-x.png diff --git a/gamedata/gfx.2009/blacktooth.png/blacktooth-nofloor-west.png b/gamedata/gfx.2009/blacktooth.png/blacktooth-nofloor-y.png similarity index 100% rename from gamedata/gfx.2009/blacktooth.png/blacktooth-nofloor-west.png rename to gamedata/gfx.2009/blacktooth.png/blacktooth-nofloor-y.png diff --git a/gamedata/gfx.2009/byblos.png/byblos-nofloor-north.png b/gamedata/gfx.2009/byblos.png/byblos-nofloor-x.png similarity index 100% rename from gamedata/gfx.2009/byblos.png/byblos-nofloor-north.png rename to gamedata/gfx.2009/byblos.png/byblos-nofloor-x.png diff --git a/gamedata/gfx.2009/byblos.png/byblos-nofloor-east.png b/gamedata/gfx.2009/byblos.png/byblos-nofloor-y.png similarity index 100% rename from gamedata/gfx.2009/byblos.png/byblos-nofloor-east.png rename to gamedata/gfx.2009/byblos.png/byblos-nofloor-y.png diff --git a/gamedata/gfx.2009/egyptus.png/egyptus-nofloor-north.png b/gamedata/gfx.2009/egyptus.png/egyptus-nofloor-x.png similarity index 100% rename from gamedata/gfx.2009/egyptus.png/egyptus-nofloor-north.png rename to gamedata/gfx.2009/egyptus.png/egyptus-nofloor-x.png diff --git a/gamedata/gfx.2009/egyptus.png/egyptus-nofloor-east.png b/gamedata/gfx.2009/egyptus.png/egyptus-nofloor-y.png similarity index 100% rename from gamedata/gfx.2009/egyptus.png/egyptus-nofloor-east.png rename to gamedata/gfx.2009/egyptus.png/egyptus-nofloor-y.png diff --git a/gamedata/gfx.2009/jail.png/jail-nofloor-south.png b/gamedata/gfx.2009/jail.png/jail-nofloor-south.png deleted file mode 100644 index 233f7918c0a20729244ef8f87c8af47cdfd8c06e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCcR|DNig)WpFP_EXc@AcFxZ$OD!r%EmF`3$S+SV3UJokwyby|Pfanc2%1V--c{r{OxrWrb{`>f}gy20ciOQ{*dwB&?J{)0ESbHvp09=I#c zJ8xb7zSySq+8@dpv%WiCj=fOEUvihRHl1NEV+q>@Ne2+)OA*kT|Nog8q7_ek;5S~` P1M+~UtDnm{r-UW|?}lA( diff --git a/gamedata/gfx.2009/jail.png/jail-nofloor-west.png b/gamedata/gfx.2009/jail.png/jail-nofloor-west.png deleted file mode 100644 index 7c4d944cd44f2b1e51f9b23141f0031d5f977b8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCcR|DNig)WpFP_EXc@AcFxZ$OD!r%EmF`3$S+SV3UJokwyby|Pl!9~wtma+BU86Q~(^IU(EeQhwjjKL&ad1&)rQG9ro%OU-ux?fU

OUug2Dk&)`D=TXnYU=Cj8v=o)p^1r!xw*Ne zp(PMlSy|cG*x1_IIyg8uIyyQ#JG;2JxW*KEczAevdU^ptRHZi%L|1#q)Oe@X`T#*} zoo`&dpP!$NLg^_lL!(EQvOhyW&Ke2lI0lE>RGp1m zZ!t6QY}~L^EVEy#@k^DTCTIS2Z{~&#LR_1fzx-P&GU4kyS$WQKSNVHh47=|gUas)u zaTVu-3)T7-vHCm=k89s|eW?uMU|43q_y0LAh6ArmQQ{G$Q^G^S%--C6QeZ<9OtLa#%>077+fu5CyhK42( z=o)GPfuXsUk-4_Ewhj;&nCk+8p@pugwH^?d+316zQ=1A(!%K9FHyr*Gk@Z{uMA z1SU2H7M_M6U}~9AIUdfJ*j!sTaUS3|_-rhbwKEW}$At53E8UClvdcPkSM9L+u5hcO-X(i=} zMX3z#MTrF&naR%id1a|ZC8MWNMw*_G> zXZxma(mGPjm#}MDuaLZZ(IaJ#1*~aL-*P?m>^!g1lyuAO++ER=9r}T6OLN-7c}{yf z)x2h!vy1ca*Ij>q9O*Y|e3oVHw|HyTQPsMwf?qXHzYkeiEZi><^gJPX?Hi85>KXmc zJb&3I7boq!d1u#oJ~!cdn<)v6TW{O!k+9Kb5K nWHMeCd$y`|n|YrX5%2Dhy(UfXIMx77iW)Am}YosHf*n_PA_d+e%r+THB7r^#tglk?t2 z*S*aidt03Lws`IB@!H?uyua0Bf4k@YPM-rE9tS$S4s>`Q=)1%JKj5#+u@%+r_3v-e$EXugJDDBex z)JqG~E-gvByeQ@J;^Zp}ldmkzy0$d=+Nz@K%kpk4Ou4Zv^Tz6eTT9Yztt-F1EcNc% z{0FOZAFM9=&+s1@em_@ce+N>^C9V-A!TD(=<%vb94DLmV1sR#i&iQ#|sYNBJMG6`L z`Q@oa0nVD+mK84qD*x)~;uumfC&^=hfI*LxLDqp4jEmVC9Fvq>*;LfHxPucMk`^uB zwodORkjr-Ds7polJY+m&A{b{P=!bQsbk0xgTrFTx)(Y}87My2&kE-fm|Lc*3cO^4^Wq~yGPnvkR- z!O-{p!V8CR_c-Skjf-p!kLPyZx4$GAImd(f!AHGQ(oI^NV)Ow*cw94o&Y1 z3|}hLZ!(0H*-Zh_Vsg5UPe2SazsT&II`vx&YI)M)HJ?~`6Vi_8^8_* zmsyFIImlGlNL1K~SK3Ne*-KVCOIN$d*Vswb*h|#7%GBD6*V;?e+Dp|sN!L2d*4azc zIY`twO4d2c)VavlJ4x0%$u_tFkz9kDe1n@}ql-+Vn_Q!te50E}qq}mWheD%|YLkm} zldEi#t6YS&*i<^9lyKIZMN{f$ji?3R% zn_R1he5|0{uW~1l z8=%tVt=Q$G)a|3(?FU3E-TsQ*0jk|WYCU24y}ru5ek#4e8hw7sef}za0YIeI7X(Ba zec=ZEek%R`%KiQ-{Q+wIfvWxC8vPME6Z};sglSC-RGk>4J~3ErVyNcC2>nSxYLi0L zCx>cJ4%eI#Z7?-Vb848@v~aEIp_(%zbpA8^2gZ!;`^>FCO1Z=}q9iy!t)x7$D3!sz zD6t?TGub&muPn8wB(+FEBOt##wJ5+@bKA1wg}|s2_jGX#shE?rVzGchkCZ{yffbC0 zk2UWpOkUke>0a5wx_ejX(eKS&%(>@zZ(J-@I7rzDF=)rswr# zXRK8(1-Y3uL?{~+EnerlV1h#buAMP9g>DHa&+Rf(iwRQPCs!AGM51x4&4sNOMS9kr z^f+-|DTk$x$@RM1MXN0)mmO}k`!GAWS$KA>$hlwf3@#o9sfnw!eI_zG iC~I*@0z;7D|9@tNPgbe1(Y5!RKzvVEKbLh*2~7asKpSlU diff --git a/gamedata/gfx.riderx/byblos.png/byblos-nofloor-north.png b/gamedata/gfx.riderx/byblos.png/byblos-nofloor-x.png similarity index 100% rename from gamedata/gfx.riderx/byblos.png/byblos-nofloor-north.png rename to gamedata/gfx.riderx/byblos.png/byblos-nofloor-x.png diff --git a/gamedata/gfx.riderx/byblos.png/byblos-nofloor-east.png b/gamedata/gfx.riderx/byblos.png/byblos-nofloor-y.png similarity index 100% rename from gamedata/gfx.riderx/byblos.png/byblos-nofloor-east.png rename to gamedata/gfx.riderx/byblos.png/byblos-nofloor-y.png diff --git a/gamedata/gfx.riderx/egyptus.png/egyptus-nofloor-south.png b/gamedata/gfx.riderx/egyptus.png/egyptus-nofloor-south.png deleted file mode 100644 index b359be2d6869c58b2f618ce815cce036defd1f93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 761 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!3-pi_Q|sXDaPU;cPEB*=VV?2Ih+L^k;M!Q z+(IDCco0x+jKsrGx>IcS@vhT2w%0OkhrYa87(kUSeo| z0uY52B!(0wh7~1;6{SWLrA8K~MwFz4m!w9NXGE1}M3-mARAl+>oExP>|FJLdi{qNlk^x%|$?z+FYF6Qk>dSoYqp3)>@p_ z3M5O@+e*^gN>kc^jM9v@vds3f)b_HBj`FmQav+)6QJLLYp4nNR)mfh1S&`WVLRnpv z>D`rC-Idwhl{wv2Io;JcJ(bx#l{r0Cxjof+z16wBK(aQkuR5!*I;XEXx34CzuO`2* zHow0*r@tm|Vr~A!x`K)IKvX!nv3N>r$<+G%X$^(b8jGek7EEs`oZeD0voU98cg396 z;(0wa3py+RGyDezaI-{00+3QJag8Vm&QB{TPb^Aha4$+M$jD4~&d)1LEh)FRMNVN-^kNOD|HF zp2RR=@2=R;XP5PZ7z#3d-so*rd4J!7iJ@=%^4^D<#Xs9r_6gp&e0*)iY{&91Kg&26 zqGzs=lj^o#^3uAHg+Wp`E6cI=^PD;(c7_d;yD}H9kn+Bie~PVPN`RP4K&zLt&+>XQZWXWSF@^rON+i<<1m+T z%JnPeCZ#-bs$AD39U`~x-(;L5wz9Zkl|y#?MJwhNE8c1arZfDTRC>FPoq^&1e`bcR Xwtd!X_5bVz1}lT7tDnm{r-UW|k2*h+ diff --git a/gamedata/gfx.riderx/egyptus.png/egyptus-nofloor-west.png b/gamedata/gfx.riderx/egyptus.png/egyptus-nofloor-west.png deleted file mode 100644 index 43ab9d0af05c412474bd2d58b93c01f5ec2be7e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 554 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!3-pi_Q|sXDaPU;cPEB*=VV?2Ih+L^k;M!Q z+(IDCc8Kh5kuDIanE;U<5UHC2k-oYa2x*uZ0FkD-zJ|F0 z5NTQfks%OiSr}kv=-P;bX@AE$6X=Zu(u{|x_u z&SW<=yaS|^OI#yLg7ec#$`gxH8QhB!3o+mX9 z^jKVv(p)O))RDzMA=ATSaY}w5;C%R6axen;v|Nog8&U2j% U?zb~&2XYxaUHx3vIVCg!0DaEBO#lD@ diff --git a/gamedata/gfx.riderx/egyptus.png/egyptus-nofloor-north.png b/gamedata/gfx.riderx/egyptus.png/egyptus-nofloor-x.png similarity index 100% rename from gamedata/gfx.riderx/egyptus.png/egyptus-nofloor-north.png rename to gamedata/gfx.riderx/egyptus.png/egyptus-nofloor-x.png diff --git a/gamedata/gfx.riderx/egyptus.png/egyptus-nofloor-east.png b/gamedata/gfx.riderx/egyptus.png/egyptus-nofloor-y.png similarity index 100% rename from gamedata/gfx.riderx/egyptus.png/egyptus-nofloor-east.png rename to gamedata/gfx.riderx/egyptus.png/egyptus-nofloor-y.png diff --git a/gamedata/gfx.riderx/jail.png/jail-nofloor-south.png b/gamedata/gfx.riderx/jail.png/jail-nofloor-south.png deleted file mode 100644 index 1ba2e384fd30ef1dcea744bc04d3bbff4be63f49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!3-pi_Q|sXDaPU;cPEB*=VV?2Ih+L^k;M!Q z+(IDCcOH0ej$|@--DJv^$X=&-}>zkOEn46nhSy|cG*x1_I z+S}VZI5;>uIyyT$ySTWx1{b)-6nc1gcmhFWg%=P+ReA$KbhUR(jdyCT4-mxG`Nq}z z`T6<#`v(LB1O)|!goK2Lhet$2L`Fu&#>U3Q#l^?RCsuSNB_*ZS_Ge~hW@l&TRZlLg zoBp5SKhSl*LKSZVDdiH^h?3y^w370~qErU=qQruX%w*^Myt34ylGGvvjez{})S>`q z&27ty7Xp>P@^o^iuU&Xlc?4G6hcY{~% zni+g(x@V(^N2ACNyS2iMQQ}>k4C@w4M=-~HpHP#?S+Mt&0PCskOgrugXoz}piZNUl zHE9WHIF;nKu9-z8Bw$aCG}H8|3G*EpS{@$dc<`$yK%nCLF2RDkbL;P^m(0I@<3Mit z`gavSs`@z#?(&wew|eiX)9`w0-j3Zr&LlC!*!#)tmS&E6eJ^jzt$XF>Y+P?^^K5K< zw*9c}XL)w{S(Sp>>i9~P3-M*wPM>;jBczcY-CbX)5^(C@`SU<;{{PR+AoF8KqQgne Q6+kY7r>mdKI;Vst0LjD0vH$=8 diff --git a/gamedata/gfx.riderx/jail.png/jail-nofloor-west.png b/gamedata/gfx.riderx/jail.png/jail-nofloor-west.png deleted file mode 100644 index 8a3d5a07968bfbe6f3fbbfbdd15ed60224d95ce2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 703 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!3-pi_Q|sXDaPU;cPEB*=VV?2Ih+L^k;M!Q z+(IDCc>v9&&sVPU6l<6!^5Zo`yhRYHMg_XK3YM1O#UG#z0`Y&Ss8b=0ITU zZtfIr2?X9TR#sNl?g2I)3AWDuc0k~j?C9v|`q&27ty7XpJ* z)YHW=q+-sSD=&?h9Yt6lm`zJmQSnf_b!pPIl8jp|+frOylEi!Np8dU_ed&}0SZ0+jS+likoo1uj z^;e5F8BRUOoOa~3bg>D~=arpr7f<2*IIa1UL}E$)E#0p#gx@;~MY@c=Gx5?;AVTRd1N`+$;9|vi@X&{XAW>R)$^Azxz$poP{A{v7k%( zTlZv!2LgTe~DWM4f Dy>8`9 diff --git a/gamedata/gfx.riderx/jail.png/jail-nofloor-north.png b/gamedata/gfx.riderx/jail.png/jail-nofloor-x.png similarity index 100% rename from gamedata/gfx.riderx/jail.png/jail-nofloor-north.png rename to gamedata/gfx.riderx/jail.png/jail-nofloor-x.png diff --git a/gamedata/gfx.riderx/jail.png/jail-nofloor-east.png b/gamedata/gfx.riderx/jail.png/jail-nofloor-y.png similarity index 100% rename from gamedata/gfx.riderx/jail.png/jail-nofloor-east.png rename to gamedata/gfx.riderx/jail.png/jail-nofloor-y.png diff --git a/gamedata/gfx.riderx/market.png/market-nofloor-north.png b/gamedata/gfx.riderx/market.png/market-nofloor-x.png similarity index 100% rename from gamedata/gfx.riderx/market.png/market-nofloor-north.png rename to gamedata/gfx.riderx/market.png/market-nofloor-x.png diff --git a/gamedata/gfx.riderx/market.png/market-nofloor-east.png b/gamedata/gfx.riderx/market.png/market-nofloor-y.png similarity index 100% rename from gamedata/gfx.riderx/market.png/market-nofloor-east.png rename to gamedata/gfx.riderx/market.png/market-nofloor-y.png diff --git a/gamedata/gfx.riderx/moon.png/moon-nofloor-north.png b/gamedata/gfx.riderx/moon.png/moon-nofloor-x.png similarity index 100% rename from gamedata/gfx.riderx/moon.png/moon-nofloor-north.png rename to gamedata/gfx.riderx/moon.png/moon-nofloor-x.png diff --git a/gamedata/gfx.riderx/moon.png/moon-nofloor-east.png b/gamedata/gfx.riderx/moon.png/moon-nofloor-y.png similarity index 100% rename from gamedata/gfx.riderx/moon.png/moon-nofloor-east.png rename to gamedata/gfx.riderx/moon.png/moon-nofloor-y.png diff --git a/gamedata/gfx.riderx/penitentiary.png/penitentiary-nofloor-north.png b/gamedata/gfx.riderx/penitentiary.png/penitentiary-nofloor-x.png similarity index 100% rename from gamedata/gfx.riderx/penitentiary.png/penitentiary-nofloor-north.png rename to gamedata/gfx.riderx/penitentiary.png/penitentiary-nofloor-x.png diff --git a/gamedata/gfx.riderx/penitentiary.png/penitentiary-nofloor-east.png b/gamedata/gfx.riderx/penitentiary.png/penitentiary-nofloor-y.png similarity index 100% rename from gamedata/gfx.riderx/penitentiary.png/penitentiary-nofloor-east.png rename to gamedata/gfx.riderx/penitentiary.png/penitentiary-nofloor-y.png diff --git a/gamedata/gfx.riderx/safari.png/safari-nofloor-south.png b/gamedata/gfx.riderx/safari.png/safari-nofloor-south.png deleted file mode 100644 index 1db9c12d23bcd4ecfbfa384441b8f5ccde57b786..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 551 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!3-pi_Q|sXDaPU;cPEB*=VV?2Ih+L^k;M!Q z+(IDCcd0ft7!{q=nCsvs97awID|+zd8#=l%DR;q zxRo1t1Za6h8T$Au1_UXEmYamuT85XfM4r@mzAY_YEj?Zx zOYFP4!zXQUp0d_y%2ubT%Mx#0Uvl@>vi}VKfsTD%xv>^VDVMlLlmzFem6RtIr82k| zB^G34COhZnm8BMyq!uY?1mu^e76mwKZd+Eo5UBj6r;B4q#hf=6qk|6_2(Tsy2u|rb zqI7l9hFQCo_B!n?{P*8p`O$)dGvg-hOS``*{gbcS^3A!HviubXnB{KpU*KYh*vh~l z$nlVeVPi*UEaTsbOV>p=3p1SHJ>I2yxtW=Pr8QxtyhEpRufq|QB~M-`{j`f_IxuJH zA1-?l-+HsKhJU+W8=SU0f8=#yI^&z_^Bv7im-go-Ke+JQ$1VTaKE)5Wt6k0?_f$Uc z;_tWmYYYr-Ztt%#7*s|{?2TqlpKktrK9KK_U-Ny(sUzNzaok_dv%gM_ns=Q^{qXAV ntM-UlybXJ94fN&z|I7@J6rSuCJoe2K$YtbP0l+XkKihtQo diff --git a/gamedata/gfx.riderx/safari.png/safari-nofloor-west.png b/gamedata/gfx.riderx/safari.png/safari-nofloor-west.png deleted file mode 100644 index 1bbfd5aef8dddc6b367cded0561c08c4d7541b5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 758 zcmWlWUr19?9LKM@yi<4ooOAAe=hA)ierHu}~e8Ss*`XQ=AO%O)*RzfoUwz_=qtyM*9Y_rw+Ec@8e@WYA+XPylnw#8!Ka^C=oetg^)@y^OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCcOQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCcLfH;HF&LH)lpcuwSiT~CG}^im5PeQgSSTCa~54n%4+8Q zcaW)J8e@iX(;a@!DeqVUejjbV_S3vN{or*=hKsXqNiuxgxc0o`yY1G(++O^9&pW)e y+nDf1WPu;!DOQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCcLfH;HF&LH)lpcuwSiT~CG}^im5PeQgSSTCa~54n%4+8Q zcaW)J8e@iX(;a@!DeqVUejjbV_S3vN{or*=hKsXqNiuxgxc0o`yY1G(++O^9&pW)e y+nDf1WPu;!DOQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCc%|OpZJ(t_mIv8rCOQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCcGI8U6z$aRI?euXX|DluKMA zN`mv#O3D+9QW@Nf5(_dilb!SP%2JC;Qi~Kc0`kjKivpZAw=FAP2vnZ$>EaktG3U)C zN5KXI9+!(-1Gpm&Fo|st;NI#l?R7ix#JYw_pRM2W`^eO75IMm$$LWCp({6zqEe=9V zYA!b$yRAe-_o)bfzv8k*Y-2@I>!RyDM^4Cgyp-Q}^pAm_M1iBDsEmkW!&37dK)e3` aXJ*J1I`LuYy{lhAzVLMQb6Mw<&;$U|U}Yo# diff --git a/gamedata/gfx/byblos.png/byblos-nofloor-north.png b/gamedata/gfx/byblos.png/byblos-nofloor-north.png deleted file mode 100644 index 520935d8b51e6a10f08dd570d4577cbb4e59f113..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCcGI8U6z$aRI?euXX|DluKMA zN`mv#O3D+9QW@Nf5(_dilb!SP%2JC;Qi~Kc0`kjKivpZAw=FAP2vnZs>EaktG3U*B zZ^i=(0?dIrSDbW#D1nhXd;fo?lWB$y>ptswrfx7f$Wm&?FfBQulKFVdQ&MBb@0E_crmH+?% diff --git a/gamedata/gfx/byblos.png/byblos-nofloor-south.png b/gamedata/gfx/byblos.png/byblos-nofloor-south.png deleted file mode 100644 index 520935d8b51e6a10f08dd570d4577cbb4e59f113..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCcGI8U6z$aRI?euXX|DluKMA zN`mv#O3D+9QW@Nf5(_dilb!SP%2JC;Qi~Kc0`kjKivpZAw=FAP2vnZs>EaktG3U*B zZ^i=(0?dIrSDbW#D1nhXd;fo?lWB$y>ptswrfx7f$Wm&?FfBQulKFVdQ&MBb@0E_crmH+?% diff --git a/gamedata/gfx/byblos.png/byblos-nofloor-west.png b/gamedata/gfx/byblos.png/byblos-nofloor-west.png deleted file mode 100644 index 191a5d0b488f988f9b18405be6f35ce4e912dac5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCcGI8U6z$aRI?euXX|DluKMA zN`mv#O3D+9QW@Nf5(_dilb!SP%2JC;Qi~Kc0`kjKivpZAw=FAP2vnZ$>EaktG3U)C zN5KXI9+!(-1Gpm&Fo|st;NI#l?R7ix#JYw_pRM2W`^eO75IMm$$LWCp({6zqEe=9V zYA!b$yRAe-_o)bfzv8k*Y-2@I>!RyDM^4Cgyp-Q}^pAm_M1iBDsEmkW!&37dK)e3` aXJ*J1I`LuYy{lhAzVLMQb6Mw<&;$U|U}Yo# diff --git a/gamedata/gfx.2009/egyptus.png/egyptus-nofloor-south.png b/gamedata/gfx/byblos.png/byblos-nofloor-x.png similarity index 100% rename from gamedata/gfx.2009/egyptus.png/egyptus-nofloor-south.png rename to gamedata/gfx/byblos.png/byblos-nofloor-x.png diff --git a/gamedata/gfx.2009/egyptus.png/egyptus-nofloor-west.png b/gamedata/gfx/byblos.png/byblos-nofloor-y.png similarity index 100% rename from gamedata/gfx.2009/egyptus.png/egyptus-nofloor-west.png rename to gamedata/gfx/byblos.png/byblos-nofloor-y.png diff --git a/gamedata/gfx/egyptus.png/egyptus-nofloor-east.png b/gamedata/gfx/egyptus.png/egyptus-nofloor-east.png deleted file mode 100644 index 6483960d002bb7ae30641c6910a1b039d66608db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCcRqB9p$|bH5 zCBgY=CFO}lsSNH#i3J&%$ba4!+nDge6 zqhNypkITia0o)M>oOG@*iEZ$gzI7?_#JYw_pRM2W`^eO75U~)oXmJo@+AVOS#X*Qk z&E;lex0Q(KJ{95bS6sG;ZG5rO$uP_9(Mj2km-73L{xQ&#C~$NXl@U>FSZcllXxIP$ Z%nW8NRujs9%VvUn;pyt>=FV$1*l diff --git a/gamedata/gfx/egyptus.png/egyptus-nofloor-north.png b/gamedata/gfx/egyptus.png/egyptus-nofloor-north.png deleted file mode 100644 index 3250480241caa529bb597221f9b025e380c9d103..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCcRqB9p$|bH5 zCBgY=CFO}lsSNH#i3J&%$uRD^9vsn8dOexwH5GXF8c?=&OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCcRqB9p$|bH5 zCBgY=CFO}lsSNH#i3J&%$uRD^9vsn8dOexwH5GXF8c?=&OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCcRqB9p$|bH5 zCBgY=CFO}lsSNH#i3J&%$ba4!+nDge6 zqhNypkITia0o)M>oOG@*iEZ$gzI7?_#JYw_pRM2W`^eO75U~)oXmJo@+AVOS#X*Qk z&E;lex0Q(KJ{95bS6sG;ZG5rO$uP_9(Mj2km-73L{xQ&#C~$NXl@U>FSZcllXxIP$ Z%nW8NRujs9%VvUn;pyt>=FV$1*l diff --git a/gamedata/gfx.2009/byblos.png/byblos-nofloor-south.png b/gamedata/gfx/egyptus.png/egyptus-nofloor-x.png similarity index 100% rename from gamedata/gfx.2009/byblos.png/byblos-nofloor-south.png rename to gamedata/gfx/egyptus.png/egyptus-nofloor-x.png diff --git a/gamedata/gfx.2009/byblos.png/byblos-nofloor-west.png b/gamedata/gfx/egyptus.png/egyptus-nofloor-y.png similarity index 100% rename from gamedata/gfx.2009/byblos.png/byblos-nofloor-west.png rename to gamedata/gfx/egyptus.png/egyptus-nofloor-y.png diff --git a/gamedata/gfx/jail.png/jail-nofloor-east.png b/gamedata/gfx/jail.png/jail-nofloor-east.png deleted file mode 100644 index 94e7496beb24146b0b896a78bd7e113b02efe7b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCc`FUljMJ1_43K{|V<*7vh&YIhn6)yxTFZOhC z45^s&=2Diog&Q+i_N6C^ZD?TCxx$oplS{_BPmO6?-Tu?=K{G6T3`8tMZnPdy zV+m6XXmJo@QgeCR*c~>d+lArmj#X-p?kS0#kI)liI@DAC&Y|T02mN2|g$EnBxn@0B kz{RLje~^=b;s1YT2GcvK{*I5FVdQ&MBb@09(dov;Y7A diff --git a/gamedata/gfx/jail.png/jail-nofloor-north.png b/gamedata/gfx/jail.png/jail-nofloor-north.png deleted file mode 100644 index 8e7174acf93e862d7b2dca5c5a3971c4fc0a39c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCc`FUljMJ1_43K{|V<*7vh&YIhn6)yxT&-Zk3 z45^s&=KN{V1_d6Mz^YBG(HmH!7qD*I<-Psi1A+8O7Z`5tv+iDEw8P{e%ik0RmE#Vd zGLQS1%}+UXj-nT+01oFYCX#j3sOrBpuQjz>L$Z d3=IGOGc&~gPc!iObRrYveot3Fmvv4FO#rOcX*>V` diff --git a/gamedata/gfx/jail.png/jail-nofloor-south.png b/gamedata/gfx/jail.png/jail-nofloor-south.png deleted file mode 100644 index 8e7174acf93e862d7b2dca5c5a3971c4fc0a39c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCc`FUljMJ1_43K{|V<*7vh&YIhn6)yxT&-Zk3 z45^s&=KN{V1_d6Mz^YBG(HmH!7qD*I<-Psi1A+8O7Z`5tv+iDEw8P{e%ik0RmE#Vd zGLQS1%}+UXj-nT+01oFYCX#j3sOrBpuQjz>L$Z d3=IGOGc&~gPc!iObRrYveot3Fmvv4FO#rOcX*>V` diff --git a/gamedata/gfx/jail.png/jail-nofloor-west.png b/gamedata/gfx/jail.png/jail-nofloor-west.png deleted file mode 100644 index 94e7496beb24146b0b896a78bd7e113b02efe7b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCc`FUljMJ1_43K{|V<*7vh&YIhn6)yxTFZOhC z45^s&=2Diog&Q+i_N6C^ZD?TCxx$oplS{_BPmO6?-Tu?=K{G6T3`8tMZnPdy zV+m6XXmJo@QgeCR*c~>d+lArmj#X-p?kS0#kI)liI@DAC&Y|T02mN2|g$EnBxn@0B kz{RLje~^=b;s1YT2GcvK{*I5FVdQ&MBb@09(dov;Y7A diff --git a/gamedata/gfx.2009/penitentiary.png/penitentiary-nofloor-south.png b/gamedata/gfx/jail.png/jail-nofloor-x.png similarity index 100% rename from gamedata/gfx.2009/penitentiary.png/penitentiary-nofloor-south.png rename to gamedata/gfx/jail.png/jail-nofloor-x.png diff --git a/gamedata/gfx.2009/penitentiary.png/penitentiary-nofloor-west.png b/gamedata/gfx/jail.png/jail-nofloor-y.png similarity index 100% rename from gamedata/gfx.2009/penitentiary.png/penitentiary-nofloor-west.png rename to gamedata/gfx/jail.png/jail-nofloor-y.png diff --git a/gamedata/gfx/market.png/market-nofloor-north.png b/gamedata/gfx/market.png/market-nofloor-x.png similarity index 100% rename from gamedata/gfx/market.png/market-nofloor-north.png rename to gamedata/gfx/market.png/market-nofloor-x.png diff --git a/gamedata/gfx/market.png/market-nofloor-east.png b/gamedata/gfx/market.png/market-nofloor-y.png similarity index 100% rename from gamedata/gfx/market.png/market-nofloor-east.png rename to gamedata/gfx/market.png/market-nofloor-y.png diff --git a/gamedata/gfx/moon.png/moon-nofloor-north.png b/gamedata/gfx/moon.png/moon-nofloor-x.png similarity index 100% rename from gamedata/gfx/moon.png/moon-nofloor-north.png rename to gamedata/gfx/moon.png/moon-nofloor-x.png diff --git a/gamedata/gfx/moon.png/moon-nofloor-east.png b/gamedata/gfx/moon.png/moon-nofloor-y.png similarity index 100% rename from gamedata/gfx/moon.png/moon-nofloor-east.png rename to gamedata/gfx/moon.png/moon-nofloor-y.png diff --git a/gamedata/gfx/penitentiary.png/penitentiary-nofloor-east.png b/gamedata/gfx/penitentiary.png/penitentiary-nofloor-east.png deleted file mode 100644 index 9ee4777fad04b64ec8691abc4ef37c688a1203aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCc!u z2dagGsxz0IfgI%$*NBqf{Irtt#G+IN_oBptjLc-`{JgT%qLS1i1&x6G^3opc+X!6jRkoRMiTT?H2S0-a9}JExXAqIgs}N;4tjx8)>8_$L ji^v;3*Km-x{{LrY5Ycuj3^_X|7{vE<^>bP0l+XkK150l2 diff --git a/gamedata/gfx/penitentiary.png/penitentiary-nofloor-north.png b/gamedata/gfx/penitentiary.png/penitentiary-nofloor-north.png deleted file mode 100644 index 70fc13a6e2e21faca88ad08c08b26e99f86a07f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 354 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCc!u z2dagG>XW~I06EGft`Q}{`DrEPiAAXl?nQ|O8JWq>`FUljMJ1_43K{|V<*7vh&YIhn z6)yxTpX2G`7*a9k&4sg^%?<)b3!^zUHYq&O$zeb2vc};=f}6b{u2)6m(9Ip?-DDamIV^-c3zkbmETl zPx%0^UsC047sA$6O0izJw_1ud`M;~(Z?ze}{7>&=efIB|M#L{oj=v%;bzDyNtPAHe l{k(hqLH>3|28RFtnHkn!b`bx!vAiDSM^9Hjmvv4FO#t1)fTREb diff --git a/gamedata/gfx/penitentiary.png/penitentiary-nofloor-south.png b/gamedata/gfx/penitentiary.png/penitentiary-nofloor-south.png deleted file mode 100644 index 70fc13a6e2e21faca88ad08c08b26e99f86a07f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 354 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCc!u z2dagG>XW~I06EGft`Q}{`DrEPiAAXl?nQ|O8JWq>`FUljMJ1_43K{|V<*7vh&YIhn z6)yxTpX2G`7*a9k&4sg^%?<)b3!^zUHYq&O$zeb2vc};=f}6b{u2)6m(9Ip?-DDamIV^-c3zkbmETl zPx%0^UsC047sA$6O0izJw_1ud`M;~(Z?ze}{7>&=efIB|M#L{oj=v%;bzDyNtPAHe l{k(hqLH>3|28RFtnHkn!b`bx!vAiDSM^9Hjmvv4FO#t1)fTREb diff --git a/gamedata/gfx/penitentiary.png/penitentiary-nofloor-west.png b/gamedata/gfx/penitentiary.png/penitentiary-nofloor-west.png deleted file mode 100644 index 9ee4777fad04b64ec8691abc4ef37c688a1203aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCc!u z2dagGsxz0IfgI%$*NBqf{Irtt#G+IN_oBptjLc-`{JgT%qLS1i1&x6G^3opc+X!6jRkoRMiTT?H2S0-a9}JExXAqIgs}N;4tjx8)>8_$L ji^v;3*Km-x{{LrY5Ycuj3^_X|7{vE<^>bP0l+XkK150l2 diff --git a/gamedata/gfx.riderx/penitentiary.png/penitentiary-nofloor-south.png b/gamedata/gfx/penitentiary.png/penitentiary-nofloor-x.png similarity index 100% rename from gamedata/gfx.riderx/penitentiary.png/penitentiary-nofloor-south.png rename to gamedata/gfx/penitentiary.png/penitentiary-nofloor-x.png diff --git a/gamedata/gfx.riderx/penitentiary.png/penitentiary-nofloor-west.png b/gamedata/gfx/penitentiary.png/penitentiary-nofloor-y.png similarity index 100% rename from gamedata/gfx.riderx/penitentiary.png/penitentiary-nofloor-west.png rename to gamedata/gfx/penitentiary.png/penitentiary-nofloor-y.png diff --git a/gamedata/gfx/safari.png/safari-nofloor-east.png b/gamedata/gfx/safari.png/safari-nofloor-east.png deleted file mode 100644 index 5d81c802d12ded686fb87888937ab64ed2aa9d97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCc~;(thsGj@j{^TVow*x zkcv5PE(HoU81OJ(xG{reUwWe0h6YxhD@=Jexn!*S)R?x_?LX}vG{eHjK*U1iM(Y7J zmN3PD76&mVHJ7)I-CpSf%#po|4%42t6^TLp|m197_Iw(Ert5c(8$+Yu1AW jT#P#P2RRuS{{LrYFujxN@AznaCCCq+u6{1-oD!MOQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCc~;(thsGj@j{^Td`}n0 zkcv5P&Yu=-P~dS1tlGpHy@54)0qeG1-rN5@5J;bNf#K#p>+U5+J4_C;{7qp{IqvXD zu4#9^V8t(~hVA-xKX(03d#h)W_1)oi^@4Kg6?sj;rQ9#}vi_UPSi*Ke(jlDz%s9=; d!0`V+GehkEGy|VcCo)0q_jL7hS?83{1OTZ_WxD_X diff --git a/gamedata/gfx/safari.png/safari-nofloor-south.png b/gamedata/gfx/safari.png/safari-nofloor-south.png deleted file mode 100644 index ce91ce64e0ed18903eeb5bd8a6c1e4df05ce5896..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCc~;(thsGj@j{^Td`}n0 zkcv5P&Yu=-P~dS1tlGpHy@54)0qeG1-rN5@5J;bNf#K#p>+U5+J4_C;{7qp{IqvXD zu4#9^V8t(~hVA-xKX(03d#h)W_1)oi^@4Kg6?sj;rQ9#}vi_UPSi*Ke(jlDz%s9=; d!0`V+GehkEGy|VcCo)0q_jL7hS?83{1OTZ_WxD_X diff --git a/gamedata/gfx/safari.png/safari-nofloor-west.png b/gamedata/gfx/safari.png/safari-nofloor-west.png deleted file mode 100644 index 5d81c802d12ded686fb87888937ab64ed2aa9d97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBR!VDxC>OQdmNyg$JcPEB*=VV?2Ih+L^k;M!Q z+(IDCc~;(thsGj@j{^TVow*x zkcv5PE(HoU81OJ(xG{reUwWe0h6YxhD@=Jexn!*S)R?x_?LX}vG{eHjK*U1iM(Y7J zmN3PD76&mVHJ7)I-CpSf%#po|4%42t6^TLp|m197_Iw(Ert5c(8$+Yu1AW jT#P#P2RRuS{{LrYFujxN@AznaCCCq+u6{1-oD!MsetName( "shaded " + getRawImage().getName() ); } -int FloorTile::getColumn () const +unsigned int FloorTile::getIndexOfColumn () const { assert( mediator != nilPointer ); return mediator->getRoom()->getTilesX() * getCellY() + getCellX(); diff --git a/source/FloorTile.hpp b/source/FloorTile.hpp index 003c9914..c971a059 100644 --- a/source/FloorTile.hpp +++ b/source/FloorTile.hpp @@ -64,9 +64,9 @@ class FloorTile : public Drawable, public Mediated, public Shady public: /** - * Room’s column to which this tile belongs + * The number of room’s column where this tile is located */ - int getColumn () const ; + unsigned int getIndexOfColumn () const ; std::string getUniqueName () const { return uniqueName ; } diff --git a/source/GameManager.hpp b/source/GameManager.hpp index f491ff67..46f7876f 100644 --- a/source/GameManager.hpp +++ b/source/GameManager.hpp @@ -217,7 +217,7 @@ class GameManager void eatFish ( const AvatarItem & character, Room * room, int x, int y, int z ) ; - std::string getChosenGraphicsSet () const { return chosenGraphicsSet ; } + const std::string & getChosenGraphicsSet () const { return chosenGraphicsSet ; } void setChosenGraphicsSet ( const std::string & newSet ) { chosenGraphicsSet = newSet ; } diff --git a/source/Mediator.cpp b/source/Mediator.cpp index ffa43d47..c7015526 100644 --- a/source/Mediator.cpp +++ b/source/Mediator.cpp @@ -253,7 +253,7 @@ void Mediator::wantShadowFromGridItem( const GridItem& item ) shadeFreeItemsBeneathItemAt( item, item.getX (), item.getY (), item.getZ () ); - int column = item.getColumnOfGrid(); + unsigned int column = item.getColumnOfGrid (); // shade grid items below if ( ! room->gridItems[ column ].empty() ) @@ -290,7 +290,7 @@ void Mediator::wantShadowFromFreeItemAt( const FreeItem& item, int x, int y, int shadeFreeItemsBeneathItemAt( item, x, y, z ); - // the range of cells where this item is + // the range of tiles (columns, cells) where this item is int xStart = x / room->getSizeOfOneTile (); int xEnd = ( x + item.getWidthX() - 1 ) / room->getSizeOfOneTile () + 1 ; int yStart = ( y - item.getWidthY() + 1 ) / room->getSizeOfOneTile (); @@ -299,14 +299,15 @@ void Mediator::wantShadowFromFreeItemAt( const FreeItem& item, int x, int y, int for ( int i = xStart; i < xEnd; ++ i ) { for ( int j = yStart; j < yEnd; ++ j ) { - // mark to shade every item below the free item in this cell - int column = room->getTilesX() * j + i ; + unsigned int column = room->getTilesX() * j + i ; + + // mark to shade grid items in the column for ( std::vector< GridItemPtr >::iterator g = room->gridItems[ column ]. begin (); g != room->gridItems[ column ]. end (); ++ g ) { GridItem & gridItem = *( *g ); - if ( z > gridItem.getZ () ) + if ( z > gridItem.getZ () ) // below the free item { gridItem.freshProcessedImage(); gridItem.setWantShadow( true ); @@ -364,8 +365,8 @@ void Mediator::castShadowOnFloor( FloorTile& floorTile ) int xCell = floorTile.getCellX (); int yCell = floorTile.getCellY (); - int column = floorTile.getColumn (); - int tileSize = room->getSizeOfOneTile (); + unsigned int column = floorTile.getIndexOfColumn (); + unsigned int tileSize = room->getSizeOfOneTile (); // shade with every grid item above for ( std::vector< GridItemPtr >::const_iterator g = room->gridItems[ column ].begin (); g != room->gridItems[ column ].end (); ++ g ) diff --git a/source/PoolOfPictures.cpp b/source/PoolOfPictures.cpp index edcc63e5..d91bdd51 100644 --- a/source/PoolOfPictures.cpp +++ b/source/PoolOfPictures.cpp @@ -10,18 +10,35 @@ #endif -PicturePtr PoolOfPictures::getPicture( const std::string& imageFile ) const +/* static */ +bool PoolOfPictures::isPictureThere ( const std::string & imageFile ) { - std::string gfxPrefix = GameManager::getInstance().getChosenGraphicsSet() ; + const std::string & gfxPrefix = GameManager::getInstance().getChosenGraphicsSet() ; + std::string path = ospaths::pathToFile( ospaths::sharePath() + gfxPrefix, imageFile ); + autouniqueptr< allegro::Pict > picture( allegro::Pict::fromPNGFile( path ) ); + return picture->isNotNil() ; +} + +bool PoolOfPictures::hasPicture ( const std::string & imageFile ) const +{ + const std::string & gfxPrefix = GameManager::getInstance().getChosenGraphicsSet() ; + std::string key = gfxPrefix + ":" + imageFile ; + + return ( pictures.find( key ) != pictures.end () ); +} + +PicturePtr PoolOfPictures::getPicture( const std::string & imageFile ) const +{ + const std::string & gfxPrefix = GameManager::getInstance().getChosenGraphicsSet() ; std::string key = gfxPrefix + ":" + imageFile ; std::map< std::string, PicturePtr >::const_iterator pi = pictures.find( key ) ; return ( pi != pictures.end () ) ? ( *pi ).second : PicturePtr () ; } -PicturePtr PoolOfPictures::getOrLoadAndGet( const std::string& imageFile ) +PicturePtr PoolOfPictures::getOrLoadAndGet( const std::string & imageFile ) { - std::string gfxPrefix = GameManager::getInstance().getChosenGraphicsSet() ; + const std::string & gfxPrefix = GameManager::getInstance().getChosenGraphicsSet() ; std::string key = gfxPrefix + ":" + imageFile ; if ( pictures.find( key ) == pictures.end () ) @@ -45,9 +62,9 @@ PicturePtr PoolOfPictures::getOrLoadAndGet( const std::string& imageFile ) return pictures[ key ] ; } -PicturePtr PoolOfPictures::getOrLoadAndGetOrMakeAndGet( const std::string& imageFile, unsigned int imageWidth, unsigned int imageHeight ) +PicturePtr PoolOfPictures::getOrLoadAndGetOrMakeAndGet( const std::string & imageFile, unsigned int imageWidth, unsigned int imageHeight ) { - std::string gfxPrefix = GameManager::getInstance().getChosenGraphicsSet() ; + const std::string & gfxPrefix = GameManager::getInstance().getChosenGraphicsSet() ; std::string key = gfxPrefix + ":" + imageFile ; if ( pictures.find( key ) == pictures.end () || pictures[ key ] == nilPointer ) @@ -71,9 +88,9 @@ PicturePtr PoolOfPictures::getOrLoadAndGetOrMakeAndGet( const std::string& image return pictures[ key ] ; } -PicturePtr PoolOfPictures::makePicture( const std::string& imageFile, unsigned int imageWidth, unsigned int imageHeight ) +PicturePtr PoolOfPictures::makePicture( const std::string & imageFile, unsigned int imageWidth, unsigned int imageHeight ) { - std::string gfxPrefix = GameManager::getInstance().getChosenGraphicsSet() ; + const std::string & gfxPrefix = GameManager::getInstance().getChosenGraphicsSet() ; std::string key = gfxPrefix + ":" + imageFile ; pictures[ key ] = PicturePtr( new Picture( imageWidth, imageHeight ) ) ; @@ -87,9 +104,9 @@ PicturePtr PoolOfPictures::makePicture( const std::string& imageFile, unsigned i return pictures[ key ] ; } -void PoolOfPictures::putPicture( const std::string& imageFile, const PicturePtr& picture ) +void PoolOfPictures::putPicture( const std::string & imageFile, const PicturePtr & picture ) { - std::string gfxPrefix = GameManager::getInstance().getChosenGraphicsSet() ; + const std::string & gfxPrefix = GameManager::getInstance().getChosenGraphicsSet() ; std::string key = gfxPrefix + ":" + imageFile ; pictures[ key ] = picture ; diff --git a/source/PoolOfPictures.hpp b/source/PoolOfPictures.hpp index f5fe639c..04b82d03 100644 --- a/source/PoolOfPictures.hpp +++ b/source/PoolOfPictures.hpp @@ -28,6 +28,8 @@ class PoolOfPictures void clear () { pictures.clear() ; } + bool hasPicture ( const std::string & imageFile ) const ; + PicturePtr getPicture ( const std::string & imageFile ) const ; PicturePtr getOrLoadAndGet ( const std::string & imageFile ) ; @@ -38,6 +40,8 @@ class PoolOfPictures void putPicture ( const std::string & imageFile, const PicturePtr & picture ) ; + static bool isPictureThere ( const std::string & imageFile ) ; + private: std::map < std::string /* imageFile */, PicturePtr /* image */ > pictures ; diff --git a/source/Room.cpp b/source/Room.cpp index d5594eac..2dcff1e3 100644 --- a/source/Room.cpp +++ b/source/Room.cpp @@ -477,7 +477,7 @@ void Room::addFloorTile( FloorTile * floorTile ) // bin old tile, if any removeFloorAt( floorTile->getCellX(), floorTile->getCellY() ); - floorTiles[ floorTile->getColumn() ] = floorTile; + this->floorTiles[ floorTile->getIndexOfColumn() ] = floorTile; } void Room::addWall( Wall * wall ) @@ -959,7 +959,7 @@ void Room::removeFloorAt( int tileX, int tileY ) void Room::removeFloorTile( FloorTile * floorTile ) { if ( floorTile != nilPointer ) - floorTiles[ floorTile->getColumn () ] = nilPointer ; + this->floorTiles[ floorTile->getIndexOfColumn () ] = nilPointer ; delete floorTile ; } diff --git a/source/RoomBuilder.cpp b/source/RoomBuilder.cpp index ebd82389..20888304 100644 --- a/source/RoomBuilder.cpp +++ b/source/RoomBuilder.cpp @@ -230,7 +230,7 @@ Room* RoomBuilder::buildRoom ( const std::string& roomFile ) } } - // read about tiles with no floor + // read about tiles with no floor in a triple room std::vector< std::pair< int, int > > tilesWithoutFloor ; @@ -265,7 +265,7 @@ Room* RoomBuilder::buildRoom ( const std::string& roomFile ) { // build the floor automatically - std::string sceneryPrefix = scenery + "-" ; + const std::string sceneryPrefix = scenery + "-" ; int lastTileX = xTiles - 1 ; int lastTileY = yTiles - 1 ; @@ -376,14 +376,10 @@ Room* RoomBuilder::buildRoom ( const std::string& roomFile ) { if ( tileX == lastTileX && tileY == lastTileY ) suffixOfNotFullTile = "sw" ; - else if ( tileX == 0 ) - suffixOfNotFullTile = "north" ; - else if ( tileY == 0 ) - suffixOfNotFullTile = "east" ; - else if ( tileX == lastTileX ) - suffixOfNotFullTile = "south" ; - else if ( tileY == lastTileY ) - suffixOfNotFullTile = "west" ; + else if ( tileX == 0 || tileX == lastTileX ) + suffixOfNotFullTile = "x" ; + else if ( tileY == 0 || tileY == lastTileY ) + suffixOfNotFullTile = "y" ; else continue ; @@ -395,6 +391,9 @@ Room* RoomBuilder::buildRoom ( const std::string& roomFile ) fileOfTile += ".png" ; fileOfFullTile += ".png" ; + if ( ! PoolOfPictures::isPictureThere( fileOfTile ) ) + std::cout << "picture \"" << fileOfTile << "\" is *not* there :(" << std::endl ; + std::pair< int, int > tileXY( tileX, tileY ); if ( std::find( tilesWithoutFloor.begin (), tilesWithoutFloor.end (), tileXY ) == tilesWithoutFloor.end () && @@ -413,8 +412,8 @@ Room* RoomBuilder::buildRoom ( const std::string& roomFile ) else { bool darken = GameManager::getInstance().getCastShadows() ; - if ( GameManager::getInstance().getChosenGraphicsSet() == "gfx.2003" || - GameManager::getInstance().getChosenGraphicsSet() == "gfx.riderx" ) darken = false ; + if ( GameManager::getInstance().getChosenGraphicsSet() == "gfx.2003" + || GameManager::getInstance().getChosenGraphicsSet() == "gfx.riderx" ) darken = false ; const PicturePtr& imageOfFullTile = floorImages.getOrLoadAndGetOrMakeAndGet( fileOfFullTile, 64, 40 ); PicturePtr imageOfPartialTile = FloorTile::fullTileToPartialTile( * imageOfFullTile, suffixOfNotFullTile, darken ); @@ -422,9 +421,9 @@ Room* RoomBuilder::buildRoom ( const std::string& roomFile ) } } - if ( floorImages.getPicture( fileOfTile ) != nilPointer ) + if ( floorImages.hasPicture( fileOfTile ) ) { - const PicturePtr& image = floorImages.getPicture( fileOfTile ) ; + const PicturePtr & image = floorImages.getPicture( fileOfTile ) ; image->setName( nameOfPicture ); if ( image->getHeight() < 40 ) diff --git a/source/guiactions/ShowAuthors.cpp b/source/guiactions/ShowAuthors.cpp index 7570bf69..61f5210f 100644 --- a/source/guiactions/ShowAuthors.cpp +++ b/source/guiactions/ShowAuthors.cpp @@ -129,11 +129,9 @@ void ShowAuthors::doAction () PictureWidget* widgetForLoadingScreen = nilPointer; - // move text up - while ( ! screen.getEscapeAction()->hasBegun() ) { - int yNow = linesOfCredits->getY() - 1; + int yNow = linesOfCredits->getY() - 1 ; // move it up if ( allegro::isKeyPushed( "b" ) || ( allegro::isKeyPushed( "Space" ) && allegro::isShiftKeyPushed() )