Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Game state cleanup

Browse Source
This commit is contained in:
Anuken
2020-03-31 14:16:38 -04:00
parent 9081f3ff03
commit f1fd072400
20 changed files with 51 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
desktop/src/mindustry/desktop/DesktopLauncher.java
View File

@@ -248,10 +248,9 @@ public class DesktopLauncher extends ClientLauncher{
String uiState = "";
if(inGame){
if(world.getMap() != null){
//TODO implement nice name for sector
gameMapWithWave = Strings.capitalize(world.getMap().name());
}
//TODO implement nice name for sector
gameMapWithWave = Strings.capitalize(state.map.name());
if(state.rules.waves){
gameMapWithWave += " | Wave " + state.wave;
}

4
desktop/src/mindustry/desktop/steam/SNet.java
View File

@@ -9,7 +9,6 @@ import com.codedisaster.steamworks.*;
import com.codedisaster.steamworks.SteamFriends.*;
import com.codedisaster.steamworks.SteamMatchmaking.*;
import com.codedisaster.steamworks.SteamNetworking.*;
import mindustry.core.GameState.*;
import mindustry.core.*;
import mindustry.game.EventType.*;
import mindustry.game.*;
@@ -242,7 +241,6 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
logic.reset();
net.reset();
state.set(State.menu);
currentLobby = steamIDLobby;
currentServer = smat.getLobbyOwner(steamIDLobby);
@@ -346,7 +344,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback,
currentLobby = steamID;
smat.setLobbyData(steamID, "name", player.name());
smat.setLobbyData(steamID, "mapname", world.getMap().name());
smat.setLobbyData(steamID, "mapname", state.map.name());
smat.setLobbyData(steamID, "version", Version.build + "");
smat.setLobbyData(steamID, "versionType", Version.type);
smat.setLobbyData(steamID, "wave", state.wave + "");