diff --git a/Utils/MapEdit/Core.cpp b/Utils/MapEdit/Core.cpp index fb1bb48a6..627c4b7c0 100644 --- a/Utils/MapEdit/Core.cpp +++ b/Utils/MapEdit/Core.cpp @@ -83,8 +83,8 @@ int Width,Height; AddLayer(LAYER_TYPE_TILE,LAYER_SUBTYPE_ACTION, Width, Height); #ifdef _DEBUG // AddLayer(LAYER_TYPE_SHADE,LAYER_SUBTYPE_NONE, Width, Height); - AddLayer(LAYER_TYPE_TRIGGER,LAYER_SUBTYPE_NONE, Width, Height); -// AddLayer(LAYER_TYPE_PLATFORM,LAYER_SUBTYPE_NONE, Width, Height); +// AddLayer(LAYER_TYPE_TRIGGER,LAYER_SUBTYPE_NONE, Width, Height); + AddLayer(LAYER_TYPE_PLATFORM,LAYER_SUBTYPE_NONE, Width, Height); // AddLayer(LAYER_TYPE_HAZARD,LAYER_SUBTYPE_NONE, Width, Height); // AddLayer(LAYER_TYPE_FX,LAYER_SUBTYPE_NONE, Width, Height); // AddLayer(LAYER_TYPE_ACTOR,LAYER_SUBTYPE_NONE, Width, Height); @@ -98,7 +98,7 @@ int Width,Height; ActiveLayer=FindLayer(LAYER_TYPE_TILE,LAYER_SUBTYPE_ACTION); #ifdef _DEBUG - ActiveLayer=FindLayer(LAYER_TYPE_TRIGGER,LAYER_SUBTYPE_NONE); + ActiveLayer=FindLayer(LAYER_TYPE_PLATFORM,LAYER_SUBTYPE_NONE); if (ActiveLayer<0) ActiveLayer=0; #endif CurrentLayer=Layer[ActiveLayer]; diff --git a/Utils/MapEdit/Export.cpp b/Utils/MapEdit/Export.cpp index 22761ee50..5e05df3d7 100644 --- a/Utils/MapEdit/Export.cpp +++ b/Utils/MapEdit/Export.cpp @@ -162,17 +162,17 @@ void CExport::ExportTile3d(CCore *Core,CElem &ThisTile,sExpTile &OutTile) } /*****************************************************************************/ -void CExport::ExportElem3d(CCore *Core,CElem &ThisTile,int &TriStart,int &TriCount) +void CExport::ExportElem3d(CCore *Core,CElem &ThisElem,int &TriStart,int &TriCount) { CTexCache &TexCache=Core->GetTexCache(); -std::vector &TileTriList=ThisTile.GetTriList(); +std::vector &ElemTriList=ThisElem.GetTriList(); TriStart=TriList.size(); - TriCount=TileTriList.size(); + TriCount=ElemTriList.size(); for (int T=0; T