Campaigns: Fix number of levels in seventasks and main

The wrong number of levels announced for Seven Tasks caused a crash on
Win32. Fixes #70.
Also fixed the spelling for "NextLevel", though it did not seem to have
an influence on parsing.

diff --git a/Data/Campaigns/empire.txt b/Data/Campaigns/empire.txt
index d925696aea9430b8f7a31d1928f16b11d1da5299..5311489bc389272b0affdf6c404552a440141860 100644 (file)
--- a/Data/Campaigns/empire.txt
+++ b/Data/Campaigns/empire.txt
@@ -14,7 +14,7 @@ Name: jendraz2
 Description: Throne_Room
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 3
+NextLevel: 3
 LocationX: 130
 LocationY: 350
 
@@ -23,7 +23,7 @@ Name: jendraz3
 Description: Rebel_Outpost
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 4
+NextLevel: 4
 LocationX: 240
 LocationY: 210
 
@@ -32,7 +32,7 @@ Name: jendraz4
 Description: Rebel_Base
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 5
+NextLevel: 5
 LocationX: 250
 LocationY: 190
 
@@ -41,7 +41,7 @@ Name: jendraz5
 Description: Rebel_Base
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 6
+NextLevel: 6
 LocationX: 250
 LocationY: 190
 
@@ -50,7 +50,7 @@ Name: jendraz6
 Description: Rebel_Nest
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 7
+NextLevel: 7
 LocationX: 310
 LocationY: 140
 
@@ -59,7 +59,7 @@ Name: jendraz7
 Description: Mountain_Valley
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 8
+NextLevel: 8
 LocationX: 300
 LocationY: 190
 
@@ -68,7 +68,7 @@ Name: jendraz8
 Description: Mountain_Valley
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 9
+NextLevel: 9
 LocationX: 300
 LocationY: 190
 
@@ -77,7 +77,7 @@ Name: jendraz9
 Description: Mountain_Valley
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 10
+NextLevel: 10
 LocationX: 300
 LocationY: 190
 
@@ -86,7 +86,7 @@ Name: jendraz10
 Description: Mountain_Valley
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 11
+NextLevel: 11
 LocationX: 300
 LocationY: 190
 
@@ -95,7 +95,7 @@ Name: jendraz11
 Description: Sky_Palace
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 12
+NextLevel: 12
 LocationX: 130
 LocationY: 350
 
@@ -104,7 +104,7 @@ Name: jendraz12
 Description: Sky_Palace
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 13
+NextLevel: 13
 LocationX: 130
 LocationY: 350
 
@@ -113,7 +113,7 @@ Name: jendraz13
 Description: Rebel_Nest
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 14
+NextLevel: 14
 LocationX: 310
 LocationY: 140
 
@@ -122,7 +122,7 @@ Name: jendraz14
 Description: Dante's_Mountain
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 15
+NextLevel: 15
 LocationX: 330
 LocationY: 245
 
@@ -140,7 +140,7 @@ Name: jendraz16
 Description: Rebel_Nest
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 17
+NextLevel: 17
 LocationX: 310
 LocationY: 140
 
@@ -149,7 +149,7 @@ Name: jendraz17
 Description: Dante's_Dwelling
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 18
+NextLevel: 18
 LocationX: 340
 LocationY: 230
 
@@ -158,7 +158,7 @@ Name: jendraz18
 Description: Dante's_Dwelling
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 19
+NextLevel: 19
 LocationX: 340
 LocationY: 230
 
@@ -167,7 +167,7 @@ Name: jendraz19
 Description: Dante's_Settlement
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 20
+NextLevel: 20
 LocationX: 329
 LocationY: 229
 
@@ -176,7 +176,7 @@ Name: jendraz20
 Description: Dante's_Settlement
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 21
+NextLevel: 21
 LocationX: 329
 LocationY: 229
 
@@ -185,7 +185,7 @@ Name: jendraz21
 Description: Imperial_Border
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 22
+NextLevel: 22
 LocationX: 235
 LocationY: 280
 
@@ -194,7 +194,7 @@ Name: jendraz22
 Description: Imperial_Territory
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 23
+NextLevel: 23
 LocationX: 180
 LocationY: 300
 
@@ -203,7 +203,7 @@ Name: jendraz23
 Description: Rebel_Nest
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 24
+NextLevel: 24
 LocationX: 310
 LocationY: 140
 
@@ -212,7 +212,7 @@ Name: jendraz24
 Description: Imperial_Base
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 25
+NextLevel: 25
 LocationX: 200
 LocationY: 210
 
@@ -221,7 +221,7 @@ Name: jendraz25
 Description: Foot_Of_Sky_Palace
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 26
+NextLevel: 26
 LocationX: 130
 LocationY: 350
 
@@ -230,7 +230,7 @@ Name: jendraz26
 Description: Boulders
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 27
+NextLevel: 27
 LocationX: 190
 LocationY: 200
 
@@ -239,7 +239,7 @@ Name: jendraz27
 Description: Sky_Palace
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 28
+NextLevel: 28
 LocationX: 130
 LocationY: 350
 
@@ -248,7 +248,7 @@ Name: jendraz28
 Description: Boulders
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 29
+NextLevel: 29
 LocationX: 190
 LocationY: 200
 
@@ -266,7 +266,7 @@ Name: jendraz30
 Description: Rebel_Nest
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 31
+NextLevel: 31
 LocationX: 310
 LocationY: 140
 
@@ -275,7 +275,7 @@ Name: jendraz31
 Description: Imperial_Border
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 32
+NextLevel: 32
 LocationX: 190
 LocationY: 260
 
@@ -284,7 +284,7 @@ Name: jendraz32
 Description: Sky_Palace
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 33
+NextLevel: 33
 LocationX: 130
 LocationY: 350
 
@@ -293,7 +293,7 @@ Name: jendraz33
 Description: Sky_Palace
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 34
+NextLevel: 34
 LocationX: 130
 LocationY: 350
 
@@ -302,7 +302,7 @@ Name: jendraz34
 Description: Sky_Palace
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 35
+NextLevel: 35
 LocationX: 130
 LocationY: 350
 
@@ -311,7 +311,7 @@ Name: jendraz35
 Description: Imperial_Border
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 36
+NextLevel: 36
 LocationX: 190
 LocationY: 260
 
@@ -320,7 +320,7 @@ Name: jendraz36
 Description: Imperial_Territory
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 37
+NextLevel: 37
 LocationX: 140
 LocationY: 300
 
@@ -329,7 +329,7 @@ Name: jendraz37
 Description: Imperial_Territory
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 38
+NextLevel: 38
 LocationX: 140
 LocationY: 300
 
@@ -338,7 +338,7 @@ Name: jendraz38
 Description: Sky_Palace
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 39
+NextLevel: 39
 LocationX: 130
 LocationY: 350
 
@@ -347,7 +347,7 @@ Name: jendraz39
 Description: Sky_Palace
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 40
+NextLevel: 40
 LocationX: 130
 LocationY: 350
 
@@ -356,7 +356,7 @@ Name: jendraz40
 Description: Foot_Of_Sky_Palace
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 41
+NextLevel: 41
 LocationX: 130
 LocationY: 350
 
@@ -366,4 +366,4 @@ Description: The_Gardens
 ChooseNext: 1
 NumNext: 0
 LocationX: 130
-LocationY: 350
\ No newline at end of file
+LocationY: 350

diff --git a/Data/Campaigns/main.txt b/Data/Campaigns/main.txt
index ddda1531b153aca8ef3656b33b9280ae5b735a9a..a3518a9c42652ed5327144dc6b516873e0da1020 100644 (file)
--- a/Data/Campaigns/main.txt
+++ b/Data/Campaigns/main.txt
@@ -1,4 +1,4 @@
-Campaign Levels: 27
+Campaign Levels: 26
 
 Level 1:
 Name: Start1

diff --git a/Data/Campaigns/seventasks.txt b/Data/Campaigns/seventasks.txt
index 00d76197322c07c010a617f0d7ecab781ecf1317..d6163057b1aa2468a93f9f563b41c06b8dff639a 100644 (file)
--- a/Data/Campaigns/seventasks.txt
+++ b/Data/Campaigns/seventasks.txt
@@ -1,4 +1,4 @@
-Campaign Levels: 27
+Campaign Levels: 18
 
 Level 1:
 Name: task1
@@ -161,4 +161,4 @@ ChooseNext: 1
 NumNext: 0
 NextLevel: 19
 LocationX: 400
-LocationY: 400
\ No newline at end of file
+LocationY: 400

diff --git a/Data/Campaigns/temple.txt b/Data/Campaigns/temple.txt
index f1ab8c5ac21b52e90b255f1a587ff7fa511d16a3..7b67f6c0b0665d4dc5cbf459f1a9bc6993eb8bcd 100644 (file)
--- a/Data/Campaigns/temple.txt
+++ b/Data/Campaigns/temple.txt
@@ -14,7 +14,7 @@ Name: svenclimb
 Description: Giant_Ruins
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 3
+NextLevel: 3
 LocationX: 197
 LocationY: 370
 
@@ -23,7 +23,7 @@ Name: svenheaven
 Description: Ruins_Top
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 4
+NextLevel: 4
 LocationX: 192
 LocationY: 353
 
@@ -32,7 +32,7 @@ Name: sventemple
 Description: Temple_of_the_Wind
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 5
+NextLevel: 5
 LocationX: 135
 LocationY: 320
 
@@ -41,7 +41,7 @@ Name: svensthwrong
 Description: West_Pass
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 6
+NextLevel: 6
 LocationX: 80
 LocationY: 293
 
@@ -50,7 +50,7 @@ Name: svendefend
 Description: Something_Wrong
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 7
+NextLevel: 7
 LocationX: 80
 LocationY: 293
 
@@ -59,7 +59,7 @@ Name: svenshan
 Description: Old_Fort
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 8
+NextLevel: 8
 LocationX: 83
 LocationY: 250
 
@@ -68,7 +68,7 @@ Name: svenfort
 Description: Old_Fort
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 9
+NextLevel: 9
 LocationX: 83
 LocationY: 250
 
@@ -77,7 +77,7 @@ Name: svenforest
 Description: Heading_for_Clearing
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 10
+NextLevel: 10
 LocationX: 115
 LocationY: 240
 
@@ -86,7 +86,7 @@ Name: svenearl
 Description: Clearing
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 11
+NextLevel: 11
 LocationX: 131
 LocationY: 252
 
@@ -95,7 +95,7 @@ Name: sventemple2
 Description: Temple_of_the_Wind
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 12
+NextLevel: 12
 LocationX: 135
 LocationY: 320
 
@@ -104,7 +104,7 @@ Name: svenmeeting
 Description: Forest_Pagoda
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 13
+NextLevel: 13
 LocationX: 160
 LocationY: 270
 
@@ -113,7 +113,7 @@ Name: svenredbw
 Description: Snowy_Fields
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 14
+NextLevel: 14
 LocationX: 240
 LocationY: 213
 
@@ -122,7 +122,7 @@ Name: svenredbw2
 Description: Snowy_Fields
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 15
+NextLevel: 15
 LocationX: 240
 LocationY: 213
 
@@ -131,7 +131,7 @@ Name: svendawn
 Description: Desert_Beacons
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 16
+NextLevel: 16
 LocationX: 277
 LocationY: 227
 
@@ -140,7 +140,7 @@ Name: svencanyon
 Description: Canyon
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 17
+NextLevel: 17
 LocationX: 320
 LocationY: 215
 
@@ -149,7 +149,7 @@ Name: svenredbw3
 Description: Snowy_Fields:_Night
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 18
+NextLevel: 18
 LocationX: 240
 LocationY: 213
 
@@ -158,7 +158,7 @@ Name: svenninjabefore
 Description: Border
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 19
+NextLevel: 19
 LocationX: 345
 LocationY: 213
 
@@ -167,7 +167,7 @@ Name: svenninja
 Description: General_Mansion
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 20
+NextLevel: 20
 LocationX: 405
 LocationY: 213
 
@@ -176,7 +176,7 @@ Name: svenredbw4
 Description: Snowy_Fields:_Dawn
 ChooseNext: 0
 NumNext: 1
-Nextlevel: 21
+NextLevel: 21
 LocationX: 240
 LocationY: 213
 
@@ -185,7 +185,7 @@ Name: svenredbw5
 Description: Snowy_Fields:_Dawn
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 22
+NextLevel: 22
 LocationX: 240
 LocationY: 213
 
@@ -194,7 +194,7 @@ Name: svenredbwafter
 Description: Snowy_Plain
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 23
+NextLevel: 23
 LocationX: 243
 LocationY: 238
 
@@ -203,7 +203,7 @@ Name: svenruins
 Description: Ruins
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 24
+NextLevel: 24
 LocationX: 135
 LocationY: 320
 
@@ -212,7 +212,7 @@ Name: svenalpha
 Description: Wolf_Mountain
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 25
+NextLevel: 25
 LocationX: 315
 LocationY: 240
 
@@ -221,7 +221,7 @@ Name: svencouncil
 Description: Council
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 26
+NextLevel: 26
 LocationX: 313
 LocationY: 288
 
@@ -230,7 +230,7 @@ Name: svendecoy
 Description: Border_Wall
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 27
+NextLevel: 27
 LocationX: 382
 LocationY: 255
 
@@ -239,7 +239,7 @@ Name: svenchasm
 Description: Castle_Bridge
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 28
+NextLevel: 28
 LocationX: 356
 LocationY: 241
 
@@ -248,7 +248,7 @@ Name: sventhrone
 Description: Throne_Hall
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 29
+NextLevel: 29
 LocationX: 336
 LocationY: 227
 
@@ -257,7 +257,7 @@ Name: svendoor
 Description: Castle_Entrance
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 30
+NextLevel: 30
 LocationX: 356
 LocationY: 241
 
@@ -266,7 +266,7 @@ Name: svengrotto
 Description: Snowy_Grotto
 ChooseNext: 1
 NumNext: 1
-Nextlevel: 31
+NextLevel: 31
 LocationX: 343
 LocationY: 258