diff --git a/Utils/MapEdit/ExportHdr.h b/Utils/MapEdit/ExportHdr.h index 6fd1f706f..ff378e879 100644 --- a/Utils/MapEdit/ExportHdr.h +++ b/Utils/MapEdit/ExportHdr.h @@ -82,6 +82,9 @@ struct sExpLayerTile u16 Tile; u16 Flags; // bool operator==(sExpLayerTile const &v1) {return (Tile==v1.Tile);} +//bool operator==(sExpLayerTile const &v1) {return (Tile==v1.Tile);} +bool operator ==(sExpLayerTile const &v1) {return(Tile==v1.Tile && Flags==v1.Flags);} + }; diff --git a/Utils/MapEdit/LayerThing.cpp b/Utils/MapEdit/LayerThing.cpp index e299a57c5..724cbba5b 100644 --- a/Utils/MapEdit/LayerThing.cpp +++ b/Utils/MapEdit/LayerThing.cpp @@ -697,6 +697,18 @@ sLayerThing &ThisThing=ThingList[CurrentThing]; GUIThingPointUpdate(); } +/*****************************************************************************/ +int CLayerThing::GetWidth() +{ + return(theApp.GetCurrent()->GetMapWidth()); +} + +/*****************************************************************************/ +int CLayerThing::GetHeight() +{ + return(theApp.GetCurrent()->GetMapHeight()); +} + /*****************************************************************************/ /*****************************************************************************/ /*****************************************************************************/ diff --git a/Utils/MapEdit/LayerThing.h b/Utils/MapEdit/LayerThing.h index 7e625182a..3c8bd65eb 100644 --- a/Utils/MapEdit/LayerThing.h +++ b/Utils/MapEdit/LayerThing.h @@ -53,6 +53,9 @@ virtual void GUIKill(CCore *Core); virtual void GUIUpdate(CCore *Core); virtual void GUIChanged(CCore *Core); + int GetWidth(); + int GetHeight(); + virtual void GUIThingDefClear(){}; virtual void GUIThingUpdate(bool OnlySel=false){}; virtual void GUIThingUpdateList(CComboBox &List,bool OnlySel=false); diff --git a/Utils/MapEdit/MapEditDoc.h b/Utils/MapEdit/MapEditDoc.h index 0fa51e560..e9fd58756 100644 --- a/Utils/MapEdit/MapEditDoc.h +++ b/Utils/MapEdit/MapEditDoc.h @@ -28,6 +28,9 @@ public: void GUIUpdate(); void GUIChanged(); + int GetMapWidth() {return(Core.GetMapWidth());} + int GetMapHeight() {return(Core.GetMapHeight());} + // Windows Messages Thru Point void LButtonControl(UINT nFlags, CPoint &point,BOOL DownFlag); diff --git a/Utils/MkLevel/MkLevel.cpp b/Utils/MkLevel/MkLevel.cpp index e0c237468..ae207a9a8 100644 --- a/Utils/MkLevel/MkLevel.cpp +++ b/Utils/MkLevel/MkLevel.cpp @@ -854,8 +854,6 @@ void CMkLevel::WriteLayers() LevelHdr.MidLayer=WriteLayer(LAYER_TYPE_TILE,LAYER_SUBTYPE_MID,"Mid"); // Action LevelHdr.ActionLayer=WriteLayer(LAYER_TYPE_TILE,LAYER_SUBTYPE_ACTION,"Action"); -// Fore -// LevelHdr.ForeLayer=WriteLayer(LAYER_TYPE_TILE,LAYER_SUBTYPE_FORE,"Fore"); // Collision LevelHdr.CollisionLayer=WriteLayer(LAYER_TYPE_COLLISION,LAYER_SUBTYPE_NONE,"Collision");