fixed cardLayer shutdown bug
This commit is contained in:
@@ -84,14 +84,14 @@ public void initialize(AppStateManager stateManager, Application app) {
|
||||
}
|
||||
|
||||
public void shutdown() {
|
||||
view.clearProcessors();
|
||||
// view.clearProcessors();
|
||||
fpp.removeFilter(dlsf);
|
||||
dlsf = null;
|
||||
root.removeLight(sun);
|
||||
fpp.removeFilter(fxaaFilter);
|
||||
fpp.removeFilter(compose);
|
||||
// fpp.removeFilter(compose);
|
||||
view.detachScene(root);
|
||||
app.getRenderManager().removeMainView(view);
|
||||
// app.getRenderManager().removeMainView(view);
|
||||
|
||||
cardBuffer.clear();
|
||||
root.detachAllChildren();
|
||||
|
||||
@@ -50,9 +50,10 @@ public void init() {
|
||||
}
|
||||
|
||||
public void shutdown() {
|
||||
clearSelectableCards();
|
||||
if (cardLayer != null) {
|
||||
cardLayer.shutdown();
|
||||
clearSelectableCards();
|
||||
app.getStateManager().detach(cardLayer);
|
||||
}
|
||||
cardLayer = null;
|
||||
}
|
||||
|
||||
@@ -141,10 +141,11 @@ public void addPlayer(Color color, String name, boolean own){
|
||||
}
|
||||
|
||||
public void setActivePlayer(Color color) {
|
||||
Color lastFirst = playerOrder.remove(0);
|
||||
if(playerOrder.get(0) == color) return;
|
||||
Color oldFirst = playerOrder.remove(0);
|
||||
playerOrder.remove(color);
|
||||
playerOrder.add(0, color);
|
||||
playerOrder.add(lastFirst);
|
||||
playerOrder.add(oldFirst);
|
||||
|
||||
drawPlayers();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user