Skip to content

Revert "Finished most of the ReactorTask - need to work on a bit more loguc" #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TareqHanafi643 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "Finished most of the ReactorTask - need to work on a bit more loguc" #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed core/assets/GreenButton.png
View file
Open in desktop
Binary file not shown.
Binary file removed core/assets/GreyButton.png
View file
Open in desktop
Binary file not shown.
Binary file removed core/assets/LightGreyButton.png
View file
Open in desktop
Binary file not shown.
8 changes: 5 additions & 3 deletions core/src/com/mmog/Client.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,15 +202,17 @@ public static boolean removeClient() {
toSend += getPlayer().getPlayerName();

System.out.println(toSend);

DatagramPacket datagramPacket = new DatagramPacket(toSend.getBytes(), toSend.getBytes().length, address, 7077);

ScreenManager.getInstance().showScreen(ScreenEnum.MAIN_MENU);

DatagramPacket datagramPacket = new DatagramPacket(toSend.getBytes(), toSend.getBytes().length, address, 7077);
try {
socket.send(datagramPacket);
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
ScreenManager.getInstance().showScreen(ScreenEnum.MAIN_MENU);

return true;
}

Expand Down
3 changes: 1 addition & 2 deletions core/src/com/mmog/screens/GameScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,7 @@ else if(p instanceof Imposter) {
((AdminTask) task).render(r.getBatch());
}
else if(task instanceof ReactorTask) {
((ReactorTask) task).render(r.getBatch());
//System.out.println(task.getTaskName());
System.out.println(task.getTaskName());
}
else if(task instanceof ElectricalTask) {
System.out.println(task.getTaskName());
Expand Down
87 changes: 0 additions & 87 deletions core/src/com/mmog/tasks/ElecTask.java
View file
Open in desktop

This file was deleted.

Loading