Skip to content

Commit

Permalink
Fixed an editor tile transition issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrettin committed May 23, 2016
1 parent 2f7da89 commit 832a372
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/map/mapfield.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@

#include "tile.h"

//Wyrmgus start
#include "editor.h"
//Wyrmgus end
#include "iolib.h"
#include "map.h"
#include "player.h"
Expand Down Expand Up @@ -121,7 +124,7 @@ void CMapField::setTileIndex(const CTileset &tileset, unsigned int tileIndex, in
//Wyrmgus end

//Wyrmgus start
if (tileset.solidTerrainTypes[tileset.tiles[this->tilesetTile].tileinfo.BaseTerrain].AnimationFrames > 0 && !tileset.tiles[this->tilesetTile].tileinfo.MixTerrain) {
if (Editor.Running == EditorNotRunning && tileset.solidTerrainTypes[tileset.tiles[this->tilesetTile].tileinfo.BaseTerrain].AnimationFrames > 0 && !tileset.tiles[this->tilesetTile].tileinfo.MixTerrain) {
this->AnimationFrame = SyncRand(tileset.solidTerrainTypes[tileset.tiles[this->tilesetTile].tileinfo.BaseTerrain].AnimationFrames);
}
//Wyrmgus end
Expand Down

0 comments on commit 832a372

Please sign in to comment.