- Teleporting to a layer2 destination now works

- New levels

data/levels.dat

@@ -27,10 +27,12 @@
 103,level103.dat,Fishbowls
 22,level22.dat,Platforms in the Sand
 23,level23.dat,Twisty Little Passages
+113,level113.dat,Mine Shaft
 101,level101.dat,Sand Castle
 102,level102.dat,Diving Pool
 18,level8.5.dat,Look out above...
 110,level110.dat,Portrait Gallery #1
+114,level114.dat,NEW LEVEL
 106,level106.dat,Bunkers
 112,level112.dat,Divide and Conquer
 109,level109.dat,THE END SO FAR

data/world1/level113.dat

@@ -0,0 +1,94 @@
+bgfile beach1.png
+bg 0
+hurryup 30
+help
+endhelp
+monsters
+0 19 28
+23 19 4
+6 33 15
+1 33 22
+1 11 22
+49 31 28
+1 3 28
+6 27 13
+1 4 16
+18 28 7
+18 37 7
+12 22 4
+16 37 13
+16 36 13
+16 35 13
+16 35 4
+16 36 4
+16 37 4
+16 2 22
+16 3 22
+16 4 22
+15 22 28
+15 18 28
+15 18 22
+15 22 22
+15 22 16
+15 18 16
+15 18 10
+15 22 10
+15 18 4
+15 22 4
+1 2 7
+17 27 16
+17 31 16
+17 36 16
+17 32 16
+17 8 28
+17 10 28
+17 12 28
+49 13 13
+49 11 4
+16 5 13
+16 3 13
+16 13 4
+16 15 4
+17 30 7
+17 33 7
+17 13 16
+17 15 16
+17 8 7
+17 10 7
+endmonsters
+exitdir 1
+44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,
+44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,0,0,0,0,0,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,
+44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,0,0,0,0,0,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,
+44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,45,45,45,45,45,45,45,45,45,45,45,45,23,23,23,44,44,45,45,45,45,45,44,44,45,45,45,45,45,23,23,23,23,45,45,45,45,45,44,
+44,0,0,0,0,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,45,45,45,45,45,45,45,23,23,23,45,45,45,45,45,44,44,0,0,7,0,0,44,44,45,45,45,45,45,45,45,45,45,45,45,45,45,45,44,
+44,44,44,44,44,44,44,44,0,0,0,44,44,44,44,44,44,44,0,0,7,0,0,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,
+44,44,44,44,44,44,44,44,0,0,0,44,44,44,44,44,44,44,0,0,7,0,0,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,
+44,44,44,44,44,44,44,44,0,0,0,44,44,44,44,44,44,44,45,45,45,45,45,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,
+44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,44,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,44,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,45,45,23,23,23,45,45,45,45,45,45,45,45,45,45,44,44,0,0,7,0,0,44,44,23,23,23,23,23,23,23,23,23,23,23,23,23,23,44,
+44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,44,0,0,7,0,0,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,44,0,0,7,0,0,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,45,45,45,45,45,45,45,45,45,45,45,45,23,23,23,44,44,45,45,45,45,45,44,44,45,45,45,45,45,45,45,45,45,45,45,45,45,45,44,
+44,44,44,44,44,44,44,44,44,44,44,44,44,0,0,0,44,44,0,0,7,0,0,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,
+44,44,44,44,44,44,44,44,44,44,44,44,44,0,0,0,44,44,0,0,7,0,0,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,
+44,44,44,44,44,44,44,44,44,44,44,44,44,0,0,0,44,44,0,0,7,0,0,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,
+45,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,44,44,45,45,45,45,45,44,44,23,23,45,45,45,45,45,45,45,45,45,45,45,45,44,
+44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,0,0,7,0,0,44,44,0,0,44,44,44,44,44,44,44,44,44,44,44,44,44,
+44,44,44,44,44,44,44,44,44,44,44,44,44,44,0,0,0,0,0,0,7,0,0,0,0,0,0,44,44,44,44,44,44,44,44,44,44,44,44,44,
+44,44,44,44,44,44,44,44,44,44,44,44,44,44,0,0,0,0,0,0,7,0,0,0,0,0,0,44,44,44,44,44,44,44,44,44,44,44,44,44,
+44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,44,0,0,7,0,0,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,44,44,45,45,45,45,45,45,45,45,45,45,45,45,45,45,44,
+layer2
+20,5,8
+20,11,8
+20,17,8
+20,23,8

data/world1/level114.dat

@@ -0,0 +1,86 @@
+bgfile beach1.png
+bg 0
+hurryup 30
+help
+endhelp
+monsters
+49 30 18
+49 16 18
+0 6 4
+1 36 1
+1 26 7
+1 3 1
+15 32 22
+15 30 22
+15 28 22
+15 26 22
+15 24 22
+15 22 22
+15 20 22
+15 16 22
+15 14 22
+15 12 22
+15 10 22
+15 6 22
+15 6 26
+17 5 26
+17 32 26
+17 30 26
+17 20 26
+17 13 26
+17 11 26
+17 22 26
+16 35 7
+16 13 7
+16 26 10
+16 8 10
+16 18 4
+16 33 1
+16 6 1
+17 35 18
+17 34 18
+7 34 9
+7 18 12
+1 31 26
+1 26 26
+1 21 26
+1 18 22
+1 13 22
+1 8 22
+15 18 22
+15 8 22
+endmonsters
+exitdir -1
+44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,45,45,45,45,45,47,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,46,45,45,45,45,45,44,
+44,44,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,44,
+44,44,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,44,
+44,44,44,44,45,45,45,45,45,45,45,45,45,45,45,45,45,45,47,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,44,
+44,44,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,44,
+44,44,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,11,11,0,7,0,0,0,0,44,
+44,44,44,44,0,0,0,0,0,0,0,0,0,46,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,47,0,0,0,44,
+44,44,44,44,0,0,0,0,0,0,0,0,0,0,18,0,0,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,0,0,0,0,44,
+44,44,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,44,44,44,0,0,0,0,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,47,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,44,44,44,0,0,0,0,44,19,0,0,0,7,0,0,18,0,0,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,44,44,44,0,0,0,0,44,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,44,44,44,0,0,0,0,44,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,44,44,44,0,0,0,0,44,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,44,44,44,0,0,0,0,44,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,44,44,44,0,0,0,0,44,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,
+44,44,44,44,0,0,0,0,44,0,0,0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,11,11,11,0,0,0,0,55,0,0,54,0,0,44,
+44,44,44,44,0,0,0,0,44,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,20,20,45,45,45,44,
+44,44,44,44,0,0,0,0,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,0,0,44,44,44,44,
+44,44,44,44,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,44,44,44,
+44,44,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,44,44,44,
+44,44,44,44,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,0,0,44,44,44,44,
+44,44,44,44,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,0,0,44,44,44,44,
+44,44,44,44,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,44,44,44,
+44,44,44,44,13,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,44,44,44,
+44,44,44,44,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,17,17,44,44,44,44,
+44,44,44,44,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,44,44,44,44,
+44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,
+layer2
+34,2,8
+13,11,8

rc.c

@@ -1733,6 +1733,15 @@ if (s->id == P_PUFF) printf("PUFF WITH DOOMCOUNT!\n");
 							/* teleport there */
 							s->x = (x * TILEW) + (TILEW/2);
 							s->y = (y * TILEH) + TILEH-2;
+							break;
+						} else { // search map2
+							tt = gettile(curlevel->map2[y*LEVELW+x]);
+							if (tt->id == T_TELEPORTDEST) {
+								/* teleport there */
+								s->x = (x * TILEW) + (TILEW/2);
+								s->y = (y * TILEH) + TILEH-2;
+								break;
+							}
 						}
 					}
 				}