Final NPP 7.1.0

Signed-off-by: nppangband <nppangbanddev@verizon.net>
nppangband · Oct 19, 2013 · 7693d5e · 7693d5e
1 parent 15e9f74
commit 7693d5e
Show file tree

Hide file tree

Showing 29 changed files with 33 additions and 29 deletions.
diff --git a/lib/edit/artifact.txt b/lib/edit/artifact.txt
@@ -74,7 +74,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 
 # Here is the list of 'Special' artifacts - Amulets, Light Sources, Rings.

diff --git a/lib/edit/ego_item.txt b/lib/edit/ego_item.txt
@@ -64,7 +64,7 @@
 # Lothl['o]rien or Lothl[oacute]rien are both valid ways to get an acute accent
 # on the o in Lothlorien . All valid codes can be found in util.c.
 
-V:7.0.0
+V:7.1.0
 
 
 

diff --git a/lib/edit/flavor.txt b/lib/edit/flavor.txt
@@ -14,7 +14,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 # Plain Gold Ring     Fixed - The One Ring
 N:1:45:37

diff --git a/lib/edit/limits.txt b/lib/edit/limits.txt
@@ -11,7 +11,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 
 

diff --git a/lib/edit/m_artifact.txt b/lib/edit/m_artifact.txt
@@ -69,7 +69,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 
 # Here is the list of 'Special' artifacts - The Phial

diff --git a/lib/edit/m_ego_item.txt b/lib/edit/m_ego_item.txt
@@ -62,7 +62,7 @@
 # Lothl['o]rien or Lothl[oacute]rien are both valid ways to get an acute accent
 # on the o in Lothlorien . All valid codes can be found in util.c.
 
-V:7.0.0
+V:7.1.0
 
 
 

diff --git a/lib/edit/m_limits.txt b/lib/edit/m_limits.txt
@@ -11,7 +11,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 
 

diff --git a/lib/edit/m_monster.txt b/lib/edit/m_monster.txt
@@ -136,7 +136,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 ##### Non-race (contains the player picture) #####
 N:0:<player>

diff --git a/lib/edit/m_object.txt b/lib/edit/m_object.txt
@@ -107,7 +107,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 
 ##### Non-kind (contains the 'pile' picture) #####

diff --git a/lib/edit/m_p_class.txt b/lib/edit/m_p_class.txt
@@ -62,7 +62,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 N:0:Warrior
 S:5:-2:-2:2:2:-1

diff --git a/lib/edit/m_p_hist.txt b/lib/edit/m_p_hist.txt
@@ -14,7 +14,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 N:1:2:10:25
 D:You are the illegitimate and unacknowledged child 

diff --git a/lib/edit/m_p_race.txt b/lib/edit/m_p_race.txt
@@ -50,7 +50,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 N:0:Human
 S:0:0:0:0:0:0

diff --git a/lib/edit/m_quest.txt b/lib/edit/m_quest.txt
@@ -14,7 +14,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 # This slot for the adventurer's guild quests.  This must be 0, as it is hard coded in 
 # the source code

diff --git a/lib/edit/m_shop_own.txt b/lib/edit/m_shop_own.txt
@@ -12,7 +12,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 # General Store
 N:0

diff --git a/lib/edit/monster.txt b/lib/edit/monster.txt
@@ -138,7 +138,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 ##### Non-race (contains the player picture) #####
 N:0:<player>

diff --git a/lib/edit/names.txt b/lib/edit/names.txt
@@ -13,7 +13,7 @@
 # Format:
 # N:name
 
-V:7.0.0
+V:7.1.0
 
 N:adanedhel
 N:adurant

diff --git a/lib/edit/object.txt b/lib/edit/object.txt
@@ -109,7 +109,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 
 ##### Non-kind (contains the 'pile' picture) #####

diff --git a/lib/edit/p_class.txt b/lib/edit/p_class.txt
@@ -62,7 +62,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 N:0:Warrior
 S:5:-2:-2:2:2:-1

diff --git a/lib/edit/p_hist.txt b/lib/edit/p_hist.txt
@@ -29,7 +29,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 
 N:1:2:10:25

diff --git a/lib/edit/p_race.txt b/lib/edit/p_race.txt
@@ -50,7 +50,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 
 N:0:Human

diff --git a/lib/edit/player_ghost.txt b/lib/edit/player_ghost.txt
@@ -25,7 +25,7 @@
 #  as well.
 
 
-V:7.0.0
+V:7.1.0
 
 ##### Player Ghost information #####
 

diff --git a/lib/edit/quest.txt b/lib/edit/quest.txt
@@ -15,7 +15,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 # This slot for the adventurer's guild quests.  This must be 0, as it is hard coded in 
 # the source code

diff --git a/lib/edit/shop_own.txt b/lib/edit/shop_own.txt
@@ -12,7 +12,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 # General Store
 N:0

diff --git a/lib/edit/terrain.txt b/lib/edit/terrain.txt
@@ -96,7 +96,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 N:0:nothing
 G: :w

diff --git a/lib/edit/vault.txt b/lib/edit/vault.txt
@@ -48,7 +48,7 @@
 
 # Version stamp (required)
 
-V:7.0.0
+V:7.1.0
 
 ### Simple Vaults (type 7) -- maximum size 44x22 ###
 

diff --git a/src/Makefile.src b/src/Makefile.src
@@ -4,7 +4,7 @@
 # across a range of different makefiles, to cut down on maintenance.
 #
 
-VERSION = 7.0.0
+VERSION = 7.1.0
 COPYRIGHT = (c) 1995-2015 NPPAngband and Angband contributors
 
 HEADERS = \

diff --git a/src/defines.h b/src/defines.h
@@ -55,14 +55,14 @@
 /*
  * Current version string
  */
-#define VERSION_STRING	"7.0.0"
+#define VERSION_STRING	"7.1.0"
 
 
 /*
  * Current version numbers
  */
 #define VERSION_MAJOR	7
-#define VERSION_MINOR	0
+#define VERSION_MINOR	1
 #define VERSION_PATCH	0
 #define VERSION_EXTRA	0
 

diff --git a/src/effect.c b/src/effect.c
@@ -489,7 +489,7 @@ bool set_effect_trap_player(int f_idx, byte y, byte x)
 bool set_effect_glyph(byte y, byte x)
 {
 	int x_idx = x_pop();
-	u16b flags = (EF1_GLYPH | EF1_PERMANENT | EF1_SKIP);;
+	u16b flags = (EF1_GLYPH | EF1_PERMANENT | EF1_SKIP);
 
 	/*All full*/
 	if (!x_idx) return (FALSE);

diff --git a/src/main-crb.c b/src/main-crb.c
@@ -3906,6 +3906,10 @@ int main(void)
 	/* Initialise the cursor and turn it into an "arrow" */
 	InitCursor();
 
+	/* init empty game mode before switches (which might set it) */
+	game_mode = 0;
+
+
 	/*
 	 * Remember Mac OS version, in case we have to cope with version-specific
 	 * problems