Commit 1815c4b5 authored by dkonam's avatar dkonam
Browse files

fix merge

parent 95c01d58
......@@ -431,7 +431,7 @@ public class GameMediator {
public void forwardMessage(Message msg) {
IIHMTableToData ihmTablefacade = this.dataFacade.getIhmTablefacade();
if (ihmTablefacade != null) {
ihmTablefacade.printMessage(msg);
ihmTablefacade.printMessage(msg.getContent());
}
}
......@@ -501,7 +501,7 @@ public class GameMediator {
}
if (this.dataFacade.getIhmTablefacade() != null) {
this.dataFacade.getIhmTablefacade().feedback(mine,touched,shipDestroyed) ;
//this.dataFacade.getIhmTablefacade().feedback(mine,touched,shipDestroyed) ;
}
if (this.currentGame.isGameFinishedByEnnemy()) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment