From 28cc22fd8f82874374e55f89d97194c4a2751efa Mon Sep 17 00:00:00 2001
From: LexAckson <alex.jackson@ert.com>
Date: Thu, 16 May 2013 18:04:45 -0400
Subject: [PATCH 1/1] seperate sprint save files

added zotdef and paren fix

fix so upgraded saves use old score file
---
 crawl-ref/source/hiscores.cc   |  5 +++++
 crawl-ref/source/tag-version.h |  1 +
 crawl-ref/source/tags.cc       | 22 +++++++++++++++++++---
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc
index 4864ee2..be498a0 100644
--- a/crawl-ref/source/hiscores.cc
+++ b/crawl-ref/source/hiscores.cc
@@ -87,6 +87,11 @@ static string _score_file_name()
         ret = Options.shared_dir + "scores";
 
     ret += crawl_state.game_type_qualifier();
+    if(crawl_state.game_is_sprint() || crawl_state.game_is_zotdef())
+    {
+        if (crawl_state.map != "") ret+= "-";
+        ret += crawl_state.map;
+    }
 
     return ret;
 }
diff --git a/crawl-ref/source/tag-version.h b/crawl-ref/source/tag-version.h
index d25ab8c..88eff6c 100644
--- a/crawl-ref/source/tag-version.h
+++ b/crawl-ref/source/tag-version.h
@@ -37,6 +37,7 @@ enum tag_minor_version
     TAG_MINOR_NOME_NO_MORE,        // Remove unused gnome variable.
     TAG_MINOR_NO_SPLINT,           // Remove splint mail
     TAG_MINOR_ORIG_MONNUM,         // orig_monnum is type rather than type+1.
+    TAG_MINOR_SPRINT_SCORES,       // Separate score lists for each sprint map
     NUM_TAG_MINORS,
     TAG_MINOR_VERSION = NUM_TAG_MINORS - 1
 };
diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc
index f5678d5..38c3c29 100644
--- a/crawl-ref/source/tags.cc
+++ b/crawl-ref/source/tags.cc
@@ -1048,7 +1048,6 @@ static void tag_construct_char(writer &th)
     // CHR_FORMAT.  Bumping it makes all saves invisible when browsed in an
     // older version.
     // Please keep this compatible even over major version breaks!
-
     // Appending fields is fine.
 
     marshallString(th, you.your_name);
@@ -1064,8 +1063,11 @@ static void tag_construct_char(writer &th)
     marshallByte(th, you.wizard);
 
     marshallByte(th, crawl_state.type);
-    if (crawl_state.game_is_tutorial())
+    if (crawl_state.game_is_tutorial() || crawl_state.game_is_sprint() 
+       || crawl_state.game_is_zotdef())
+    {
         marshallString(th, crawl_state.map);
+    }
 
     marshallString(th, species_name(you.species));
     marshallString(th, you.religion ? god_name(you.religion) : "");
@@ -1833,8 +1835,22 @@ void tag_read_char(reader &th, uint8_t format, uint8_t major, uint8_t minor)
     you.wizard            = unmarshallBoolean(th);
 
     crawl_state.type = (game_type) unmarshallUByte(th);
-    if (crawl_state.game_is_tutorial())
+    if (crawl_state.game_is_tutorial() 
+       || ((crawl_state.game_is_sprint() || crawl_state.game_is_zotdef())
+#if TAG_MAJOR_VERSION == 34
+          &&  minor >= TAG_MINOR_SPRINT_SCORES
+#endif
+       ))
+    {
         crawl_state.map = unmarshallString(th);
+    }
+#if TAG_MAJOR_VERSION == 34
+    else if ((crawl_state.game_is_sprint() || crawl_state.game_is_zotdef())
+            && minor < TAG_MINOR_SPRINT_SCORES) 
+    {
+        crawl_state.map = ""; 
+    }
+#endif
 
     if (major > 32 || major == 32 && minor > 26)
     {
-- 
1.8.1.2