...
 
Commits (2)
......@@ -7,3 +7,5 @@
/data/editor.xml
/data/maps
/proj/vc14/.vs/Landlord/v14/*.suo
.vs
/data/tsets/tset_001.png
......@@ -92,15 +92,16 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\..\src\Button.h" />
<ClInclude Include="..\..\src\Cell.h" />
<ClInclude Include="..\..\src\Common.h" />
<ClInclude Include="..\..\src\ConfigStrings.h" />
<ClInclude Include="..\..\src\Control.h" />
<ClInclude Include="..\..\src\Defaults.h" />
<ClInclude Include="..\..\src\EditorState.h" />
<ClInclude Include="..\..\src\Entity.h" />
<ClInclude Include="..\..\src\GameField.h" />
<ClInclude Include="..\..\src\Map.h" />
<ClInclude Include="..\..\src\Map\Cell.h" />
<ClInclude Include="..\..\src\Map\Entity.h" />
<ClInclude Include="..\..\src\Map\GameField.h" />
<ClInclude Include="..\..\src\Map\Map.h" />
<ClInclude Include="..\..\src\Map\Tileset.h" />
<ClInclude Include="..\..\src\Menu.h" />
<ClInclude Include="..\..\src\MiniMap.h" />
<ClInclude Include="..\..\src\Pattern.h" />
......@@ -113,20 +114,20 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\Button.cpp" />
<ClCompile Include="..\..\src\Cell.cpp" />
<ClCompile Include="..\..\src\Common.cpp" />
<ClCompile Include="..\..\src\Control.cpp" />
<ClCompile Include="..\..\src\EditorState.cpp" />
<ClCompile Include="..\..\src\Entity.cpp" />
<ClCompile Include="..\..\src\GameField.cpp" />
<ClCompile Include="..\..\src\main.cpp" />
<ClCompile Include="..\..\src\Map.cpp" />
<ClCompile Include="..\..\src\Map\Cell.cpp" />
<ClCompile Include="..\..\src\Map\Entity.cpp" />
<ClCompile Include="..\..\src\Map\GameField.cpp" />
<ClCompile Include="..\..\src\Map\Map.cpp" />
<ClCompile Include="..\..\src\Map\Tileset.cpp" />
<ClCompile Include="..\..\src\Menu.cpp" />
<ClCompile Include="..\..\src\MiniMap.cpp" />
<ClCompile Include="..\..\src\StartState.cpp" />
<ClCompile Include="..\..\src\TextField.cpp" />
<ClCompile Include="..\..\src\TilePalette.cpp" />
<ClCompile Include="..\..\src\Tileset.cpp" />
<ClCompile Include="..\..\src\ToolBar.cpp" />
</ItemGroup>
<ItemGroup>
......
......@@ -25,6 +25,12 @@
<Filter Include="Source Files\UI">
<UniqueIdentifier>{36e7f44d-1d18-4f61-8ad1-6a97e834f0f2}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Map">
<UniqueIdentifier>{b398f31b-b8f6-4d13-88e8-bb4ad4c7b336}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\Map">
<UniqueIdentifier>{cbfc5601-1e6f-4cd1-8040-cf4f4b66a0ee}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\ConfigStrings.h">
......@@ -42,15 +48,6 @@
<ClInclude Include="..\..\src\StartState.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Entity.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\GameField.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Map.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Tileset.h">
<Filter>Header Files</Filter>
</ClInclude>
......@@ -63,9 +60,6 @@
<ClInclude Include="..\..\src\Button.h">
<Filter>Header Files\UI Core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Cell.h">
<Filter>Header Files\UI Core</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Control.h">
<Filter>Header Files\UI Core</Filter>
</ClInclude>
......@@ -84,6 +78,21 @@
<ClInclude Include="..\..\src\MiniMap.h">
<Filter>Header Files\UI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Map\Cell.h">
<Filter>Header Files\Map</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Map\Entity.h">
<Filter>Header Files\Map</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Map\GameField.h">
<Filter>Header Files\Map</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Map\Map.h">
<Filter>Header Files\Map</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Map\Tileset.h">
<Filter>Header Files\Map</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\EditorState.cpp">
......@@ -95,21 +104,6 @@
<ClCompile Include="..\..\src\StartState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Entity.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Map.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Tileset.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\GameField.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Cell.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Common.cpp">
<Filter>Source Files</Filter>
</ClCompile>
......@@ -134,6 +128,21 @@
<ClCompile Include="..\..\src\MiniMap.cpp">
<Filter>Source Files\UI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Map\Cell.cpp">
<Filter>Source Files\Map</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Map\Entity.cpp">
<Filter>Source Files\Map</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Map\GameField.cpp">
<Filter>Source Files\Map</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Map\Map.cpp">
<Filter>Source Files\Map</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Map\Tileset.cpp">
<Filter>Source Files\Map</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Landlord.rc">
......
#ifndef __EDITOR_STATE__
#define __EDITOR_STATE__
#pragma once
#include "NAS2D/NAS2D.h"
#include "Entity.h"
#include "Map.h"
#include "Menu.h"
#include "MiniMap.h"
#include "TilePalette.h"
#include "ToolBar.h"
#include "Button.h"
#include "TextField.h"
#include "Map/Entity.h"
#include "Map/Map.h"
#include <string>
#include <map>
......@@ -151,5 +148,3 @@ private:
State* mReturnState;
};
#endif
\ No newline at end of file
......@@ -2,7 +2,7 @@
#include "NAS2D/NAS2D.h"
#include "Map.h"
#include "Map/Map.h"
using namespace NAS2D;
......
......@@ -2,12 +2,12 @@
#include "NAS2D/NAS2D.h"
#include "Tileset.h"
#include "Button.h"
#include "Pattern.h"
#include "Map/Tileset.h"
using namespace NAS2D;
/**
......