drunkendog
/
final
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
bob 2022-06-17 13:28:48 -04:00
parent 68c80c2a31 6c60709b93
commit 4213b1f4c4
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
img/dialogue/Bouncer.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 739 B

22
src/GamePanel.java
View File

@ -42,7 +42,7 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ
public int playerFrame, enemyFrame;
// keeps track of how many ticks has elapsed since last frame change
public int playerFrameCounter = 0;
public int enemyFrameCounter = 0;
public int timeSinceLastSave = 0;
public boolean isPaused, isDialogue, waitForDialogue, mouseAlreadyTranslated;
public PauseMenu pauseMenu;
public DialogueMenu dialogueMenu;
@ -388,14 +388,18 @@ public class GamePanel extends JPanel implements Runnable, KeyListener, Serializ
playerFrameCounter -= 5;
}
}
// a new save is made every tick
bombCount = LevelManager.bombs;
try {
// atomic save to prevent EOF errors
FileManager.writeObjectToFile("local\\temp_state.dat", this);
Files.move(Path.of("local", "temp_state.dat"), Path.of("local", "game_state.dat"), ATOMIC_MOVE);
} catch (IOException | ConcurrentModificationException e) {
e.printStackTrace();
// a new save is made every 100 ticks
timeSinceLastSave++;
if (timeSinceLastSave >= 100) {
timeSinceLastSave -= 100;
bombCount = LevelManager.bombs;
try {
// atomic save to prevent EOF errors
FileManager.writeObjectToFile("local\\temp_state.dat", this);
Files.move(Path.of("local", "temp_state.dat"), Path.of("local", "game_state.dat"), ATOMIC_MOVE);
} catch (IOException | ConcurrentModificationException e) {
e.printStackTrace();
}
}
repaint();
delta--;