]> git.jsancho.org Git - lugaru.git/commitdiff
I had added the wrong maps, not it works better
authorCôme BERNIGAUD <come.bernigaud@gmail.com>
Thu, 12 May 2011 07:35:57 +0000 (09:35 +0200)
committerCôme BERNIGAUD <come.bernigaud@gmail.com>
Thu, 12 May 2011 07:35:57 +0000 (09:35 +0200)
74 files changed:
Data/Maps/jendraz1 [deleted file]
Data/Maps/jendraz10 [deleted file]
Data/Maps/jendraz11 [deleted file]
Data/Maps/jendraz12 [deleted file]
Data/Maps/jendraz13 [deleted file]
Data/Maps/jendraz14 [deleted file]
Data/Maps/jendraz15 [deleted file]
Data/Maps/jendraz16 [deleted file]
Data/Maps/jendraz17 [deleted file]
Data/Maps/jendraz18 [deleted file]
Data/Maps/jendraz19 [deleted file]
Data/Maps/jendraz2 [deleted file]
Data/Maps/jendraz20 [deleted file]
Data/Maps/jendraz21 [deleted file]
Data/Maps/jendraz22 [deleted file]
Data/Maps/jendraz23 [deleted file]
Data/Maps/jendraz24 [deleted file]
Data/Maps/jendraz25 [deleted file]
Data/Maps/jendraz26 [deleted file]
Data/Maps/jendraz27 [deleted file]
Data/Maps/jendraz28 [deleted file]
Data/Maps/jendraz29 [deleted file]
Data/Maps/jendraz3 [deleted file]
Data/Maps/jendraz30 [deleted file]
Data/Maps/jendraz31 [deleted file]
Data/Maps/jendraz32 [deleted file]
Data/Maps/jendraz33 [deleted file]
Data/Maps/jendraz34 [deleted file]
Data/Maps/jendraz35 [deleted file]
Data/Maps/jendraz36 [deleted file]
Data/Maps/jendraz37 [deleted file]
Data/Maps/jendraz38 [deleted file]
Data/Maps/jendraz39 [deleted file]
Data/Maps/jendraz4 [deleted file]
Data/Maps/jendraz40 [deleted file]
Data/Maps/jendraz41 [deleted file]
Data/Maps/jendraz5 [deleted file]
Data/Maps/jendraz6 [deleted file]
Data/Maps/jendraz7 [deleted file]
Data/Maps/jendraz8 [deleted file]
Data/Maps/jendraz9 [deleted file]
Data/Maps/svenalpha [new file with mode: 0644]
Data/Maps/svencanyon [new file with mode: 0644]
Data/Maps/svenchasm [new file with mode: 0644]
Data/Maps/svenclimb [new file with mode: 0644]
Data/Maps/svencouncil [new file with mode: 0644]
Data/Maps/svendawn [new file with mode: 0644]
Data/Maps/svendecoy [new file with mode: 0644]
Data/Maps/svendefend [new file with mode: 0644]
Data/Maps/svendoor [new file with mode: 0644]
Data/Maps/svenearl [new file with mode: 0644]
Data/Maps/svenfireice [new file with mode: 0644]
Data/Maps/svenforest [new file with mode: 0644]
Data/Maps/svenfort [new file with mode: 0644]
Data/Maps/svengrotto [new file with mode: 0644]
Data/Maps/svenheaven [new file with mode: 0644]
Data/Maps/svenmeeting [new file with mode: 0644]
Data/Maps/svenninja [new file with mode: 0644]
Data/Maps/svenninjabefore [new file with mode: 0644]
Data/Maps/svenredbw [new file with mode: 0644]
Data/Maps/svenredbw2 [new file with mode: 0644]
Data/Maps/svenredbw3 [new file with mode: 0644]
Data/Maps/svenredbw4 [new file with mode: 0644]
Data/Maps/svenredbw5 [new file with mode: 0644]
Data/Maps/svenredbwafter [new file with mode: 0644]
Data/Maps/svenroad [new file with mode: 0644]
Data/Maps/svenruins [new file with mode: 0644]
Data/Maps/svenshan [new file with mode: 0644]
Data/Maps/svenskip [new file with mode: 0644]
Data/Maps/svensthwrong [new file with mode: 0644]
Data/Maps/sventemple [new file with mode: 0644]
Data/Maps/sventemple2 [new file with mode: 0644]
Data/Maps/sventhrone [new file with mode: 0644]
Source/GameTick.cpp

diff --git a/Data/Maps/jendraz1 b/Data/Maps/jendraz1
deleted file mode 100644 (file)
index f19e4a9..0000000
Binary files a/Data/Maps/jendraz1 and /dev/null differ
diff --git a/Data/Maps/jendraz10 b/Data/Maps/jendraz10
deleted file mode 100644 (file)
index 2053d18..0000000
Binary files a/Data/Maps/jendraz10 and /dev/null differ
diff --git a/Data/Maps/jendraz11 b/Data/Maps/jendraz11
deleted file mode 100644 (file)
index 41a2439..0000000
Binary files a/Data/Maps/jendraz11 and /dev/null differ
diff --git a/Data/Maps/jendraz12 b/Data/Maps/jendraz12
deleted file mode 100644 (file)
index 1b432b1..0000000
Binary files a/Data/Maps/jendraz12 and /dev/null differ
diff --git a/Data/Maps/jendraz13 b/Data/Maps/jendraz13
deleted file mode 100644 (file)
index 32a99dc..0000000
Binary files a/Data/Maps/jendraz13 and /dev/null differ
diff --git a/Data/Maps/jendraz14 b/Data/Maps/jendraz14
deleted file mode 100644 (file)
index 446a5e8..0000000
Binary files a/Data/Maps/jendraz14 and /dev/null differ
diff --git a/Data/Maps/jendraz15 b/Data/Maps/jendraz15
deleted file mode 100644 (file)
index 2d633b9..0000000
Binary files a/Data/Maps/jendraz15 and /dev/null differ
diff --git a/Data/Maps/jendraz16 b/Data/Maps/jendraz16
deleted file mode 100644 (file)
index 28561e8..0000000
Binary files a/Data/Maps/jendraz16 and /dev/null differ
diff --git a/Data/Maps/jendraz17 b/Data/Maps/jendraz17
deleted file mode 100644 (file)
index ab838f4..0000000
Binary files a/Data/Maps/jendraz17 and /dev/null differ
diff --git a/Data/Maps/jendraz18 b/Data/Maps/jendraz18
deleted file mode 100644 (file)
index a9c9d0a..0000000
Binary files a/Data/Maps/jendraz18 and /dev/null differ
diff --git a/Data/Maps/jendraz19 b/Data/Maps/jendraz19
deleted file mode 100644 (file)
index 24d9ac6..0000000
Binary files a/Data/Maps/jendraz19 and /dev/null differ
diff --git a/Data/Maps/jendraz2 b/Data/Maps/jendraz2
deleted file mode 100644 (file)
index 73a8544..0000000
Binary files a/Data/Maps/jendraz2 and /dev/null differ
diff --git a/Data/Maps/jendraz20 b/Data/Maps/jendraz20
deleted file mode 100644 (file)
index c26b6b5..0000000
Binary files a/Data/Maps/jendraz20 and /dev/null differ
diff --git a/Data/Maps/jendraz21 b/Data/Maps/jendraz21
deleted file mode 100644 (file)
index 2e7f8a1..0000000
Binary files a/Data/Maps/jendraz21 and /dev/null differ
diff --git a/Data/Maps/jendraz22 b/Data/Maps/jendraz22
deleted file mode 100644 (file)
index c764663..0000000
Binary files a/Data/Maps/jendraz22 and /dev/null differ
diff --git a/Data/Maps/jendraz23 b/Data/Maps/jendraz23
deleted file mode 100644 (file)
index e0e2f2a..0000000
Binary files a/Data/Maps/jendraz23 and /dev/null differ
diff --git a/Data/Maps/jendraz24 b/Data/Maps/jendraz24
deleted file mode 100644 (file)
index 5773316..0000000
Binary files a/Data/Maps/jendraz24 and /dev/null differ
diff --git a/Data/Maps/jendraz25 b/Data/Maps/jendraz25
deleted file mode 100644 (file)
index 05a9062..0000000
Binary files a/Data/Maps/jendraz25 and /dev/null differ
diff --git a/Data/Maps/jendraz26 b/Data/Maps/jendraz26
deleted file mode 100644 (file)
index 9dc6170..0000000
Binary files a/Data/Maps/jendraz26 and /dev/null differ
diff --git a/Data/Maps/jendraz27 b/Data/Maps/jendraz27
deleted file mode 100644 (file)
index e53484d..0000000
Binary files a/Data/Maps/jendraz27 and /dev/null differ
diff --git a/Data/Maps/jendraz28 b/Data/Maps/jendraz28
deleted file mode 100644 (file)
index 30b57d3..0000000
Binary files a/Data/Maps/jendraz28 and /dev/null differ
diff --git a/Data/Maps/jendraz29 b/Data/Maps/jendraz29
deleted file mode 100644 (file)
index a9b066c..0000000
Binary files a/Data/Maps/jendraz29 and /dev/null differ
diff --git a/Data/Maps/jendraz3 b/Data/Maps/jendraz3
deleted file mode 100644 (file)
index e8c9a24..0000000
Binary files a/Data/Maps/jendraz3 and /dev/null differ
diff --git a/Data/Maps/jendraz30 b/Data/Maps/jendraz30
deleted file mode 100644 (file)
index 000f221..0000000
Binary files a/Data/Maps/jendraz30 and /dev/null differ
diff --git a/Data/Maps/jendraz31 b/Data/Maps/jendraz31
deleted file mode 100644 (file)
index 0e9b789..0000000
Binary files a/Data/Maps/jendraz31 and /dev/null differ
diff --git a/Data/Maps/jendraz32 b/Data/Maps/jendraz32
deleted file mode 100644 (file)
index 4da04cc..0000000
Binary files a/Data/Maps/jendraz32 and /dev/null differ
diff --git a/Data/Maps/jendraz33 b/Data/Maps/jendraz33
deleted file mode 100644 (file)
index 2210158..0000000
Binary files a/Data/Maps/jendraz33 and /dev/null differ
diff --git a/Data/Maps/jendraz34 b/Data/Maps/jendraz34
deleted file mode 100644 (file)
index 436d7c3..0000000
Binary files a/Data/Maps/jendraz34 and /dev/null differ
diff --git a/Data/Maps/jendraz35 b/Data/Maps/jendraz35
deleted file mode 100644 (file)
index e494e05..0000000
Binary files a/Data/Maps/jendraz35 and /dev/null differ
diff --git a/Data/Maps/jendraz36 b/Data/Maps/jendraz36
deleted file mode 100644 (file)
index 6159ff9..0000000
Binary files a/Data/Maps/jendraz36 and /dev/null differ
diff --git a/Data/Maps/jendraz37 b/Data/Maps/jendraz37
deleted file mode 100644 (file)
index 1ff348b..0000000
Binary files a/Data/Maps/jendraz37 and /dev/null differ
diff --git a/Data/Maps/jendraz38 b/Data/Maps/jendraz38
deleted file mode 100644 (file)
index adc1cf1..0000000
Binary files a/Data/Maps/jendraz38 and /dev/null differ
diff --git a/Data/Maps/jendraz39 b/Data/Maps/jendraz39
deleted file mode 100644 (file)
index 7ec779a..0000000
Binary files a/Data/Maps/jendraz39 and /dev/null differ
diff --git a/Data/Maps/jendraz4 b/Data/Maps/jendraz4
deleted file mode 100644 (file)
index 149ee81..0000000
Binary files a/Data/Maps/jendraz4 and /dev/null differ
diff --git a/Data/Maps/jendraz40 b/Data/Maps/jendraz40
deleted file mode 100644 (file)
index 87561a1..0000000
Binary files a/Data/Maps/jendraz40 and /dev/null differ
diff --git a/Data/Maps/jendraz41 b/Data/Maps/jendraz41
deleted file mode 100644 (file)
index 6fc5630..0000000
Binary files a/Data/Maps/jendraz41 and /dev/null differ
diff --git a/Data/Maps/jendraz5 b/Data/Maps/jendraz5
deleted file mode 100644 (file)
index 09be574..0000000
Binary files a/Data/Maps/jendraz5 and /dev/null differ
diff --git a/Data/Maps/jendraz6 b/Data/Maps/jendraz6
deleted file mode 100644 (file)
index 5f21832..0000000
Binary files a/Data/Maps/jendraz6 and /dev/null differ
diff --git a/Data/Maps/jendraz7 b/Data/Maps/jendraz7
deleted file mode 100644 (file)
index f3bdb59..0000000
Binary files a/Data/Maps/jendraz7 and /dev/null differ
diff --git a/Data/Maps/jendraz8 b/Data/Maps/jendraz8
deleted file mode 100644 (file)
index 896158a..0000000
Binary files a/Data/Maps/jendraz8 and /dev/null differ
diff --git a/Data/Maps/jendraz9 b/Data/Maps/jendraz9
deleted file mode 100644 (file)
index 8f9915c..0000000
Binary files a/Data/Maps/jendraz9 and /dev/null differ
diff --git a/Data/Maps/svenalpha b/Data/Maps/svenalpha
new file mode 100644 (file)
index 0000000..353137e
Binary files /dev/null and b/Data/Maps/svenalpha differ
diff --git a/Data/Maps/svencanyon b/Data/Maps/svencanyon
new file mode 100644 (file)
index 0000000..4baff8d
Binary files /dev/null and b/Data/Maps/svencanyon differ
diff --git a/Data/Maps/svenchasm b/Data/Maps/svenchasm
new file mode 100644 (file)
index 0000000..d907ade
Binary files /dev/null and b/Data/Maps/svenchasm differ
diff --git a/Data/Maps/svenclimb b/Data/Maps/svenclimb
new file mode 100644 (file)
index 0000000..36a4a8e
Binary files /dev/null and b/Data/Maps/svenclimb differ
diff --git a/Data/Maps/svencouncil b/Data/Maps/svencouncil
new file mode 100644 (file)
index 0000000..140f86d
Binary files /dev/null and b/Data/Maps/svencouncil differ
diff --git a/Data/Maps/svendawn b/Data/Maps/svendawn
new file mode 100644 (file)
index 0000000..547dab4
Binary files /dev/null and b/Data/Maps/svendawn differ
diff --git a/Data/Maps/svendecoy b/Data/Maps/svendecoy
new file mode 100644 (file)
index 0000000..1adb98c
Binary files /dev/null and b/Data/Maps/svendecoy differ
diff --git a/Data/Maps/svendefend b/Data/Maps/svendefend
new file mode 100644 (file)
index 0000000..8624f0f
Binary files /dev/null and b/Data/Maps/svendefend differ
diff --git a/Data/Maps/svendoor b/Data/Maps/svendoor
new file mode 100644 (file)
index 0000000..550ed83
Binary files /dev/null and b/Data/Maps/svendoor differ
diff --git a/Data/Maps/svenearl b/Data/Maps/svenearl
new file mode 100644 (file)
index 0000000..745a227
Binary files /dev/null and b/Data/Maps/svenearl differ
diff --git a/Data/Maps/svenfireice b/Data/Maps/svenfireice
new file mode 100644 (file)
index 0000000..c71de20
Binary files /dev/null and b/Data/Maps/svenfireice differ
diff --git a/Data/Maps/svenforest b/Data/Maps/svenforest
new file mode 100644 (file)
index 0000000..6e56b28
Binary files /dev/null and b/Data/Maps/svenforest differ
diff --git a/Data/Maps/svenfort b/Data/Maps/svenfort
new file mode 100644 (file)
index 0000000..1fcc63e
Binary files /dev/null and b/Data/Maps/svenfort differ
diff --git a/Data/Maps/svengrotto b/Data/Maps/svengrotto
new file mode 100644 (file)
index 0000000..03ce0e7
Binary files /dev/null and b/Data/Maps/svengrotto differ
diff --git a/Data/Maps/svenheaven b/Data/Maps/svenheaven
new file mode 100644 (file)
index 0000000..6b99a2e
Binary files /dev/null and b/Data/Maps/svenheaven differ
diff --git a/Data/Maps/svenmeeting b/Data/Maps/svenmeeting
new file mode 100644 (file)
index 0000000..4ffd0a4
Binary files /dev/null and b/Data/Maps/svenmeeting differ
diff --git a/Data/Maps/svenninja b/Data/Maps/svenninja
new file mode 100644 (file)
index 0000000..abe3ba1
Binary files /dev/null and b/Data/Maps/svenninja differ
diff --git a/Data/Maps/svenninjabefore b/Data/Maps/svenninjabefore
new file mode 100644 (file)
index 0000000..c489cf0
Binary files /dev/null and b/Data/Maps/svenninjabefore differ
diff --git a/Data/Maps/svenredbw b/Data/Maps/svenredbw
new file mode 100644 (file)
index 0000000..67f433d
Binary files /dev/null and b/Data/Maps/svenredbw differ
diff --git a/Data/Maps/svenredbw2 b/Data/Maps/svenredbw2
new file mode 100644 (file)
index 0000000..1d72656
Binary files /dev/null and b/Data/Maps/svenredbw2 differ
diff --git a/Data/Maps/svenredbw3 b/Data/Maps/svenredbw3
new file mode 100644 (file)
index 0000000..a81c0c3
Binary files /dev/null and b/Data/Maps/svenredbw3 differ
diff --git a/Data/Maps/svenredbw4 b/Data/Maps/svenredbw4
new file mode 100644 (file)
index 0000000..99d1ff0
Binary files /dev/null and b/Data/Maps/svenredbw4 differ
diff --git a/Data/Maps/svenredbw5 b/Data/Maps/svenredbw5
new file mode 100644 (file)
index 0000000..26efac5
Binary files /dev/null and b/Data/Maps/svenredbw5 differ
diff --git a/Data/Maps/svenredbwafter b/Data/Maps/svenredbwafter
new file mode 100644 (file)
index 0000000..4cfb605
Binary files /dev/null and b/Data/Maps/svenredbwafter differ
diff --git a/Data/Maps/svenroad b/Data/Maps/svenroad
new file mode 100644 (file)
index 0000000..b031db7
Binary files /dev/null and b/Data/Maps/svenroad differ
diff --git a/Data/Maps/svenruins b/Data/Maps/svenruins
new file mode 100644 (file)
index 0000000..b44f631
Binary files /dev/null and b/Data/Maps/svenruins differ
diff --git a/Data/Maps/svenshan b/Data/Maps/svenshan
new file mode 100644 (file)
index 0000000..a938686
Binary files /dev/null and b/Data/Maps/svenshan differ
diff --git a/Data/Maps/svenskip b/Data/Maps/svenskip
new file mode 100644 (file)
index 0000000..c6597bb
Binary files /dev/null and b/Data/Maps/svenskip differ
diff --git a/Data/Maps/svensthwrong b/Data/Maps/svensthwrong
new file mode 100644 (file)
index 0000000..4f2ae4c
Binary files /dev/null and b/Data/Maps/svensthwrong differ
diff --git a/Data/Maps/sventemple b/Data/Maps/sventemple
new file mode 100644 (file)
index 0000000..9191d2e
Binary files /dev/null and b/Data/Maps/sventemple differ
diff --git a/Data/Maps/sventemple2 b/Data/Maps/sventemple2
new file mode 100644 (file)
index 0000000..3542fed
Binary files /dev/null and b/Data/Maps/sventemple2 differ
diff --git a/Data/Maps/sventhrone b/Data/Maps/sventhrone
new file mode 100644 (file)
index 0000000..8181eaa
Binary files /dev/null and b/Data/Maps/sventhrone differ
index 58baac80451814c9bc9fd1f2340febe891a10f97..36452aa4f5e09f5c6de70fdc6ef92e8ee51199d1 100644 (file)
@@ -1408,13 +1408,14 @@ void Game::Loadlevel(int which){
            Loadlevel("tutorial");
        }else if(which >= 0 && which <= 15){
            char buf[32];
-           snprintf(buf, 32, "map%d", which + 1);
+           snprintf(buf, 32, "map%d", which + 1); // challenges
            Loadlevel(buf);
        }else
            Loadlevel("mapsave");
 }
 
 void Game::Loadlevel(const char *name){
+       cout << "loading level " << name << "…" << endl;
        int templength;
        float lamefloat;
        static const char *pfx = ":Data:Maps:";