mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-21 21:30:20 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug where enemy units were viewable despite the tile being unexplored

Browse Source
This commit is contained in:
Yair Morgenstern
2018-04-12 21:52:00 +03:00
parent e9c69eed6f
commit 34c1047b65
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.game" applicationId "com.unciv.game"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 26 targetSdkVersion 26
versionCode 39 versionCode 40
versionName "1.4.6" versionName "1.4.7"
} }
buildTypes { buildTypes {
release { release {

2
android/src/com/unciv/game/AndroidLauncher.java
View File

@ -10,6 +10,6 @@ public class AndroidLauncher extends AndroidApplication {
protected void onCreate (Bundle savedInstanceState) { protected void onCreate (Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
AndroidApplicationConfiguration config = new AndroidApplicationConfiguration(); AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
initialize(new com.unciv.ui.UnCivGame(), config); initialize(new com.unciv.UnCivGame(), config);
} }
} }

5
core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt
View File

@ -5,8 +5,8 @@ import com.badlogic.gdx.scenes.scene2d.Group
import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.Label
import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.utils.Align import com.badlogic.gdx.utils.Align
import com.unciv.logic.map.TileInfo
import com.unciv.UnCivGame import com.unciv.UnCivGame
import com.unciv.logic.map.TileInfo
import com.unciv.ui.cityscreen.CityScreen import com.unciv.ui.cityscreen.CityScreen
import com.unciv.ui.cityscreen.addClickListener import com.unciv.ui.cityscreen.addClickListener
import com.unciv.ui.utils.CameraStageBaseScreen import com.unciv.ui.utils.CameraStageBaseScreen
@ -16,6 +16,7 @@ import com.unciv.ui.utils.ImageGetter
class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) { class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) {
var cityButton: Table? = null var cityButton: Table? = null
private var unitImage: Group? = null private var unitImage: Group? = null
//private var whiteCircleAroundUnit
private var circleImage = ImageGetter.getImage("UnitIcons/Circle.png") private var circleImage = ImageGetter.getImage("UnitIcons/Circle.png")
@ -83,7 +84,7 @@ class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) {
unitImage = null unitImage = null
} }
if (tileInfo.unit != null && color.a==1f) { // Tile is visible if (tileInfo.unit != null && isViewable) { // Tile is visible
val unit = tileInfo.unit!! val unit = tileInfo.unit!!
unitImage = getUnitImage(unit.name, unit.civInfo.getCivilization().getColor()) unitImage = getUnitImage(unit.name, unit.civInfo.getCivilization().getColor())
addActor(unitImage!!) addActor(unitImage!!)