Skip to content

Commit c74e6c3

Browse files
segraxsegrax
committed
Add jungle/desert cliff
1 parent 372e66c commit c74e6c3

2 files changed

Lines changed: 162 additions & 52 deletions

File tree

‎Source/FrameOFED.cpp‎

Lines changed: 161 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ void cFrameOFED::MnuBarracksSoldier1017Click(wxCommandEvent& event) {
747747
}
748748

749749
if (g_OFED.mMapTileType == eTileTypes_Ice) {
750-
Tiles.mSprites.push_back( sRangeSprite( 25, -5, eSprite_BuildingRoof ) );
750+
Tiles.mSprites.push_back( sRangeSprite( 23, -5, eSprite_BuildingRoof ) );
751751
Tiles.mSprites.push_back( sRangeSprite( 20, 27, eSprite_BuildingDoor ) );
752752
}
753753

@@ -763,61 +763,170 @@ void cFrameOFED::MnuBarracksSoldier1017Click(wxCommandEvent& event) {
763763
}
764764

765765
void cFrameOFED::Mnucliff1018Click( wxCommandEvent& event ) {
766-
767-
if (g_OFED.mMapTileType != eTileTypes_Ice)
768-
return;
769-
770766
sTiles Tiles;
771767
cSurface *Surface = 0;
772768

773-
Tiles.mTiles.push_back( sRangeTile( 0, 0, 120 ) );
774-
Tiles.mTiles.push_back( sRangeTile( 1, 0, 121 ) );
775-
Tiles.mTiles.push_back( sRangeTile( 2, 0, 122 ) );
776-
Tiles.mTiles.push_back( sRangeTile( 3, 0, 123 ) );
777-
Tiles.mTiles.push_back( sRangeTile( 4, 0, 124 ) );
778-
Tiles.mTiles.push_back( sRangeTile( 5, 0, 125 ) );
779-
Tiles.mTiles.push_back( sRangeTile( 6, 0, 126 ) );
780-
Tiles.mTiles.push_back( sRangeTile( 7, 0, 127 ) );
781-
782-
Tiles.mTiles.push_back( sRangeTile( 0, 1, 140 ) );
783-
Tiles.mTiles.push_back( sRangeTile( 1, 1, 141 ) );
784-
Tiles.mTiles.push_back( sRangeTile( 2, 1, 142 ) );
785-
Tiles.mTiles.push_back( sRangeTile( 3, 1, 143 ) );
786-
Tiles.mTiles.push_back( sRangeTile( 4, 1, 144 ) );
787-
Tiles.mTiles.push_back( sRangeTile( 5, 1, 145 ) );
788-
Tiles.mTiles.push_back( sRangeTile( 6, 1, 146 ) );
789-
Tiles.mTiles.push_back( sRangeTile( 7, 1, 147 ) );
790-
791-
Tiles.mTiles.push_back( sRangeTile( 0, 2, 160 ) );
792-
Tiles.mTiles.push_back( sRangeTile( 1, 2, 161 ) );
793-
Tiles.mTiles.push_back( sRangeTile( 2, 2, 162 ) );
794-
Tiles.mTiles.push_back( sRangeTile( 3, 2, 163 ) );
795-
Tiles.mTiles.push_back( sRangeTile( 4, 2, 164 ) );
796-
Tiles.mTiles.push_back( sRangeTile( 5, 2, 165 ) );
797-
Tiles.mTiles.push_back( sRangeTile( 6, 2, 166 ) );
798-
Tiles.mTiles.push_back( sRangeTile( 7, 2, 167 ) );
799-
800-
Tiles.mTiles.push_back( sRangeTile( 0, 3, 180 ) );
801-
Tiles.mTiles.push_back( sRangeTile( 1, 3, 181 ) );
802-
Tiles.mTiles.push_back( sRangeTile( 2, 3, 182 ) );
803-
Tiles.mTiles.push_back( sRangeTile( 3, 3, 183 ) );
804-
Tiles.mTiles.push_back( sRangeTile( 4, 3, 184 ) );
805-
Tiles.mTiles.push_back( sRangeTile( 5, 3, 185 ) );
806-
Tiles.mTiles.push_back( sRangeTile( 6, 3, 186 ) );
807-
Tiles.mTiles.push_back( sRangeTile( 7, 3, 187 ) );
808-
809-
Tiles.mTiles.push_back( sRangeTile( 0, 4, 200 ) );
810-
Tiles.mTiles.push_back( sRangeTile( 1, 4, 201 ) );
811-
Tiles.mTiles.push_back( sRangeTile( 2, 4, 202 ) );
812-
Tiles.mTiles.push_back( sRangeTile( 3, 4, 203 ) );
813-
Tiles.mTiles.push_back( sRangeTile( 4, 4, 204 ) );
814-
Tiles.mTiles.push_back( sRangeTile( 5, 4, 205 ) );
815-
Tiles.mTiles.push_back( sRangeTile( 6, 4, 206 ) );
816-
Tiles.mTiles.push_back( sRangeTile( 7, 4, 207 ) );
817-
818-
Surface = new cSurface( 16 * 8, 16 * 5 );
769+
if (g_OFED.mMapTileType == eTileTypes_Ice) {
770+
Tiles.mTiles.push_back( sRangeTile( 0, 0, 120 ) );
771+
Tiles.mTiles.push_back( sRangeTile( 1, 0, 121 ) );
772+
Tiles.mTiles.push_back( sRangeTile( 2, 0, 122 ) );
773+
Tiles.mTiles.push_back( sRangeTile( 3, 0, 123 ) );
774+
Tiles.mTiles.push_back( sRangeTile( 4, 0, 124 ) );
775+
Tiles.mTiles.push_back( sRangeTile( 5, 0, 125 ) );
776+
Tiles.mTiles.push_back( sRangeTile( 6, 0, 126 ) );
777+
Tiles.mTiles.push_back( sRangeTile( 7, 0, 127 ) );
778+
779+
Tiles.mTiles.push_back( sRangeTile( 0, 1, 140 ) );
780+
Tiles.mTiles.push_back( sRangeTile( 1, 1, 141 ) );
781+
Tiles.mTiles.push_back( sRangeTile( 2, 1, 142 ) );
782+
Tiles.mTiles.push_back( sRangeTile( 3, 1, 143 ) );
783+
Tiles.mTiles.push_back( sRangeTile( 4, 1, 144 ) );
784+
Tiles.mTiles.push_back( sRangeTile( 5, 1, 145 ) );
785+
Tiles.mTiles.push_back( sRangeTile( 6, 1, 146 ) );
786+
Tiles.mTiles.push_back( sRangeTile( 7, 1, 147 ) );
787+
788+
Tiles.mTiles.push_back( sRangeTile( 0, 2, 160 ) );
789+
Tiles.mTiles.push_back( sRangeTile( 1, 2, 161 ) );
790+
Tiles.mTiles.push_back( sRangeTile( 2, 2, 162 ) );
791+
Tiles.mTiles.push_back( sRangeTile( 3, 2, 163 ) );
792+
Tiles.mTiles.push_back( sRangeTile( 4, 2, 164 ) );
793+
Tiles.mTiles.push_back( sRangeTile( 5, 2, 165 ) );
794+
Tiles.mTiles.push_back( sRangeTile( 6, 2, 166 ) );
795+
Tiles.mTiles.push_back( sRangeTile( 7, 2, 167 ) );
796+
797+
Tiles.mTiles.push_back( sRangeTile( 0, 3, 180 ) );
798+
Tiles.mTiles.push_back( sRangeTile( 1, 3, 181 ) );
799+
Tiles.mTiles.push_back( sRangeTile( 2, 3, 182 ) );
800+
Tiles.mTiles.push_back( sRangeTile( 3, 3, 183 ) );
801+
Tiles.mTiles.push_back( sRangeTile( 4, 3, 184 ) );
802+
Tiles.mTiles.push_back( sRangeTile( 5, 3, 185 ) );
803+
Tiles.mTiles.push_back( sRangeTile( 6, 3, 186 ) );
804+
Tiles.mTiles.push_back( sRangeTile( 7, 3, 187 ) );
805+
806+
Tiles.mTiles.push_back( sRangeTile( 0, 4, 200 ) );
807+
Tiles.mTiles.push_back( sRangeTile( 1, 4, 201 ) );
808+
Tiles.mTiles.push_back( sRangeTile( 2, 4, 202 ) );
809+
Tiles.mTiles.push_back( sRangeTile( 3, 4, 203 ) );
810+
Tiles.mTiles.push_back( sRangeTile( 4, 4, 204 ) );
811+
Tiles.mTiles.push_back( sRangeTile( 5, 4, 205 ) );
812+
Tiles.mTiles.push_back( sRangeTile( 6, 4, 206 ) );
813+
Tiles.mTiles.push_back( sRangeTile( 7, 4, 207 ) );
814+
815+
Surface = new cSurface( 16 * 8, 16 * 5 );
816+
}
817+
818+
if (g_OFED.mMapTileType == eTileTypes_Jungle) {
819+
Tiles.mTiles.push_back( sRangeTile( 0, 0, 89 ) );
820+
Tiles.mTiles.push_back( sRangeTile( 1, 0, 90 ) );
821+
Tiles.mTiles.push_back( sRangeTile( 2, 0, 91 ) );
822+
Tiles.mTiles.push_back( sRangeTile( 3, 0, 92 ) );
823+
Tiles.mTiles.push_back( sRangeTile( 4, 0, 93 ) );
824+
Tiles.mTiles.push_back( sRangeTile( 5, 0, 94 ) );
825+
826+
Tiles.mTiles.push_back( sRangeTile( 0, 1, 109 ) );
827+
Tiles.mTiles.push_back( sRangeTile( 1, 1, 110 ) );
828+
Tiles.mTiles.push_back( sRangeTile( 2, 1, 111 ) );
829+
Tiles.mTiles.push_back( sRangeTile( 3, 1, 112 ) );
830+
Tiles.mTiles.push_back( sRangeTile( 4, 1, 113 ) );
831+
Tiles.mTiles.push_back( sRangeTile( 5, 1, 114 ) );
832+
833+
Tiles.mTiles.push_back( sRangeTile( 0, 2, 129 ) );
834+
Tiles.mTiles.push_back( sRangeTile( 1, 2, 130 ) );
835+
Tiles.mTiles.push_back( sRangeTile( 2, 2, 131 ) );
836+
Tiles.mTiles.push_back( sRangeTile( 3, 2, 132 ) );
837+
Tiles.mTiles.push_back( sRangeTile( 4, 2, 133 ) );
838+
Tiles.mTiles.push_back( sRangeTile( 5, 2, 134 ) );
839+
840+
Tiles.mTiles.push_back( sRangeTile( 0, 3, 149 ) );
841+
Tiles.mTiles.push_back( sRangeTile( 1, 3, 150 ) );
842+
Tiles.mTiles.push_back( sRangeTile( 2, 3, 151 ) );
843+
Tiles.mTiles.push_back( sRangeTile( 3, 3, 152 ) );
844+
Tiles.mTiles.push_back( sRangeTile( 4, 3, 153 ) );
845+
Tiles.mTiles.push_back( sRangeTile( 5, 3, 154 ) );
846+
847+
Tiles.mTiles.push_back( sRangeTile( 0, 4, 169 ) );
848+
Tiles.mTiles.push_back( sRangeTile( 1, 4, 170 ) );
849+
Tiles.mTiles.push_back( sRangeTile( 2, 4, 171 ) );
850+
Tiles.mTiles.push_back( sRangeTile( 3, 4, 172 ) );
851+
Tiles.mTiles.push_back( sRangeTile( 4, 4, 173 ) );
852+
Tiles.mTiles.push_back( sRangeTile( 5, 4, 174 ) );
853+
854+
Tiles.mTiles.push_back( sRangeTile( 0, 5, 189 ) );
855+
Tiles.mTiles.push_back( sRangeTile( 1, 5, 190 ) );
856+
Tiles.mTiles.push_back( sRangeTile( 2, 5, 191 ) );
857+
Tiles.mTiles.push_back( sRangeTile( 3, 5, 192 ) );
858+
Tiles.mTiles.push_back( sRangeTile( 4, 5, 193 ) );
859+
Tiles.mTiles.push_back( sRangeTile( 5, 5, 194 ) );
860+
861+
Tiles.mTiles.push_back( sRangeTile( 4, 6, 213 ) );
862+
Tiles.mTiles.push_back( sRangeTile( 5, 6, 214 ) );
863+
864+
Surface = new cSurface( 16 * 6, 16 * 6 );
865+
}
819866

820-
SetupCursorForDraw( Surface, Tiles );
867+
868+
if (g_OFED.mMapTileType == eTileTypes_Desert) {
869+
Tiles.mTiles.push_back( sRangeTile( 0, 0, 80 ) );
870+
Tiles.mTiles.push_back( sRangeTile( 1, 0, 81 ) );
871+
Tiles.mTiles.push_back( sRangeTile( 2, 0, 82 ) );
872+
Tiles.mTiles.push_back( sRangeTile( 3, 0, 83 ) );
873+
Tiles.mTiles.push_back( sRangeTile( 4, 0, 84 ) );
874+
Tiles.mTiles.push_back( sRangeTile( 5, 0, 85 ) );
875+
876+
Tiles.mTiles.push_back( sRangeTile( 0, 1, 100 ) );
877+
Tiles.mTiles.push_back( sRangeTile( 1, 1, 101 ) );
878+
Tiles.mTiles.push_back( sRangeTile( 2, 1, 102 ) );
879+
Tiles.mTiles.push_back( sRangeTile( 3, 1, 103 ) );
880+
Tiles.mTiles.push_back( sRangeTile( 4, 1, 104 ) );
881+
Tiles.mTiles.push_back( sRangeTile( 5, 1, 105 ) );
882+
883+
Tiles.mTiles.push_back( sRangeTile( 0, 2, 120 ) );
884+
Tiles.mTiles.push_back( sRangeTile( 1, 2, 121 ) );
885+
Tiles.mTiles.push_back( sRangeTile( 2, 2, 122 ) );
886+
Tiles.mTiles.push_back( sRangeTile( 3, 2, 123 ) );
887+
Tiles.mTiles.push_back( sRangeTile( 4, 2, 124 ) );
888+
Tiles.mTiles.push_back( sRangeTile( 5, 2, 125 ) );
889+
890+
Tiles.mTiles.push_back( sRangeTile( 0, 3, 140 ) );
891+
Tiles.mTiles.push_back( sRangeTile( 1, 3, 141 ) );
892+
Tiles.mTiles.push_back( sRangeTile( 2, 3, 142 ) );
893+
Tiles.mTiles.push_back( sRangeTile( 3, 3, 143 ) );
894+
Tiles.mTiles.push_back( sRangeTile( 4, 3, 144 ) );
895+
Tiles.mTiles.push_back( sRangeTile( 5, 3, 145 ) );
896+
897+
Tiles.mTiles.push_back( sRangeTile( 0, 4, 160 ) );
898+
Tiles.mTiles.push_back( sRangeTile( 1, 4, 161 ) );
899+
Tiles.mTiles.push_back( sRangeTile( 2, 4, 162 ) );
900+
Tiles.mTiles.push_back( sRangeTile( 3, 4, 163 ) );
901+
Tiles.mTiles.push_back( sRangeTile( 4, 4, 164 ) );
902+
Tiles.mTiles.push_back( sRangeTile( 5, 4, 165 ) );
903+
904+
Tiles.mTiles.push_back( sRangeTile( 0, 5, 180 ) );
905+
Tiles.mTiles.push_back( sRangeTile( 1, 5, 181 ) );
906+
Tiles.mTiles.push_back( sRangeTile( 2, 5, 182 ) );
907+
Tiles.mTiles.push_back( sRangeTile( 3, 5, 183 ) );
908+
Tiles.mTiles.push_back( sRangeTile( 4, 5, 184 ) );
909+
Tiles.mTiles.push_back( sRangeTile( 5, 5, 185 ) );
910+
911+
Tiles.mTiles.push_back( sRangeTile( 0, 6, 200 ) );
912+
Tiles.mTiles.push_back( sRangeTile( 1, 6, 201 ) );
913+
Tiles.mTiles.push_back( sRangeTile( 2, 6, 202 ) );
914+
Tiles.mTiles.push_back( sRangeTile( 3, 6, 203 ) );
915+
Tiles.mTiles.push_back( sRangeTile( 4, 6, 204 ) );
916+
Tiles.mTiles.push_back( sRangeTile( 5, 6, 205 ) );
917+
918+
Tiles.mTiles.push_back( sRangeTile( 0, 7, 220 ) );
919+
Tiles.mTiles.push_back( sRangeTile( 1, 7, 221 ) );
920+
Tiles.mTiles.push_back( sRangeTile( 2, 7, 222 ) );
921+
Tiles.mTiles.push_back( sRangeTile( 3, 7, 223 ) );
922+
Tiles.mTiles.push_back( sRangeTile( 4, 7, 224 ) );
923+
Tiles.mTiles.push_back( sRangeTile( 5, 7, 225 ) );
924+
925+
Surface = new cSurface( 16 * 6, 16 * 8 );
926+
}
927+
928+
if(Surface)
929+
SetupCursorForDraw( Surface, Tiles );
821930
}
822931

823932
void cFrameOFED::SetupCursorForDraw( cSurface *pSurface, sTiles& pTiles ) {

‎Source/PanelToolboxSprite.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ void cPanelToolboxSprite::ReloadSprites() {
7272

7373
size_t X = 0, Y = 0;
7474
size_t BigY = 0;
75+
mSpriteRanges.clear();
7576

7677
for (size_t SpriteID = 0; SpriteID < 111; ++SpriteID) {
7778
int32 AnimID = g_SpriteAnim[SpriteID];

0 commit comments

Comments
 (0)