Skip to content

Commit 3376cc4

Browse files
committed
Add interior
1 parent 17dfcec commit 3376cc4

3 files changed

Lines changed: 51 additions & 1 deletion

File tree

Project/VS2015/ofed.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
<LinkIncremental>false</LinkIncremental>
121121
<IncludePath>D:\Systems\Librarys\wxWidgets3.1\include\msvc;D:\Systems\Librarys\wxWidgets3.1\include;D:\Systems\Librarys\SDL2-2.0.4\include;$(IncludePath)</IncludePath>
122122
<LibraryPath>D:\Systems\Librarys\wxWidgets3.1\lib\vc_x64_lib;D:\Systems\Librarys\SDL2-2.0.4\lib\x64;$(LibraryPath)</LibraryPath>
123+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\..\..\..\..\Run\</OutDir>
123124
</PropertyGroup>
124125
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
125126
<ClCompile>

Source/FrameOFED.cpp

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ void cFrameOFED::Mnusavemap1003Click(wxCommandEvent& event) {
191191
return;
192192

193193
g_OFED.SaveMap( filename );
194-
195194
}
196195

197196
void cFrameOFED::Mnuquit1005Click( wxCommandEvent& event ) {
@@ -361,6 +360,13 @@ sTiles cFrameOFED::SetupBarracks( cSurface **pSurface ) {
361360
*pSurface = new cSurface( 16 * 4, 16 * 4 );
362361
}
363362

363+
if (g_OFED.mMapTileType == eTileTypes_Int) {
364+
Tiles.mTiles.push_back( sRangeTile( 0, 0, 246 ) );
365+
Tiles.mTiles.push_back( sRangeTile( 0, 1, 266 ) );
366+
367+
*pSurface = new cSurface( 16 * 3, 16 * 3 );
368+
}
369+
364370
return Tiles;
365371
}
366372

@@ -456,6 +462,14 @@ sTiles cFrameOFED::SetupHut( cSurface **pSurface ) {
456462
*pSurface = new cSurface( 16 * 5, 16 * 5 );
457463
}
458464

465+
if (g_OFED.mMapTileType == eTileTypes_Int) {
466+
Tiles.mTiles.push_back( sRangeTile( 0, 0, 246 ) );
467+
Tiles.mTiles.push_back( sRangeTile( 0, 1, 266 ) );
468+
469+
470+
*pSurface = new cSurface( 16 * 3, 16 * 3 );
471+
}
472+
459473
return Tiles;
460474
}
461475

@@ -525,6 +539,15 @@ sTiles cFrameOFED::SetupBunker( cSurface **pSurface ) {
525539

526540
*pSurface = new cSurface( 16 * 4, 16 * 4 );
527541
}
542+
543+
544+
if (g_OFED.mMapTileType == eTileTypes_Int) {
545+
Tiles.mTiles.push_back( sRangeTile( 0, 0, 331 ) );
546+
Tiles.mTiles.push_back( sRangeTile( 0, 1, 351 ) );
547+
548+
*pSurface = new cSurface( 16 * 3, 16 * 3 );
549+
}
550+
528551
return Tiles;
529552
}
530553

@@ -557,6 +580,10 @@ void cFrameOFED::MnuHutSoldier1012Click(wxCommandEvent& event) {
557580
Tiles.mSprites.push_back( sRangeSprite( 28, 65, eSprite_BuildingDoor2 ) );
558581
}
559582

583+
if (g_OFED.mMapTileType == eTileTypes_Int) {
584+
Tiles.mSprites.push_back( sRangeSprite( 3, 5, eSprite_BuildingDoor2 ) );
585+
}
586+
560587
SetupCursorForDraw( Surface, Tiles );
561588
}
562589

@@ -589,6 +616,10 @@ void cFrameOFED::MnuHutIndigenous1013Click(wxCommandEvent& event) {
589616
Tiles.mSprites.push_back( sRangeSprite( 28, 65, eSprite_Door_Indigenous ) );
590617
}
591618

619+
if (g_OFED.mMapTileType == eTileTypes_Int) {
620+
Tiles.mSprites.push_back( sRangeSprite( 3, 5, eSprite_Door_Indigenous ) );
621+
}
622+
592623
SetupCursorForDraw( Surface, Tiles );
593624
}
594625

@@ -619,6 +650,11 @@ void cFrameOFED::Mnuindigenouswithspear1014Click(wxCommandEvent& event) {
619650
if (g_OFED.mMapTileType == eTileTypes_Moors) {
620651
Tiles.mSprites.push_back( sRangeSprite( 28, 65, eSprite_Door_Indigenous_Spear ) );
621652
}
653+
654+
if (g_OFED.mMapTileType == eTileTypes_Int) {
655+
Tiles.mSprites.push_back( sRangeSprite( 3, 5, eSprite_Door_Indigenous_Spear ) );
656+
}
657+
622658
SetupCursorForDraw( Surface, Tiles );
623659
}
624660

@@ -648,6 +684,9 @@ void cFrameOFED::MnuBunkerSoldier1015Click(wxCommandEvent& event) {
648684
Tiles.mSprites.push_back( sRangeSprite( 23, 32, eSprite_BuildingDoor3 ) );
649685
}
650686

687+
if (g_OFED.mMapTileType == eTileTypes_Int) {
688+
Tiles.mSprites.push_back( sRangeSprite( 3, 3, eSprite_BuildingDoor3 ) );
689+
}
651690
SetupCursorForDraw( Surface, Tiles );
652691
}
653692

@@ -676,6 +715,10 @@ void cFrameOFED::MnuBunkerSoldierReinforced1016Click(wxCommandEvent& event) {
676715
if (g_OFED.mMapTileType == eTileTypes_Moors) {
677716
Tiles.mSprites.push_back( sRangeSprite( 23, 32, eSprite_BuildingDoor_Reinforced ) );
678717
}
718+
719+
if (g_OFED.mMapTileType == eTileTypes_Int) {
720+
Tiles.mSprites.push_back( sRangeSprite( 3, 3, eSprite_BuildingDoor_Reinforced ) );
721+
}
679722
SetupCursorForDraw( Surface, Tiles );
680723
}
681724

@@ -711,6 +754,9 @@ void cFrameOFED::MnuBarracksSoldier1017Click(wxCommandEvent& event) {
711754
Tiles.mSprites.push_back( sRangeSprite( 7, 33, eSprite_BuildingDoor ) );
712755
}
713756

757+
if (g_OFED.mMapTileType == eTileTypes_Int) {
758+
Tiles.mSprites.push_back( sRangeSprite( 3, 5, eSprite_BuildingDoor ) );
759+
}
714760
SetupCursorForDraw( Surface, Tiles );
715761
}
716762

Source/PanelTileView.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ void cPanelTileView::OnMouseInputTimer( wxTimerEvent& event ) {
8484
wxCoord MouseX = (Point.x - GetScreenPosition().x) / mScaleWidth;
8585
wxCoord MouseY = (Point.y - GetScreenPosition().y) / mScaleHeight;
8686

87+
if (MouseX < 0 || MouseY < 0)
88+
return;
89+
8790
uint32 TileX = MouseX / 16;
8891
uint32 TileY = MouseY / 16;
8992

0 commit comments

Comments
 (0)