Adding the temple campaign so we can test multiple campaigns features.

diff --git a/CONTENT-LICENSE.txt b/CONTENT-LICENSE.txt
index cf05b4935fda1f3d51d8475877d043d3f3b86dfc..e97d5daa47d20dd9fb1a502a56bf1b602ece7353 100644 (file)
--- a/CONTENT-LICENSE.txt
+++ b/CONTENT-LICENSE.txt
@@ -1,4 +1,49 @@
- The following game assets are under CC-BY-SA 3.0 Unported ( http://creativecommons.org/licenses/by-sa/3.0/ ) :
+http://forums.wolfire.com/viewtopic.php?f=7&t=1066&start=270#p109473
+These map are from Temple by Slib under CC-BY-SA : 
+Data/Maps/sventhrone
+Data/Maps/sventemple2
+Data/Maps/sventemple
+Data/Maps/svensthwrong
+Data/Maps/svenskip
+Data/Maps/svenshan
+Data/Maps/svenruins
+Data/Maps/svenroad
+Data/Maps/svenredbwafter
+Data/Maps/svenredbw5
+Data/Maps/svenredbw4
+Data/Maps/svenredbw3
+Data/Maps/svenredbw2
+Data/Maps/svenredbw
+Data/Maps/svenninjabefore
+Data/Maps/svenninja
+Data/Maps/svenmeeting
+Data/Maps/svenheaven
+Data/Maps/svengrotto
+Data/Maps/svenfort
+Data/Maps/svenforest
+Data/Maps/svenfireice
+Data/Maps/svenearl
+Data/Maps/svendoor
+Data/Maps/svendefend
+Data/Maps/svendecoy
+Data/Maps/svendawn
+Data/Maps/svencouncil
+Data/Maps/svenclimb
+Data/Maps/svenchasm
+Data/Maps/svencanyon
+Data/Maps/svenalpha
+
+These textures are from Temple by Slib under CC-BY-SA : 
+mask.png
+GiTop.png
+GiTeared.png
+GiBottom.png
+Desertcl.png
+
+This campaign is from Temple by Slib under CC-BY-SA : 
+Data/Campaign/temple.txt
+
+The following game assets are under CC-BY-SA 3.0 Unported ( http://creativecommons.org/licenses/by-sa/3.0/ ) :
  
  Data/Animations/Wolfstop
  Data/Animations/Wolfslap

diff --git a/Data/Campaigns/temple.txt b/Data/Campaigns/temple.txt
new file mode 100644 (file)
index 0000000..6f21927
--- /dev/null
+++ b/Data/Campaigns/temple.txt
@@ -0,0 +1 @@
+Campaign Levels: 31\r\rLevel 1:\rName: svenroad\rDescription: Giant_Ruins_-_start_new_campaign!\rChooseNext: 0\rNumNext: 1\rNextLevel: 2\rLocationX: 197\rLocationY: 370\r\rLevel 2:\rName: svenclimb\rDescription: Giant_Ruins\rChooseNext: 1\rNumNext: 1\rNextlevel: 3\rLocationX: 197\rLocationY: 370\r\rLevel 3:\rName: svenheaven\rDescription: Ruins_Top\rChooseNext: 1\rNumNext: 1\rNextlevel: 4\rLocationX: 192\rLocationY: 353\r\rLevel 4:\rName: sventemple\rDescription: Temple_of_the_Wind\rChooseNext: 1\rNumNext: 1\rNextlevel: 5\rLocationX: 135\rLocationY: 320\r\rLevel 5:\rName: svensthwrong\rDescription: West_Pass\rChooseNext: 0\rNumNext: 1\rNextlevel: 6\rLocationX: 80\rLocationY: 293\r\rLevel 6:\rName: svendefend\rDescription: Something_Wrong\rChooseNext: 1\rNumNext: 1\rNextlevel: 7\rLocationX: 80\rLocationY: 293\r\rLevel 7:\rName: svenshan\rDescription: Old_Fort\rChooseNext: 0\rNumNext: 1\rNextlevel: 8\rLocationX: 83\rLocationY: 250\r\rLevel 8:\rName: svenfort\rDescription: Old_Fort\rChooseNext: 1\rNumNext: 1\rNextlevel: 9\rLocationX: 83\rLocationY: 250\r\rLevel 9:\rName: svenforest\rDescription: Heading_for_Clearing\rChooseNext: 0\rNumNext: 1\rNextlevel: 10\rLocationX: 115\rLocationY: 240\r\rLevel 10:\rName: svenearl\rDescription: Clearing\rChooseNext: 1\rNumNext: 1\rNextlevel: 11\rLocationX: 131\rLocationY: 252\r\rLevel 11:\rName: sventemple2\rDescription: Temple_of_the_Wind\rChooseNext: 1\rNumNext: 1\rNextlevel: 12\rLocationX: 135\rLocationY: 320\r\rLevel 12:\rName: svenmeeting\rDescription: Forest_Pagoda\rChooseNext: 1\rNumNext: 1\rNextlevel: 13\rLocationX: 160\rLocationY: 270\r\rLevel 13:\rName: svenredbw\rDescription: Snowy_Fields\rChooseNext: 0\rNumNext: 1\rNextlevel: 14\rLocationX: 240\rLocationY: 213\r\rLevel 14:\rName: svenredbw2\rDescription: Snowy_Fields\rChooseNext: 1\rNumNext: 1\rNextlevel: 15\rLocationX: 240\rLocationY: 213\r\rLevel 15:\rName: svendawn\rDescription: Desert_Beacons\rChooseNext: 1\rNumNext: 1\rNextlevel: 16\rLocationX: 277\rLocationY: 227\r\rLevel 16:\rName: svencanyon\rDescription: Canyon\rChooseNext: 1\rNumNext: 1\rNextlevel: 17\rLocationX: 320\rLocationY: 215\r\rLevel 17:\rName: svenredbw3\rDescription: Snowy_Fields:_Night\rChooseNext: 1\rNumNext: 1\rNextlevel: 18\rLocationX: 240\rLocationY: 213\r\rLevel 18:\rName: svenninjabefore\rDescription: Border\rChooseNext: 1\rNumNext: 1\rNextlevel: 19\rLocationX: 345\rLocationY: 213\r\rLevel 19:\rName: svenninja\rDescription: General_Mansion\rChooseNext: 1\rNumNext: 1\rNextlevel: 20\rLocationX: 405\rLocationY: 213\r\rLevel 20:\rName: svenredbw4\rDescription: Snowy_Fields:_Dawn\rChooseNext: 0\rNumNext: 1\rNextlevel: 21\rLocationX: 240\rLocationY: 213\r\rLevel 21:\rName: svenredbw5\rDescription: Snowy_Fields:_Dawn\rChooseNext: 1\rNumNext: 1\rNextlevel: 22\rLocationX: 240\rLocationY: 213\r\rLevel 22:\rName: svenredbwafter\rDescription: Snowy_Plain\rChooseNext: 1\rNumNext: 1\rNextlevel: 23\rLocationX: 243\rLocationY: 238\r\rLevel 23:\rName: svenruins\rDescription: Ruins\rChooseNext: 1\rNumNext: 1\rNextlevel: 24\rLocationX: 135\rLocationY: 320\r\rLevel 24:\rName: svenalpha\rDescription: Wolf_Mountain\rChooseNext: 1\rNumNext: 1\rNextlevel: 25\rLocationX: 315\rLocationY: 240\r\rLevel 25:\rName: svencouncil\rDescription: Council\rChooseNext: 1\rNumNext: 1\rNextlevel: 26\rLocationX: 313\rLocationY: 288\r\rLevel 26:\rName: svendecoy\rDescription: Border_Wall\rChooseNext: 1\rNumNext: 1\rNextlevel: 27\rLocationX: 382\rLocationY: 255\r\rLevel 27:\rName: svenchasm\rDescription: Castle_Bridge\rChooseNext: 1\rNumNext: 1\rNextlevel: 28\rLocationX: 356\rLocationY: 241\r\rLevel 28:\rName: sventhrone\rDescription: Throne_Hall\rChooseNext: 1\rNumNext: 1\rNextlevel: 29\rLocationX: 336\rLocationY: 227\r\rLevel 29:\rName: svendoor\rDescription: Castle_Entrance\rChooseNext: 1\rNumNext: 1\rNextlevel: 30\rLocationX: 356\rLocationY: 241\r\rLevel 30:\rName: svengrotto\rDescription: Snowy_Grotto\rChooseNext: 1\rNumNext: 1\rNextlevel: 31\rLocationX: 343\rLocationY: 258\r\rLevel 31:\rName: svenfireice\rDescription: Ice_Cave_(Last_Level)\rChooseNext: 1\rNumNext: 0\rLocationX: 343\rLocationY: 258\r
\ No newline at end of file

diff --git a/Data/Maps/jendraz1 b/Data/Maps/jendraz1
new file mode 100644 (file)
index 0000000..f19e4a9
Binary files /dev/null and b/Data/Maps/jendraz1 differ

diff --git a/Data/Maps/jendraz10 b/Data/Maps/jendraz10
new file mode 100644 (file)
index 0000000..2053d18
Binary files /dev/null and b/Data/Maps/jendraz10 differ

diff --git a/Data/Maps/jendraz11 b/Data/Maps/jendraz11
new file mode 100644 (file)
index 0000000..41a2439
Binary files /dev/null and b/Data/Maps/jendraz11 differ

diff --git a/Data/Maps/jendraz12 b/Data/Maps/jendraz12
new file mode 100644 (file)
index 0000000..1b432b1
Binary files /dev/null and b/Data/Maps/jendraz12 differ

diff --git a/Data/Maps/jendraz13 b/Data/Maps/jendraz13
new file mode 100644 (file)
index 0000000..32a99dc
Binary files /dev/null and b/Data/Maps/jendraz13 differ

diff --git a/Data/Maps/jendraz14 b/Data/Maps/jendraz14
new file mode 100644 (file)
index 0000000..446a5e8
Binary files /dev/null and b/Data/Maps/jendraz14 differ

diff --git a/Data/Maps/jendraz15 b/Data/Maps/jendraz15
new file mode 100644 (file)
index 0000000..2d633b9
Binary files /dev/null and b/Data/Maps/jendraz15 differ

diff --git a/Data/Maps/jendraz16 b/Data/Maps/jendraz16
new file mode 100644 (file)
index 0000000..28561e8
Binary files /dev/null and b/Data/Maps/jendraz16 differ

diff --git a/Data/Maps/jendraz17 b/Data/Maps/jendraz17
new file mode 100644 (file)
index 0000000..ab838f4
Binary files /dev/null and b/Data/Maps/jendraz17 differ

diff --git a/Data/Maps/jendraz18 b/Data/Maps/jendraz18
new file mode 100644 (file)
index 0000000..a9c9d0a
Binary files /dev/null and b/Data/Maps/jendraz18 differ

diff --git a/Data/Maps/jendraz19 b/Data/Maps/jendraz19
new file mode 100644 (file)
index 0000000..24d9ac6
Binary files /dev/null and b/Data/Maps/jendraz19 differ

diff --git a/Data/Maps/jendraz2 b/Data/Maps/jendraz2
new file mode 100644 (file)
index 0000000..73a8544
Binary files /dev/null and b/Data/Maps/jendraz2 differ

diff --git a/Data/Maps/jendraz20 b/Data/Maps/jendraz20
new file mode 100644 (file)
index 0000000..c26b6b5
Binary files /dev/null and b/Data/Maps/jendraz20 differ

diff --git a/Data/Maps/jendraz21 b/Data/Maps/jendraz21
new file mode 100644 (file)
index 0000000..2e7f8a1
Binary files /dev/null and b/Data/Maps/jendraz21 differ

diff --git a/Data/Maps/jendraz22 b/Data/Maps/jendraz22
new file mode 100644 (file)
index 0000000..c764663
Binary files /dev/null and b/Data/Maps/jendraz22 differ

diff --git a/Data/Maps/jendraz23 b/Data/Maps/jendraz23
new file mode 100644 (file)
index 0000000..e0e2f2a
Binary files /dev/null and b/Data/Maps/jendraz23 differ

diff --git a/Data/Maps/jendraz24 b/Data/Maps/jendraz24
new file mode 100644 (file)
index 0000000..5773316
Binary files /dev/null and b/Data/Maps/jendraz24 differ

diff --git a/Data/Maps/jendraz25 b/Data/Maps/jendraz25
new file mode 100644 (file)
index 0000000..05a9062
Binary files /dev/null and b/Data/Maps/jendraz25 differ

diff --git a/Data/Maps/jendraz26 b/Data/Maps/jendraz26
new file mode 100644 (file)
index 0000000..9dc6170
Binary files /dev/null and b/Data/Maps/jendraz26 differ

diff --git a/Data/Maps/jendraz27 b/Data/Maps/jendraz27
new file mode 100644 (file)
index 0000000..e53484d
Binary files /dev/null and b/Data/Maps/jendraz27 differ

diff --git a/Data/Maps/jendraz28 b/Data/Maps/jendraz28
new file mode 100644 (file)
index 0000000..30b57d3
Binary files /dev/null and b/Data/Maps/jendraz28 differ

diff --git a/Data/Maps/jendraz29 b/Data/Maps/jendraz29
new file mode 100644 (file)
index 0000000..a9b066c
Binary files /dev/null and b/Data/Maps/jendraz29 differ

diff --git a/Data/Maps/jendraz3 b/Data/Maps/jendraz3
new file mode 100644 (file)
index 0000000..e8c9a24
Binary files /dev/null and b/Data/Maps/jendraz3 differ

diff --git a/Data/Maps/jendraz30 b/Data/Maps/jendraz30
new file mode 100644 (file)
index 0000000..000f221
Binary files /dev/null and b/Data/Maps/jendraz30 differ

diff --git a/Data/Maps/jendraz31 b/Data/Maps/jendraz31
new file mode 100644 (file)
index 0000000..0e9b789
Binary files /dev/null and b/Data/Maps/jendraz31 differ

diff --git a/Data/Maps/jendraz32 b/Data/Maps/jendraz32
new file mode 100644 (file)
index 0000000..4da04cc
Binary files /dev/null and b/Data/Maps/jendraz32 differ

diff --git a/Data/Maps/jendraz33 b/Data/Maps/jendraz33
new file mode 100644 (file)
index 0000000..2210158
Binary files /dev/null and b/Data/Maps/jendraz33 differ

diff --git a/Data/Maps/jendraz34 b/Data/Maps/jendraz34
new file mode 100644 (file)
index 0000000..436d7c3
Binary files /dev/null and b/Data/Maps/jendraz34 differ

diff --git a/Data/Maps/jendraz35 b/Data/Maps/jendraz35
new file mode 100644 (file)
index 0000000..e494e05
Binary files /dev/null and b/Data/Maps/jendraz35 differ

diff --git a/Data/Maps/jendraz36 b/Data/Maps/jendraz36
new file mode 100644 (file)
index 0000000..6159ff9
Binary files /dev/null and b/Data/Maps/jendraz36 differ

diff --git a/Data/Maps/jendraz37 b/Data/Maps/jendraz37
new file mode 100644 (file)
index 0000000..1ff348b
Binary files /dev/null and b/Data/Maps/jendraz37 differ

diff --git a/Data/Maps/jendraz38 b/Data/Maps/jendraz38
new file mode 100644 (file)
index 0000000..adc1cf1
Binary files /dev/null and b/Data/Maps/jendraz38 differ

diff --git a/Data/Maps/jendraz39 b/Data/Maps/jendraz39
new file mode 100644 (file)
index 0000000..7ec779a
Binary files /dev/null and b/Data/Maps/jendraz39 differ

diff --git a/Data/Maps/jendraz4 b/Data/Maps/jendraz4
new file mode 100644 (file)
index 0000000..149ee81
Binary files /dev/null and b/Data/Maps/jendraz4 differ

diff --git a/Data/Maps/jendraz40 b/Data/Maps/jendraz40
new file mode 100644 (file)
index 0000000..87561a1
Binary files /dev/null and b/Data/Maps/jendraz40 differ

diff --git a/Data/Maps/jendraz41 b/Data/Maps/jendraz41
new file mode 100644 (file)
index 0000000..6fc5630
Binary files /dev/null and b/Data/Maps/jendraz41 differ

diff --git a/Data/Maps/jendraz5 b/Data/Maps/jendraz5
new file mode 100644 (file)
index 0000000..09be574
Binary files /dev/null and b/Data/Maps/jendraz5 differ

diff --git a/Data/Maps/jendraz6 b/Data/Maps/jendraz6
new file mode 100644 (file)
index 0000000..5f21832
Binary files /dev/null and b/Data/Maps/jendraz6 differ

diff --git a/Data/Maps/jendraz7 b/Data/Maps/jendraz7
new file mode 100644 (file)
index 0000000..f3bdb59
Binary files /dev/null and b/Data/Maps/jendraz7 differ

diff --git a/Data/Maps/jendraz8 b/Data/Maps/jendraz8
new file mode 100644 (file)
index 0000000..896158a
Binary files /dev/null and b/Data/Maps/jendraz8 differ

diff --git a/Data/Maps/jendraz9 b/Data/Maps/jendraz9
new file mode 100644 (file)
index 0000000..8f9915c
Binary files /dev/null and b/Data/Maps/jendraz9 differ

diff --git a/Data/Textures/Desertcl.png b/Data/Textures/Desertcl.png
new file mode 100644 (file)
index 0000000..b3b6b8e
Binary files /dev/null and b/Data/Textures/Desertcl.png differ

diff --git a/Data/Textures/GiBottom.png b/Data/Textures/GiBottom.png
new file mode 100644 (file)
index 0000000..57b9822
Binary files /dev/null and b/Data/Textures/GiBottom.png differ

diff --git a/Data/Textures/GiTeared.png b/Data/Textures/GiTeared.png
new file mode 100644 (file)
index 0000000..00aa33e
Binary files /dev/null and b/Data/Textures/GiTeared.png differ

diff --git a/Data/Textures/GiTop.png b/Data/Textures/GiTop.png
new file mode 100644 (file)
index 0000000..1a40f0f
Binary files /dev/null and b/Data/Textures/GiTop.png differ

diff --git a/Data/Textures/mask.png b/Data/Textures/mask.png
new file mode 100644 (file)
index 0000000..143bd62
Binary files /dev/null and b/Data/Textures/mask.png differ

diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp
index 6031cf5f21a8387db64c7a7079562adefa1f807d..e8a999857b7a1982040876052fe660e2d81dc16d 100644 (file)
--- a/Source/GameDraw.cpp
+++ b/Source/GameDraw.cpp
@@ -2396,7 +2396,7 @@ void Game::DrawMenu()
                        endy[5]=starty[5]+20;
                        
                        sprintf (menustring[6], "Campaign : %s", accountactive->getCurrentCampaign().c_str());
-                       startx[6]=100;
+                       startx[6]=200;
                        endx[6]=startx[6]+strlen(menustring[6])*10;
                        starty[6]=420;
                        endy[6]=starty[6]+20;

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index a0f164ad2bde461e6907cd4131e7d5aed820de6e..d6e663366797c48e4a9a0e460a222fd6ea9de39e 100644 (file)
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -829,9 +829,9 @@ void Game::InitGame()
        LoadTexture(":Data:Textures:Newgame.png",&Mainmenuitems[1],0,0);
        LoadTexture(":Data:Textures:Options.png",&Mainmenuitems[2],0,0);
        LoadTexture(":Data:Textures:Quit.png",&Mainmenuitems[3],0,0);
-       LoadTexture(":Data:Textures:World.png",&Mainmenuitems[7],0,0);
        LoadTexture(":Data:Textures:Eyelid.png",&Mainmenuitems[4],0,1);
        //LoadTexture(":Data:Textures:Eye.jpg",&Mainmenuitems[5],0,1);
+       LoadTexture(":Data:Textures:World.png",&Mainmenuitems[7],0,0);
        texdetail=temptexdetail;
 
        FadeLoadingScreen(95);

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index df85211eacfffc298c29c599170ed9201a5a6ff0..58baac80451814c9bc9fd1f2340febe891a10f97 100644 (file)
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -5740,6 +5740,14 @@ void Game::MenuTick(){
                                                        accountactive->setCurrentCampaign(*c);
                                                }
                                                LoadCampaign();
+                                               if(Mainmenuitems[7])
+                                                       glDeleteTextures(1,&Mainmenuitems[7]);
+                                               ifstream test(ConvertFileName((":Data:Textures:"+accountactive->getCurrentCampaign()+":World.png").c_str()));
+                                               if(test.good()) {
+                                                       LoadTexture((":Data:Textures:"+accountactive->getCurrentCampaign()+":World.png").c_str(),&Mainmenuitems[7],0,0);
+                                               } else {
+                                                       LoadTexture(":Data:Textures:World.png",&Mainmenuitems[7],0,0);
+                                               }
                                                break;
                                }
                                break;