summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2010-01-15 19:46:28 +0100
committerBardur Arantsson <bardur@scientician.net>2010-01-17 10:02:09 +0100
commit2806578dcae47b46b85c94992118d25112a15284 (patch)
tree5c635acc9c4996e1ff863cde3baad4578b4def8a /src
parente4da3cd044dd5bcb0ef5e15b6cb44bda789020f4 (diff)
Remove VERIFY_VERSION_STAMP code. It's useless.
Diffstat (limited to 'src')
-rw-r--r--src/config.h8
-rw-r--r--src/init1.c285
2 files changed, 0 insertions, 293 deletions
diff --git a/src/config.h b/src/config.h
index d14a499f..343f675c 100644
--- a/src/config.h
+++ b/src/config.h
@@ -145,14 +145,6 @@
/*
- * OPTION: Check version stamp when loading files in lib/data directory,
- * or their source in lib/edit.
- */
-/* # #define VERIFY_VERSION_STAMP */
-
-
-
-/*
* OPTION: Allow characteres to be "auto-rolled"
*/
#define ALLOW_AUTOROLLER
diff --git a/src/init1.c b/src/init1.c
index 6f702a89..56fc6472 100644
--- a/src/init1.c
+++ b/src/init1.c
@@ -1850,24 +1850,9 @@ errr init_player_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
/* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != rp_head->v_major) ||
- (v2 != rp_head->v_minor) ||
- (v3 != rp_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
-/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -3486,24 +3471,9 @@ errr init_v_info_txt(FILE *fp, char *buf, bool start)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
/* Scan for the values */
- if ((3 != sscanf(buf, "V:%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != v_head->v_major) ||
- (v2 != v_head->v_minor) ||
- (v3 != v_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
-/* Scan for the values */
if (3 != sscanf(buf, "V:%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -3755,24 +3725,9 @@ errr init_f_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
- /* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != f_head->v_major) ||
- (v2 != f_head->v_minor) ||
- (v3 != f_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -4203,24 +4158,9 @@ errr init_k_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
- /* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != k_head->v_major) ||
- (v2 != k_head->v_minor) ||
- (v3 != k_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -4710,24 +4650,9 @@ errr init_al_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
- /* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != al_head->v_major) ||
- (v2 != al_head->v_minor) ||
- (v3 != al_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -5143,24 +5068,9 @@ errr init_a_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
- /* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != a_head->v_major) ||
- (v2 != a_head->v_minor) ||
- (v3 != a_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -5498,24 +5408,9 @@ errr init_set_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
- /* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != a_head->v_major) ||
- (v2 != a_head->v_minor) ||
- (v3 != a_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -5750,24 +5645,9 @@ errr init_s_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
- /* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != s_head->v_major) ||
- (v2 != s_head->v_minor) ||
- (v3 != s_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -6144,24 +6024,9 @@ errr init_ab_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
- /* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != ab_head->v_major) ||
- (v2 != ab_head->v_minor) ||
- (v3 != ab_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -6721,24 +6586,9 @@ errr init_e_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
- /* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != e_head->v_major) ||
- (v2 != e_head->v_minor) ||
- (v3 != e_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -7284,24 +7134,9 @@ errr init_ra_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
- /* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != ra_head->v_major) ||
- (v2 != ra_head->v_minor) ||
- (v3 != ra_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -7710,24 +7545,9 @@ errr init_r_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
/* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != r_head->v_major) ||
- (v2 != r_head->v_minor) ||
- (v3 != r_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
-/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -8368,24 +8188,9 @@ errr init_re_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
- /* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != re_head->v_major) ||
- (v2 != re_head->v_minor) ||
- (v3 != re_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -8924,24 +8729,9 @@ errr init_t_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
/* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != t_head->v_major) ||
- (v2 != t_head->v_minor) ||
- (v3 != t_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
-/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -9312,24 +9102,9 @@ errr init_d_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
- /* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != d_head->v_major) ||
- (v2 != d_head->v_minor) ||
- (v3 != d_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -9972,24 +9747,9 @@ errr init_st_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
- /* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != st_head->v_major) ||
- (v2 != st_head->v_minor) ||
- (v3 != st_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -10276,24 +10036,9 @@ errr init_ba_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
- /* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != ba_head->v_major) ||
- (v2 != ba_head->v_minor) ||
- (v3 != ba_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -10461,24 +10206,9 @@ errr init_ow_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
- /* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != ow_head->v_major) ||
- (v2 != ow_head->v_minor) ||
- (v3 != ow_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;
@@ -10723,24 +10453,9 @@ errr init_wf_info_txt(FILE *fp, char *buf)
{
int v1, v2, v3;
-#ifdef VERIFY_VERSION_STAMP
-
- /* Scan for the values */
- if ((3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) ||
- (v1 != wf_head->v_major) ||
- (v2 != wf_head->v_minor) ||
- (v3 != wf_head->v_patch))
- {
- return (2);
- }
-
-#else /* VERIFY_VERSION_STAMP */
-
/* Scan for the values */
if (3 != sscanf(buf + 2, "%d.%d.%d", &v1, &v2, &v3)) return (2);
-#endif /* VERIFY_VERSION_STAMP */
-
/* Okay to proceed */
okay = TRUE;