fix mementos implementation

1 files changed, 8 insertions, 9 deletions

diff --git a/Museum.cpp b/Museum.cpp
index d389602..bf000e2 100644
--- a/Museum.cpp
+++ b/Museum.cpp
@@ -16,22 +16,23 @@ Museum::~Museum() {
 }
 
 void Museum::update() {
+	unsigned long long next_snapshot = this->snapshot_ticks;
+	if (!this->history.empty()) next_snapshot += this->history.top().tick;
+	if (this->tick >= next_snapshot || this->history.empty()) {
+		this->history.push(this->save_snapshot());
+	}
+
 	this->people.update();
 	this->canvas.update();
 	this->collision.update();
 	this->tick++;
-
-	unsigned long long next_snapshot = this->snapshot_ticks;
-	if (!this->history.empty()) next_snapshot += this->history.top().tick;
-	if (next_snapshot > this->tick) return;
-	this->history.push(this->save_snapshot());
-	printf("saved snapshot at tick %llu\n", this->tick);
 }
 
 void Museum::skip_forward() {
 	this->jump++;
 }
 void Museum::skip_backward() {
+	this->paused = true;
 	this->jump--;
 }
 
@@ -41,7 +42,6 @@ void Museum::work() {
 		if (this->jump > 0) {
 			// forward jump
 			for (; this->jump != 0; this->jump--) {
-				printf("jumping forward %u ticks\n", this->snapshot_ticks);
 				for (size_t i = 0; i < this->snapshot_ticks; i++)
 					this->update();
 			}
@@ -49,9 +49,8 @@ void Museum::work() {
 			// backward jump
 			for (; this->jump != 0; this->jump++) {
 				if (this->history.empty()) continue;
-				printf("restoring snapshot from tick %llu\n", this->history.top().tick);
 				this->restore_snapshot(this->history.top());
-				this->history.pop();
+				if (this->tick > 0) this->history.pop();
 			}
 		}