summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-12-11 08:09:30 +0100
committerBardur Arantsson <bardur@scientician.net>2015-12-11 08:09:30 +0100
commitbb7e2c66a403a9e0af291a539bfb4e7bc9ebca92 (patch)
tree7ceb099cafd230b79b9faee6d49a1468c5f2acad
parent15a80ee3ec9d463dbae71415ba4469814fb76109 (diff)
Remove useless V: lines from data files
-rw-r--r--lib/edit/a_info.txt4
-rw-r--r--lib/edit/ab_info.txt4
-rw-r--r--lib/edit/ba_info.txt4
-rw-r--r--lib/edit/d_info.txt4
-rw-r--r--lib/edit/e_info.txt4
-rw-r--r--lib/edit/f_info.txt5
-rw-r--r--lib/edit/k_info.txt5
-rw-r--r--lib/edit/ow_info.txt4
-rw-r--r--lib/edit/p_info.txt2
-rw-r--r--lib/edit/r_info.txt4
-rw-r--r--lib/edit/ra_info.txt4
-rw-r--r--lib/edit/re_info.txt4
-rw-r--r--lib/edit/s_info.txt4
-rw-r--r--lib/edit/set_info.txt4
-rw-r--r--lib/edit/st_info.txt4
-rw-r--r--lib/edit/tr_info.txt2
-rw-r--r--lib/edit/v_info.txt5
-rw-r--r--lib/edit/wf_info.txt4
-rw-r--r--lib/mods/theme/edit/a_info.txt5
-rw-r--r--lib/mods/theme/edit/ab_info.txt4
-rw-r--r--lib/mods/theme/edit/ba_info.txt4
-rw-r--r--lib/mods/theme/edit/d_info.txt4
-rw-r--r--lib/mods/theme/edit/e_info.txt4
-rw-r--r--lib/mods/theme/edit/f_info.txt5
-rw-r--r--lib/mods/theme/edit/k_info.txt4
-rw-r--r--lib/mods/theme/edit/ow_info.txt4
-rw-r--r--lib/mods/theme/edit/p_info.txt2
-rw-r--r--lib/mods/theme/edit/r_info.txt4
-rw-r--r--lib/mods/theme/edit/ra_info.txt4
-rw-r--r--lib/mods/theme/edit/re_info.txt4
-rw-r--r--lib/mods/theme/edit/s_info.txt4
-rw-r--r--lib/mods/theme/edit/set_info.txt4
-rw-r--r--lib/mods/theme/edit/st_info.txt4
-rw-r--r--lib/mods/theme/edit/tr_info.txt2
-rw-r--r--lib/mods/theme/edit/v_info.txt5
-rw-r--r--lib/mods/theme/edit/wf_info.txt4
-rw-r--r--src/init1.cc459
37 files changed, 0 insertions, 601 deletions
diff --git a/lib/edit/a_info.txt b/lib/edit/a_info.txt
index 60ce600..2e9c38b 100644
--- a/lib/edit/a_info.txt
+++ b/lib/edit/a_info.txt
@@ -24,10 +24,6 @@
# -Leon Marrick
# Contributors: Jeff Butler, Neal Hackler, Ethan Sicotte, Pat Tracy, Divia
-# Version stamp (required)
-
-V:2.0.0
-
# The Phial of Galadriel
diff --git a/lib/edit/ab_info.txt b/lib/edit/ab_info.txt
index b78346e..976c6d0 100644
--- a/lib/edit/ab_info.txt
+++ b/lib/edit/ab_info.txt
@@ -22,14 +22,10 @@
# E:excluding ability:excluding ability
-# Version stamp (required)
-
# Do not forget to update misc.txt with an entry like the following :
# Maximum number of traits in ab_info.txt
# M:b:50
-V:2.2.0
-
N:0:Spread blows
D:If a monster dies to your attack but you still have blows left
D:you won't lose the full turn, allowing you to attack some other
diff --git a/lib/edit/ba_info.txt b/lib/edit/ba_info.txt
index 38444c1..e5c4975 100644
--- a/lib/edit/ba_info.txt
+++ b/lib/edit/ba_info.txt
@@ -17,10 +17,6 @@
# 1 = Restrict to normal & liked
# 2 = Restrict to liked
-# Version stamp (required)
-
-V:2.0.0
-
N:0:Nothing
C:0:0:0
I:0:0:.
diff --git a/lib/edit/d_info.txt b/lib/edit/d_info.txt
index 757d396..24526ea 100644
--- a/lib/edit/d_info.txt
+++ b/lib/edit/d_info.txt
@@ -29,10 +29,6 @@
# 3 = OR
# 4 = NOR
-# Version stamp (required)
-
-V:2.0.0
-
### Wilderness(purely cosmetic, never used) ###
N:0:Wilderness
diff --git a/lib/edit/e_info.txt b/lib/edit/e_info.txt
index 6c2e585..f3bc1d3 100644
--- a/lib/edit/e_info.txt
+++ b/lib/edit/e_info.txt
@@ -63,10 +63,6 @@
-# Version stamp (required)
-
-V:2.0.0
-
### Mage Staff ###
N:1:of Mana
diff --git a/lib/edit/f_info.txt b/lib/edit/f_info.txt
index c0dc2e9..5ab0cbd 100644
--- a/lib/edit/f_info.txt
+++ b/lib/edit/f_info.txt
@@ -15,11 +15,6 @@
# Note that terrain feature zero contains the "darkness" picture.
-# Version stamp (required)
-
-V:2.0.0
-
-
# 0x00 --> nothing
N:0:nothing
diff --git a/lib/edit/k_info.txt b/lib/edit/k_info.txt
index 5e2e878..612bdc5 100644
--- a/lib/edit/k_info.txt
+++ b/lib/edit/k_info.txt
@@ -20,11 +20,6 @@
# Note that object zero is used for the "stack" picture (unused).
-# Version stamp (required)
-
-V:2.0.0
-
-
##### Something special #####
N:0:something
diff --git a/lib/edit/ow_info.txt b/lib/edit/ow_info.txt
index 333113c..d71dfa2 100644
--- a/lib/edit/ow_info.txt
+++ b/lib/edit/ow_info.txt
@@ -13,10 +13,6 @@
# L:liked races
# H:hated races
-# Version stamp (required)
-
-V:2.0.0
-
N:0:Bilbo the Friendly(Hobbit)
I:20000:120
C:120:100:80
diff --git a/lib/edit/p_info.txt b/lib/edit/p_info.txt
index 9da685d..c02e765 100644
--- a/lib/edit/p_info.txt
+++ b/lib/edit/p_info.txt
@@ -8,8 +8,6 @@
# Do not modify this file unless you know exactly what you are doing,
# unless you wish to risk possible system crashes and broken savefiles.
-V:2.0.0
-
##############################################################################
##############################################################################
##############################################################################
diff --git a/lib/edit/r_info.txt b/lib/edit/r_info.txt
index e7801d0..5c93f1f 100644
--- a/lib/edit/r_info.txt
+++ b/lib/edit/r_info.txt
@@ -182,10 +182,6 @@
# Note that monster zero is used for the "player" picture.
-# Version stamp (required)
-
-V:2.2.0
-
##### The Player #####
N:0:Player
diff --git a/lib/edit/ra_info.txt b/lib/edit/ra_info.txt
index 57dcee9..30ff3f3 100644
--- a/lib/edit/ra_info.txt
+++ b/lib/edit/ra_info.txt
@@ -16,10 +16,6 @@
# C:max to dam:max to hit:max to AC:max to pval
# F:flags
-# Version stamp (required)
-
-V:2.0.0
-
# General info, number of powers
G:100:1d5:1
G:14:0d0:1
diff --git a/lib/edit/re_info.txt b/lib/edit/re_info.txt
index c0e36a9..c1fb01c 100644
--- a/lib/edit/re_info.txt
+++ b/lib/edit/re_info.txt
@@ -6,8 +6,6 @@
# Do not modify this file unless you know exactly what you are doing,
# unless you wish to risk possible system crashes and broken savefiles.
-# Version stamp (required)
-
# Most values can be used with the +, -, % and = operators, = will set the
# monster value, + and - will modify it based on the normal monster
# % will apply that percentage to the monster value
@@ -28,8 +26,6 @@
# S:monster spells to add for the ego-type
# T:monster spells to remove, use MF_ALL for all
-V:2.0.0
-
# A few undeads, to be created by the ANIM_DEAD spell
N:1:Skeleton
diff --git a/lib/edit/s_info.txt b/lib/edit/s_info.txt
index b511e06..d53fb7e 100644
--- a/lib/edit/s_info.txt
+++ b/lib/edit/s_info.txt
@@ -22,10 +22,6 @@
# T:father:child
-# Version stamp (required)
-
-V:2.0.0
-
################################## MAGIC ##################################
N:56:Magic-Device
diff --git a/lib/edit/set_info.txt b/lib/edit/set_info.txt
index b6141e0..f114b7e 100644
--- a/lib/edit/set_info.txt
+++ b/lib/edit/set_info.txt
@@ -7,15 +7,11 @@
# Do not modify this file unless you know exactly what you are doing,
# unless you wish to risk possible system crashes and broken savefiles.
-# Version stamp (required)
-
# N:idx:name
# D:description
# P:artifact index:number of item needed:pval
# F:flags
-V:2.0.0
-
# The Elven Gifts, took from Oangband
N:0:Elven Gifts
diff --git a/lib/edit/st_info.txt b/lib/edit/st_info.txt
index 83a0be2..d0defd3 100644
--- a/lib/edit/st_info.txt
+++ b/lib/edit/st_info.txt
@@ -14,10 +14,6 @@
# proba is the chance(out of 100) of the item being generated
-# Version stamp (required)
-
-V:2.0.0
-
N:0:General Store
I:100:& Wooden Torch~
I:95:& Brass Lantern~
diff --git a/lib/edit/tr_info.txt b/lib/edit/tr_info.txt
index e86d961..0643f1a 100644
--- a/lib/edit/tr_info.txt
+++ b/lib/edit/tr_info.txt
@@ -35,8 +35,6 @@
# I:diff:prob: :minlevel: :color
# D:description
-V:2.0.0
-
#
# stat traps
#
diff --git a/lib/edit/v_info.txt b/lib/edit/v_info.txt
index fb4a4d2..964f2b5 100644
--- a/lib/edit/v_info.txt
+++ b/lib/edit/v_info.txt
@@ -16,11 +16,6 @@
# Quest vaults added - rr9
-# Version stamp (required)
-
-V:2.0.0
-
-
### Simple Vaults (type 7) -- maximum size 44x22 ###
diff --git a/lib/edit/wf_info.txt b/lib/edit/wf_info.txt
index 80ab14a..1d4b25f 100644
--- a/lib/edit/wf_info.txt
+++ b/lib/edit/wf_info.txt
@@ -28,10 +28,6 @@
# if < 1000 then it points to a town
# if >= 1000 then it points to the x - 1000 dungeon type
-# Version stamp (required)
-
-V:2.0.0
-
N:0:Ekkaia
D:the Encircling Sea
W:1:0:0:182:0:X
diff --git a/lib/mods/theme/edit/a_info.txt b/lib/mods/theme/edit/a_info.txt
index fa1cb4b..c9f888c 100644
--- a/lib/mods/theme/edit/a_info.txt
+++ b/lib/mods/theme/edit/a_info.txt
@@ -26,11 +26,6 @@
# The 'Theme' module for ToME introduces many changes into this file; please
# refer to changes.txt in the module root folder for details.
-# Version stamp (required)
-
-V:2.0.0
-
-
# The Phial of Galadriel
diff --git a/lib/mods/theme/edit/ab_info.txt b/lib/mods/theme/edit/ab_info.txt
index b78346e..976c6d0 100644
--- a/lib/mods/theme/edit/ab_info.txt
+++ b/lib/mods/theme/edit/ab_info.txt
@@ -22,14 +22,10 @@
# E:excluding ability:excluding ability
-# Version stamp (required)
-
# Do not forget to update misc.txt with an entry like the following :
# Maximum number of traits in ab_info.txt
# M:b:50
-V:2.2.0
-
N:0:Spread blows
D:If a monster dies to your attack but you still have blows left
D:you won't lose the full turn, allowing you to attack some other
diff --git a/lib/mods/theme/edit/ba_info.txt b/lib/mods/theme/edit/ba_info.txt
index 96d372b..b027098 100644
--- a/lib/mods/theme/edit/ba_info.txt
+++ b/lib/mods/theme/edit/ba_info.txt
@@ -17,10 +17,6 @@
# 1 = Restrict to normal & liked
# 2 = Restrict to liked
-# Version stamp (required)
-
-V:2.0.0
-
N:0:Nothing
C:0:0:0
I:0:0:.
diff --git a/lib/mods/theme/edit/d_info.txt b/lib/mods/theme/edit/d_info.txt
index ee0833b..f5d836f 100644
--- a/lib/mods/theme/edit/d_info.txt
+++ b/lib/mods/theme/edit/d_info.txt
@@ -29,10 +29,6 @@
# 3 = OR
# 4 = NOR
-# Version stamp (required)
-
-V:2.0.0
-
### Wilderness(purely cosmetic, never used) ###
N:0:Wilderness
diff --git a/lib/mods/theme/edit/e_info.txt b/lib/mods/theme/edit/e_info.txt
index 4d2ec5f..70d0e91 100644
--- a/lib/mods/theme/edit/e_info.txt
+++ b/lib/mods/theme/edit/e_info.txt
@@ -63,10 +63,6 @@
-# Version stamp (required)
-
-V:2.0.0
-
### Mage Staff ###
N:1:of Mana
diff --git a/lib/mods/theme/edit/f_info.txt b/lib/mods/theme/edit/f_info.txt
index dbfec51..2b42aa4 100644
--- a/lib/mods/theme/edit/f_info.txt
+++ b/lib/mods/theme/edit/f_info.txt
@@ -15,11 +15,6 @@
# Note that terrain feature zero contains the "darkness" picture.
-# Version stamp (required)
-
-V:2.0.0
-
-
# 0x00 --> nothing
N:0:nothing
diff --git a/lib/mods/theme/edit/k_info.txt b/lib/mods/theme/edit/k_info.txt
index 4739a93..c8a7808 100644
--- a/lib/mods/theme/edit/k_info.txt
+++ b/lib/mods/theme/edit/k_info.txt
@@ -27,10 +27,6 @@
# A: depth/rarity : depth/rarity : etc
# F: flag | flag | etc
-# Version stamp (required)
-
-V:2.0.0
-
##### Something special #####
diff --git a/lib/mods/theme/edit/ow_info.txt b/lib/mods/theme/edit/ow_info.txt
index ce9e526..7568358 100644
--- a/lib/mods/theme/edit/ow_info.txt
+++ b/lib/mods/theme/edit/ow_info.txt
@@ -13,10 +13,6 @@
# L:liked races
# H:hated races
-# Version stamp (required)
-
-V:2.0.0
-
# The zero index owner. If she owns a shop, there is a problem. :P
N:0:Bell Goodchild(Hobbit)
I:20000:120
diff --git a/lib/mods/theme/edit/p_info.txt b/lib/mods/theme/edit/p_info.txt
index 965c639..89d335a 100644
--- a/lib/mods/theme/edit/p_info.txt
+++ b/lib/mods/theme/edit/p_info.txt
@@ -8,8 +8,6 @@
# Do not modify this file unless you know exactly what you are doing,
# unless you wish to risk possible system crashes and broken savefiles.
-V:2.0.0
-
##############################################################################
##############################################################################
##############################################################################
diff --git a/lib/mods/theme/edit/r_info.txt b/lib/mods/theme/edit/r_info.txt
index ae8d118..18bf664 100644
--- a/lib/mods/theme/edit/r_info.txt
+++ b/lib/mods/theme/edit/r_info.txt
@@ -183,10 +183,6 @@
# Note that monster zero is used for the "player" picture.
-# Version stamp (required)
-
-V:2.2.0
-
##### The Player #####
N:0:Player
diff --git a/lib/mods/theme/edit/ra_info.txt b/lib/mods/theme/edit/ra_info.txt
index 705db24..2220a4f 100644
--- a/lib/mods/theme/edit/ra_info.txt
+++ b/lib/mods/theme/edit/ra_info.txt
@@ -16,10 +16,6 @@
# C:max to dam:max to hit:max to AC:max to pval
# F:flags
-# Version stamp (required)
-
-V:2.0.0
-
# General info, number of powers
G:100:1d5:1
G:14:0d0:1
diff --git a/lib/mods/theme/edit/re_info.txt b/lib/mods/theme/edit/re_info.txt
index c0e36a9..c1fb01c 100644
--- a/lib/mods/theme/edit/re_info.txt
+++ b/lib/mods/theme/edit/re_info.txt
@@ -6,8 +6,6 @@
# Do not modify this file unless you know exactly what you are doing,
# unless you wish to risk possible system crashes and broken savefiles.
-# Version stamp (required)
-
# Most values can be used with the +, -, % and = operators, = will set the
# monster value, + and - will modify it based on the normal monster
# % will apply that percentage to the monster value
@@ -28,8 +26,6 @@
# S:monster spells to add for the ego-type
# T:monster spells to remove, use MF_ALL for all
-V:2.0.0
-
# A few undeads, to be created by the ANIM_DEAD spell
N:1:Skeleton
diff --git a/lib/mods/theme/edit/s_info.txt b/lib/mods/theme/edit/s_info.txt
index 40c0d41..46c5cd9 100644
--- a/lib/mods/theme/edit/s_info.txt
+++ b/lib/mods/theme/edit/s_info.txt
@@ -22,10 +22,6 @@
# T:father:child
-# Version stamp (required)
-
-V:2.0.0
-
################################## MAGIC ##################################
N:56:Magic-Device
diff --git a/lib/mods/theme/edit/set_info.txt b/lib/mods/theme/edit/set_info.txt
index 4b745e4..d36ce59 100644
--- a/lib/mods/theme/edit/set_info.txt
+++ b/lib/mods/theme/edit/set_info.txt
@@ -7,15 +7,11 @@
# Do not modify this file unless you know exactly what you are doing,
# unless you wish to risk possible system crashes and broken savefiles.
-# Version stamp (required)
-
# N:idx:name
# D:description
# P:artifact index:number of item needed:pval
# F:flags
-V:2.0.0
-
# The Elven Gifts, took from Oangband
N:0:Elven Gifts
diff --git a/lib/mods/theme/edit/st_info.txt b/lib/mods/theme/edit/st_info.txt
index 17f36a6..585dc65 100644
--- a/lib/mods/theme/edit/st_info.txt
+++ b/lib/mods/theme/edit/st_info.txt
@@ -14,10 +14,6 @@
# proba is the chance(out of 100) of the item being generated
-# Version stamp (required)
-
-V:2.0.0
-
N:0:General Store
I:100:& Wooden Torch~
I:95:& Brass Lantern~
diff --git a/lib/mods/theme/edit/tr_info.txt b/lib/mods/theme/edit/tr_info.txt
index d181487..7f9e4df 100644
--- a/lib/mods/theme/edit/tr_info.txt
+++ b/lib/mods/theme/edit/tr_info.txt
@@ -35,8 +35,6 @@
# I:diff:prob: :minlevel: :color
# D:description
-V:2.0.0
-
#
# stat traps
#
diff --git a/lib/mods/theme/edit/v_info.txt b/lib/mods/theme/edit/v_info.txt
index fb4a4d2..964f2b5 100644
--- a/lib/mods/theme/edit/v_info.txt
+++ b/lib/mods/theme/edit/v_info.txt
@@ -16,11 +16,6 @@
# Quest vaults added - rr9
-# Version stamp (required)
-
-V:2.0.0
-
-
### Simple Vaults (type 7) -- maximum size 44x22 ###
diff --git a/lib/mods/theme/edit/wf_info.txt b/lib/mods/theme/edit/wf_info.txt
index 4b7f999..764462b 100644
--- a/lib/mods/theme/edit/wf_info.txt
+++ b/lib/mods/theme/edit/wf_info.txt
@@ -55,10 +55,6 @@
# corresponding to that wilderness tile (like, lots of mountain, some
# trees, a bit of water...)
-# Version stamp (required)
-
-V:2.0.0
-
N:0:Ekkaia
D:the Encircling Sea
W:1:0:0:182:0:X
diff --git a/src/init1.cc b/src/init1.cc
index 66624ec..ec3b768 100644
--- a/src/init1.cc
+++ b/src/init1.cc
@@ -1779,9 +1779,6 @@ errr init_player_info_txt(FILE *fp)
char buf[1024];
char *s, *t;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
player_race *rp_ptr = NULL;
player_race_mod *rmp_ptr = NULL;
@@ -1817,25 +1814,6 @@ errr init_player_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Reinit error_idx */
if (buf[0] == 'I')
{
@@ -3301,9 +3279,6 @@ errr init_player_info_txt(FILE *fp)
return (6);
}
- /* No version yet */
- if (!okay) return (2);
-
/* Success */
return (0);
}
@@ -3318,9 +3293,6 @@ errr init_v_info_txt(FILE *fp)
char buf[1024];
char *s;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
vault_type *v_ptr = NULL;
@@ -3343,25 +3315,6 @@ errr init_v_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf, "V:%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
@@ -3477,10 +3430,6 @@ errr init_v_info_txt(FILE *fp)
}
- /* No version yet */
- if (!okay) return (2);
-
-
/* Success */
return (0);
}
@@ -3520,9 +3469,6 @@ errr init_f_info_txt(FILE *fp)
char buf[1024];
char *s, *t;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
feature_type *f_ptr = NULL;
@@ -3544,25 +3490,6 @@ errr init_f_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
@@ -3791,9 +3718,6 @@ errr init_f_info_txt(FILE *fp)
return (6);
}
- /* No version yet */
- if (!okay) return (2);
-
/* Success */
return (0);
}
@@ -3913,9 +3837,6 @@ errr init_k_info_txt(FILE *fp)
char buf[1024];
char *s, *t;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
object_kind *k_ptr = NULL;
@@ -3940,24 +3861,6 @@ errr init_k_info_txt(FILE *fp)
if (buf[1] != ':') return (1);
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
@@ -4273,11 +4176,6 @@ errr init_k_info_txt(FILE *fp)
return (6);
}
-
- /* No version yet */
- if (!okay) return (2);
-
-
/* Success */
return (0);
}
@@ -4399,9 +4297,6 @@ errr init_a_info_txt(FILE *fp)
char buf[1024];
char *s, *t;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
artifact_type *a_ptr = NULL;
@@ -4425,25 +4320,6 @@ errr init_a_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
@@ -4681,11 +4557,6 @@ errr init_a_info_txt(FILE *fp)
return (6);
}
-
- /* No version yet */
- if (!okay) return (2);
-
-
/* Success */
return (0);
}
@@ -4701,9 +4572,6 @@ errr init_set_info_txt(FILE *fp)
char *s, *t;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
set_type *set_ptr = NULL;
@@ -4727,25 +4595,6 @@ errr init_set_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
@@ -4889,9 +4738,6 @@ errr init_set_info_txt(FILE *fp)
return (6);
}
- /* No version yet */
- if (!okay) return (2);
-
/* Success */
return (0);
}
@@ -4906,9 +4752,6 @@ errr init_s_info_txt(FILE *fp)
char buf[1024];
char *s;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
skill_type *s_ptr = NULL;
@@ -4932,25 +4775,6 @@ errr init_s_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'T' for "skill Tree" */
if (buf[0] == 'T')
{
@@ -5227,9 +5051,6 @@ errr init_s_info_txt(FILE *fp)
return (6);
}
- /* No version yet */
- if (!okay) return (2);
-
/* Success */
return (0);
}
@@ -5243,9 +5064,6 @@ errr init_ab_info_txt(FILE *fp)
char buf[1024];
char *s;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
ability_type *ab_ptr = NULL;
@@ -5269,25 +5087,6 @@ errr init_ab_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
@@ -5526,9 +5325,6 @@ errr init_ab_info_txt(FILE *fp)
return (6);
}
- /* No version yet */
- if (!okay) return (2);
-
/* Success */
return (0);
}
@@ -5764,9 +5560,6 @@ errr init_e_info_txt(FILE *fp)
char buf[1024];
char *s, *t;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
ego_item_type *e_ptr = NULL;
@@ -5790,25 +5583,6 @@ errr init_e_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
@@ -6129,11 +5903,6 @@ errr init_e_info_txt(FILE *fp)
return (6);
}
-
- /* No version yet */
- if (!okay) return (2);
-
-
/* Success */
return (0);
}
@@ -6267,9 +6036,6 @@ errr init_ra_info_txt(FILE *fp)
char buf[1024];
char *s, *t;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
randart_part_type *ra_ptr = NULL;
@@ -6293,25 +6059,6 @@ errr init_ra_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'G' for "General" (up to 30 lines) */
if (buf[0] == 'G')
{
@@ -6528,11 +6275,6 @@ errr init_ra_info_txt(FILE *fp)
return (6);
}
-
- /* No version yet */
- if (!okay) return (2);
-
-
/* Success */
return (0);
}
@@ -6666,9 +6408,6 @@ errr init_r_info_txt(FILE *fp)
char buf[1024];
char *s, *t;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
monster_race *r_ptr = NULL;
@@ -6692,25 +6431,6 @@ errr init_r_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
@@ -7033,9 +6753,6 @@ errr init_r_info_txt(FILE *fp)
r_info[i].flags8 = 0x0463;
}
- /* No version yet */
- if (!okay) return (2);
-
/* Success */
return (0);
}
@@ -7279,9 +6996,6 @@ errr init_re_info_txt(FILE *fp)
char *s, *t;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
monster_ego *re_ptr = NULL;
@@ -7304,25 +7018,6 @@ errr init_re_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
@@ -7754,9 +7449,6 @@ errr init_re_info_txt(FILE *fp)
return (6);
}
- /* No version yet */
- if (!okay) return (2);
-
/* Success */
return (0);
}
@@ -7795,9 +7487,6 @@ errr init_t_info_txt(FILE *fp)
char buf[1024];
char *s, *t;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
trap_type *t_ptr = NULL;
@@ -7819,25 +7508,6 @@ errr init_t_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
@@ -7959,9 +7629,6 @@ errr init_t_info_txt(FILE *fp)
return (6);
}
- /* No version yet */
- if (!okay) return (2);
-
/* Success */
return (0);
}
@@ -8133,9 +7800,6 @@ errr init_d_info_txt(FILE *fp)
char *s, *t;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
dungeon_info_type *d_ptr = NULL;
@@ -8158,25 +7822,6 @@ errr init_d_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
@@ -8675,10 +8320,6 @@ errr init_d_info_txt(FILE *fp)
return (6);
}
-
- /* No version yet */
- if (!okay) return (2);
-
/* Success */
return (0);
}
@@ -8747,9 +8388,6 @@ errr init_st_info_txt(FILE *fp)
char buf[1024];
char *s, *t;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
store_info_type *st_ptr = NULL;
@@ -8772,25 +8410,6 @@ errr init_st_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
@@ -8995,9 +8614,6 @@ errr init_st_info_txt(FILE *fp)
return (6);
}
- /* No version yet */
- if (!okay) return (2);
-
/* Success */
return (0);
}
@@ -9011,9 +8627,6 @@ errr init_ba_info_txt(FILE *fp)
char buf[1024];
char *s;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
store_action_type *ba_ptr = NULL;
@@ -9036,25 +8649,6 @@ errr init_ba_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
@@ -9139,9 +8733,6 @@ errr init_ba_info_txt(FILE *fp)
return (6);
}
- /* No version yet */
- if (!okay) return (2);
-
/* Success */
return (0);
}
@@ -9155,9 +8746,6 @@ errr init_ow_info_txt(FILE *fp)
char buf[1024];
char *s, *t;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
owner_type *ow_ptr = NULL;
@@ -9179,25 +8767,6 @@ errr init_ow_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
@@ -9332,9 +8901,6 @@ errr init_ow_info_txt(FILE *fp)
return (6);
}
- /* No version yet */
- if (!okay) return (2);
-
/* Success */
return (0);
}
@@ -9372,9 +8938,6 @@ errr init_wf_info_txt(FILE *fp)
char buf[1024];
char *s, *t;
- /* Not ready yet */
- bool_ okay = FALSE;
-
/* Current entry */
wilderness_type_info *wf_ptr = NULL;
@@ -9396,25 +8959,6 @@ errr init_wf_info_txt(FILE *fp)
/* Verify correct "colon" format */
if (buf[1] != ':') return (1);
-
- /* Hack -- Process 'V' for "Version" */
- if (buf[0] == 'V')
- {
- int v1, v2, v3;
-
- /* Scan for the values */
- if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-
- /* Okay to proceed */
- okay = TRUE;
-
- /* Continue */
- continue;
- }
-
- /* No version yet */
- if (!okay) return (2);
-
/* Process 'N' for "New/Number/Name" */
if (buf[0] == 'N')
{
@@ -9550,9 +9094,6 @@ errr init_wf_info_txt(FILE *fp)
return (6);
}
- /* No version yet */
- if (!okay) return (2);
-
/* Success */
return (0);
}