Adds move count to hiscores (#157)

* Adds move count to hiscores

Making this available for possible playtime based unlocks.

* Review fixes

* More review fixes

Author: LiquidityC

src/hiscore.c

@@ -28,7 +28,8 @@ static DbQuery MIGRATE_COMMANDS[] = {
      "time DATETIME DEFAULT CURRENT_TIMESTAMP, "
      "gold FLOAT, "
      "playerLevel INTEGER, "
-     "dungeonLevel INTEGER)",
+     "dungeonLevel INTEGER, "
+     "moves INTEGER DEFAULT 0)",
      NULL, NULL},
     {"CREATE TABLE IF NOT EXISTS hiscore_artifacts("
      "id INTEGER PRIMARY KEY AUTOINCREMENT, "
@@ -42,7 +43,7 @@ static DbQuery MIGRATE_COMMANDS[] = {
 static int load_hiscore_cb(void *, int count, char **values, char **colNames);
 
 static DbQuery GET_TOP_10_COMMAND = {"SELECT datetime(time, 'localtime') as "
-                                     "time, gold, playerLevel, dungeonLevel "
+                                     "time, gold, playerLevel, dungeonLevel, moves "
                                      "FROM hiscore "
                                      "ORDER BY gold DESC "
                                      "LIMIT 10",
@@ -68,6 +69,9 @@ create_tables(void)
 
 		db_execute(db, query);
 	}
+
+	// Soft migration: add moves column to existing databases (ignore error if already present)
+	(void)db_execute_stmnt("ALTER TABLE hiscore ADD COLUMN moves INTEGER DEFAULT 0", db, NULL, NULL);
 }
 
 void
@@ -80,18 +84,20 @@ hiscore_init(void)
 	create_tables();
 }
 
-static void
-save_hiscore(double gold, int lvl, int dlvl)
+static int
+save_hiscore(double gold, int lvl, int dlvl, unsigned int moves)
 {
-	const char *query = "INSERT INTO hiscore(gold, playerLevel, dungeonLevel) values (?, ?, ?)";
+	const char *query = "INSERT INTO hiscore(gold, playerLevel, dungeonLevel, moves) values (?, ?, ?, ?)";
 	sqlite3_stmt *stmt = db_prepare(db, query);
 
-	debug("Saving high score: %dg %dpl %dl", gold, lvl, dlvl);
+	debug("Saving high score: %dg %dpl %dl %um", gold, lvl, dlvl, moves);
 	sqlite3_bind_double(stmt, 1, gold);
 	sqlite3_bind_int(stmt, 2, lvl);
 	sqlite3_bind_int(stmt, 3, dlvl);
-	sqlite3_step(stmt);
+	sqlite3_bind_int64(stmt, 4, (sqlite3_int64)moves);
+	int rc = sqlite3_step(stmt);
 	sqlite3_finalize(stmt);
+	return rc == SQLITE_DONE ? (int)sqlite3_last_insert_rowid(db) : 0;
 }
 
 static void
@@ -111,10 +117,9 @@ save_hiscore_artifact(int hid, int aid)
 void
 hiscore_register(Player *p, unsigned int dungeonLevel)
 {
-	save_hiscore(p->gold, p->stats.lvl, dungeonLevel);
-	int hiscoreId = (int)sqlite3_last_insert_rowid(db);
-	if (!hiscoreId) {
-		error("Failed to retrieve last inserted hiscore id");
+	int hiscoreId = save_hiscore(p->gold, p->stats.lvl, dungeonLevel, p->stat_data.total_steps);
+	if (hiscoreId == 0) {
+		error("Failed to save hiscore");
 		return;
 	}
 
@@ -138,6 +143,10 @@ load_hiscore_cb(void *result, int count, char **values, char **colNames)
 			score->playerLevel = atoi(values[i]);
 		else if (strcmp(colNames[i], "dungeonLevel") == 0)
 			score->dungeonLevel = atoi(values[i]);
+		else if (strcmp(colNames[i], "moves") == 0) {
+			unsigned long parsed = values[i] ? strtoul(values[i], NULL, 10) : 0UL;
+			score->moves = (unsigned int)parsed;
+		}
 	}
 	LinkedList **scores = result;
 	linkedlist_append(scores, score);

src/hiscore.h

@@ -26,6 +26,7 @@ typedef struct HiScore {
 	double gold;
 	unsigned int playerLevel;
 	unsigned int dungeonLevel;
+	unsigned int moves;
 	LinkedList *artifacts;
 } HiScore;