diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/game.dll b/cart/test/game.dll index 4431435..1d6d40a 100644 --- a/cart/test/game.dll +++ b/cart/test/game.dll Binary files differ diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/game.dll b/cart/test/game.dll index 4431435..1d6d40a 100644 --- a/cart/test/game.dll +++ b/cart/test/game.dll Binary files differ diff --git a/cart/test/level.txt b/cart/test/level.txt index 493167c..6aa2ba2 100644 --- a/cart/test/level.txt +++ b/cart/test/level.txt @@ -1,12 +1,13 @@ c cobblestone -r roof +r roof_fix st +w wall s c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, r1 , r3 , c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 +c4, r7 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, r7 , r8 , r9 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, w2 , w2 , w2 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/game.dll b/cart/test/game.dll index 4431435..1d6d40a 100644 --- a/cart/test/game.dll +++ b/cart/test/game.dll Binary files differ diff --git a/cart/test/level.txt b/cart/test/level.txt index 493167c..6aa2ba2 100644 --- a/cart/test/level.txt +++ b/cart/test/level.txt @@ -1,12 +1,13 @@ c cobblestone -r roof +r roof_fix st +w wall s c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, r1 , r3 , c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 +c4, r7 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, r7 , r8 , r9 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, w2 , w2 , w2 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/level14.txt b/cart/test/level14.txt new file mode 100644 index 0000000..b285061 --- /dev/null +++ b/cart/test/level14.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door s + +c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, r1 , r2 , r3f , c5.1, r1 , r2 , r3f , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c5.1, c6 +c4, w1 , -d1 , w1 , c5.1, r7 , r8 , r9 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, w1 , d1 , w1 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/game.dll b/cart/test/game.dll index 4431435..1d6d40a 100644 --- a/cart/test/game.dll +++ b/cart/test/game.dll Binary files differ diff --git a/cart/test/level.txt b/cart/test/level.txt index 493167c..6aa2ba2 100644 --- a/cart/test/level.txt +++ b/cart/test/level.txt @@ -1,12 +1,13 @@ c cobblestone -r roof +r roof_fix st +w wall s c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, r1 , r3 , c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 +c4, r7 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, r7 , r8 , r9 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, w2 , w2 , w2 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/level14.txt b/cart/test/level14.txt new file mode 100644 index 0000000..b285061 --- /dev/null +++ b/cart/test/level14.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door s + +c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, r1 , r2 , r3f , c5.1, r1 , r2 , r3f , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c5.1, c6 +c4, w1 , -d1 , w1 , c5.1, r7 , r8 , r9 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, w1 , d1 , w1 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/roof3f.pbm b/cart/test/roof3f.pbm new file mode 100644 index 0000000..2ecfea4 --- /dev/null +++ b/cart/test/roof3f.pbm Binary files differ diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/game.dll b/cart/test/game.dll index 4431435..1d6d40a 100644 --- a/cart/test/game.dll +++ b/cart/test/game.dll Binary files differ diff --git a/cart/test/level.txt b/cart/test/level.txt index 493167c..6aa2ba2 100644 --- a/cart/test/level.txt +++ b/cart/test/level.txt @@ -1,12 +1,13 @@ c cobblestone -r roof +r roof_fix st +w wall s c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, r1 , r3 , c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 +c4, r7 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, r7 , r8 , r9 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, w2 , w2 , w2 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/level14.txt b/cart/test/level14.txt new file mode 100644 index 0000000..b285061 --- /dev/null +++ b/cart/test/level14.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door s + +c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, r1 , r2 , r3f , c5.1, r1 , r2 , r3f , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c5.1, c6 +c4, w1 , -d1 , w1 , c5.1, r7 , r8 , r9 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, w1 , d1 , w1 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/roof3f.pbm b/cart/test/roof3f.pbm new file mode 100644 index 0000000..2ecfea4 --- /dev/null +++ b/cart/test/roof3f.pbm Binary files differ diff --git a/cart/test/roof_fix1.pbm b/cart/test/roof_fix1.pbm new file mode 100644 index 0000000..3d16e94 --- /dev/null +++ b/cart/test/roof_fix1.pbm Binary files differ diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/game.dll b/cart/test/game.dll index 4431435..1d6d40a 100644 --- a/cart/test/game.dll +++ b/cart/test/game.dll Binary files differ diff --git a/cart/test/level.txt b/cart/test/level.txt index 493167c..6aa2ba2 100644 --- a/cart/test/level.txt +++ b/cart/test/level.txt @@ -1,12 +1,13 @@ c cobblestone -r roof +r roof_fix st +w wall s c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, r1 , r3 , c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 +c4, r7 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, r7 , r8 , r9 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, w2 , w2 , w2 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/level14.txt b/cart/test/level14.txt new file mode 100644 index 0000000..b285061 --- /dev/null +++ b/cart/test/level14.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door s + +c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, r1 , r2 , r3f , c5.1, r1 , r2 , r3f , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c5.1, c6 +c4, w1 , -d1 , w1 , c5.1, r7 , r8 , r9 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, w1 , d1 , w1 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/roof3f.pbm b/cart/test/roof3f.pbm new file mode 100644 index 0000000..2ecfea4 --- /dev/null +++ b/cart/test/roof3f.pbm Binary files differ diff --git a/cart/test/roof_fix1.pbm b/cart/test/roof_fix1.pbm new file mode 100644 index 0000000..3d16e94 --- /dev/null +++ b/cart/test/roof_fix1.pbm Binary files differ diff --git a/cart/test/roof_fix2.pbm b/cart/test/roof_fix2.pbm new file mode 100644 index 0000000..c64df5d --- /dev/null +++ b/cart/test/roof_fix2.pbm Binary files differ diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/game.dll b/cart/test/game.dll index 4431435..1d6d40a 100644 --- a/cart/test/game.dll +++ b/cart/test/game.dll Binary files differ diff --git a/cart/test/level.txt b/cart/test/level.txt index 493167c..6aa2ba2 100644 --- a/cart/test/level.txt +++ b/cart/test/level.txt @@ -1,12 +1,13 @@ c cobblestone -r roof +r roof_fix st +w wall s c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, r1 , r3 , c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 +c4, r7 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, r7 , r8 , r9 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, w2 , w2 , w2 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/level14.txt b/cart/test/level14.txt new file mode 100644 index 0000000..b285061 --- /dev/null +++ b/cart/test/level14.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door s + +c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, r1 , r2 , r3f , c5.1, r1 , r2 , r3f , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c5.1, c6 +c4, w1 , -d1 , w1 , c5.1, r7 , r8 , r9 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, w1 , d1 , w1 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/roof3f.pbm b/cart/test/roof3f.pbm new file mode 100644 index 0000000..2ecfea4 --- /dev/null +++ b/cart/test/roof3f.pbm Binary files differ diff --git a/cart/test/roof_fix1.pbm b/cart/test/roof_fix1.pbm new file mode 100644 index 0000000..3d16e94 --- /dev/null +++ b/cart/test/roof_fix1.pbm Binary files differ diff --git a/cart/test/roof_fix2.pbm b/cart/test/roof_fix2.pbm new file mode 100644 index 0000000..c64df5d --- /dev/null +++ b/cart/test/roof_fix2.pbm Binary files differ diff --git a/cart/test/roof_fix3.pbm b/cart/test/roof_fix3.pbm new file mode 100644 index 0000000..c35dfda --- /dev/null +++ b/cart/test/roof_fix3.pbm Binary files differ diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/game.dll b/cart/test/game.dll index 4431435..1d6d40a 100644 --- a/cart/test/game.dll +++ b/cart/test/game.dll Binary files differ diff --git a/cart/test/level.txt b/cart/test/level.txt index 493167c..6aa2ba2 100644 --- a/cart/test/level.txt +++ b/cart/test/level.txt @@ -1,12 +1,13 @@ c cobblestone -r roof +r roof_fix st +w wall s c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, r1 , r3 , c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 +c4, r7 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, r7 , r8 , r9 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, w2 , w2 , w2 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/level14.txt b/cart/test/level14.txt new file mode 100644 index 0000000..b285061 --- /dev/null +++ b/cart/test/level14.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door s + +c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, r1 , r2 , r3f , c5.1, r1 , r2 , r3f , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c5.1, c6 +c4, w1 , -d1 , w1 , c5.1, r7 , r8 , r9 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, w1 , d1 , w1 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/roof3f.pbm b/cart/test/roof3f.pbm new file mode 100644 index 0000000..2ecfea4 --- /dev/null +++ b/cart/test/roof3f.pbm Binary files differ diff --git a/cart/test/roof_fix1.pbm b/cart/test/roof_fix1.pbm new file mode 100644 index 0000000..3d16e94 --- /dev/null +++ b/cart/test/roof_fix1.pbm Binary files differ diff --git a/cart/test/roof_fix2.pbm b/cart/test/roof_fix2.pbm new file mode 100644 index 0000000..c64df5d --- /dev/null +++ b/cart/test/roof_fix2.pbm Binary files differ diff --git a/cart/test/roof_fix3.pbm b/cart/test/roof_fix3.pbm new file mode 100644 index 0000000..c35dfda --- /dev/null +++ b/cart/test/roof_fix3.pbm Binary files differ diff --git a/cart/test/roof_fix4.pbm b/cart/test/roof_fix4.pbm new file mode 100644 index 0000000..2c392ad --- /dev/null +++ b/cart/test/roof_fix4.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +@@@@@@@@@@@@@@@@ \ No newline at end of file diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/game.dll b/cart/test/game.dll index 4431435..1d6d40a 100644 --- a/cart/test/game.dll +++ b/cart/test/game.dll Binary files differ diff --git a/cart/test/level.txt b/cart/test/level.txt index 493167c..6aa2ba2 100644 --- a/cart/test/level.txt +++ b/cart/test/level.txt @@ -1,12 +1,13 @@ c cobblestone -r roof +r roof_fix st +w wall s c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, r1 , r3 , c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 +c4, r7 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, r7 , r8 , r9 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, w2 , w2 , w2 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/level14.txt b/cart/test/level14.txt new file mode 100644 index 0000000..b285061 --- /dev/null +++ b/cart/test/level14.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door s + +c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, r1 , r2 , r3f , c5.1, r1 , r2 , r3f , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c5.1, c6 +c4, w1 , -d1 , w1 , c5.1, r7 , r8 , r9 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, w1 , d1 , w1 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/roof3f.pbm b/cart/test/roof3f.pbm new file mode 100644 index 0000000..2ecfea4 --- /dev/null +++ b/cart/test/roof3f.pbm Binary files differ diff --git a/cart/test/roof_fix1.pbm b/cart/test/roof_fix1.pbm new file mode 100644 index 0000000..3d16e94 --- /dev/null +++ b/cart/test/roof_fix1.pbm Binary files differ diff --git a/cart/test/roof_fix2.pbm b/cart/test/roof_fix2.pbm new file mode 100644 index 0000000..c64df5d --- /dev/null +++ b/cart/test/roof_fix2.pbm Binary files differ diff --git a/cart/test/roof_fix3.pbm b/cart/test/roof_fix3.pbm new file mode 100644 index 0000000..c35dfda --- /dev/null +++ b/cart/test/roof_fix3.pbm Binary files differ diff --git a/cart/test/roof_fix4.pbm b/cart/test/roof_fix4.pbm new file mode 100644 index 0000000..2c392ad --- /dev/null +++ b/cart/test/roof_fix4.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +@@@@@@@@@@@@@@@@ \ No newline at end of file diff --git a/cart/test/roof_fix5.pbm b/cart/test/roof_fix5.pbm new file mode 100644 index 0000000..39b7f23 --- /dev/null +++ b/cart/test/roof_fix5.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +UU��UU��UU��UU��UU��UU��UU��UU�� \ No newline at end of file diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/game.dll b/cart/test/game.dll index 4431435..1d6d40a 100644 --- a/cart/test/game.dll +++ b/cart/test/game.dll Binary files differ diff --git a/cart/test/level.txt b/cart/test/level.txt index 493167c..6aa2ba2 100644 --- a/cart/test/level.txt +++ b/cart/test/level.txt @@ -1,12 +1,13 @@ c cobblestone -r roof +r roof_fix st +w wall s c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, r1 , r3 , c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 +c4, r7 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, r7 , r8 , r9 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, w2 , w2 , w2 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/level14.txt b/cart/test/level14.txt new file mode 100644 index 0000000..b285061 --- /dev/null +++ b/cart/test/level14.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door s + +c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, r1 , r2 , r3f , c5.1, r1 , r2 , r3f , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c5.1, c6 +c4, w1 , -d1 , w1 , c5.1, r7 , r8 , r9 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, w1 , d1 , w1 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/roof3f.pbm b/cart/test/roof3f.pbm new file mode 100644 index 0000000..2ecfea4 --- /dev/null +++ b/cart/test/roof3f.pbm Binary files differ diff --git a/cart/test/roof_fix1.pbm b/cart/test/roof_fix1.pbm new file mode 100644 index 0000000..3d16e94 --- /dev/null +++ b/cart/test/roof_fix1.pbm Binary files differ diff --git a/cart/test/roof_fix2.pbm b/cart/test/roof_fix2.pbm new file mode 100644 index 0000000..c64df5d --- /dev/null +++ b/cart/test/roof_fix2.pbm Binary files differ diff --git a/cart/test/roof_fix3.pbm b/cart/test/roof_fix3.pbm new file mode 100644 index 0000000..c35dfda --- /dev/null +++ b/cart/test/roof_fix3.pbm Binary files differ diff --git a/cart/test/roof_fix4.pbm b/cart/test/roof_fix4.pbm new file mode 100644 index 0000000..2c392ad --- /dev/null +++ b/cart/test/roof_fix4.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +@@@@@@@@@@@@@@@@ \ No newline at end of file diff --git a/cart/test/roof_fix5.pbm b/cart/test/roof_fix5.pbm new file mode 100644 index 0000000..39b7f23 --- /dev/null +++ b/cart/test/roof_fix5.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +UU��UU��UU��UU��UU��UU��UU��UU�� \ No newline at end of file diff --git a/cart/test/roof_fix6.pbm b/cart/test/roof_fix6.pbm new file mode 100644 index 0000000..8bbe9fc --- /dev/null +++ b/cart/test/roof_fix6.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +J�MVJ�MVJ�MVJ�MVJ�MVJ�MVJ�MVJ�MV \ No newline at end of file diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/game.dll b/cart/test/game.dll index 4431435..1d6d40a 100644 --- a/cart/test/game.dll +++ b/cart/test/game.dll Binary files differ diff --git a/cart/test/level.txt b/cart/test/level.txt index 493167c..6aa2ba2 100644 --- a/cart/test/level.txt +++ b/cart/test/level.txt @@ -1,12 +1,13 @@ c cobblestone -r roof +r roof_fix st +w wall s c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, r1 , r3 , c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 +c4, r7 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, r7 , r8 , r9 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, w2 , w2 , w2 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/level14.txt b/cart/test/level14.txt new file mode 100644 index 0000000..b285061 --- /dev/null +++ b/cart/test/level14.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door s + +c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, r1 , r2 , r3f , c5.1, r1 , r2 , r3f , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c5.1, c6 +c4, w1 , -d1 , w1 , c5.1, r7 , r8 , r9 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, w1 , d1 , w1 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/roof3f.pbm b/cart/test/roof3f.pbm new file mode 100644 index 0000000..2ecfea4 --- /dev/null +++ b/cart/test/roof3f.pbm Binary files differ diff --git a/cart/test/roof_fix1.pbm b/cart/test/roof_fix1.pbm new file mode 100644 index 0000000..3d16e94 --- /dev/null +++ b/cart/test/roof_fix1.pbm Binary files differ diff --git a/cart/test/roof_fix2.pbm b/cart/test/roof_fix2.pbm new file mode 100644 index 0000000..c64df5d --- /dev/null +++ b/cart/test/roof_fix2.pbm Binary files differ diff --git a/cart/test/roof_fix3.pbm b/cart/test/roof_fix3.pbm new file mode 100644 index 0000000..c35dfda --- /dev/null +++ b/cart/test/roof_fix3.pbm Binary files differ diff --git a/cart/test/roof_fix4.pbm b/cart/test/roof_fix4.pbm new file mode 100644 index 0000000..2c392ad --- /dev/null +++ b/cart/test/roof_fix4.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +@@@@@@@@@@@@@@@@ \ No newline at end of file diff --git a/cart/test/roof_fix5.pbm b/cart/test/roof_fix5.pbm new file mode 100644 index 0000000..39b7f23 --- /dev/null +++ b/cart/test/roof_fix5.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +UU��UU��UU��UU��UU��UU��UU��UU�� \ No newline at end of file diff --git a/cart/test/roof_fix6.pbm b/cart/test/roof_fix6.pbm new file mode 100644 index 0000000..8bbe9fc --- /dev/null +++ b/cart/test/roof_fix6.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +J�MVJ�MVJ�MVJ�MVJ�MVJ�MVJ�MVJ�MV \ No newline at end of file diff --git a/cart/test/roof_fix7.pbm b/cart/test/roof_fix7.pbm new file mode 100644 index 0000000..0c29640 --- /dev/null +++ b/cart/test/roof_fix7.pbm Binary files differ diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/game.dll b/cart/test/game.dll index 4431435..1d6d40a 100644 --- a/cart/test/game.dll +++ b/cart/test/game.dll Binary files differ diff --git a/cart/test/level.txt b/cart/test/level.txt index 493167c..6aa2ba2 100644 --- a/cart/test/level.txt +++ b/cart/test/level.txt @@ -1,12 +1,13 @@ c cobblestone -r roof +r roof_fix st +w wall s c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, r1 , r3 , c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 +c4, r7 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, r7 , r8 , r9 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, w2 , w2 , w2 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/level14.txt b/cart/test/level14.txt new file mode 100644 index 0000000..b285061 --- /dev/null +++ b/cart/test/level14.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door s + +c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, r1 , r2 , r3f , c5.1, r1 , r2 , r3f , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c5.1, c6 +c4, w1 , -d1 , w1 , c5.1, r7 , r8 , r9 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, w1 , d1 , w1 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/roof3f.pbm b/cart/test/roof3f.pbm new file mode 100644 index 0000000..2ecfea4 --- /dev/null +++ b/cart/test/roof3f.pbm Binary files differ diff --git a/cart/test/roof_fix1.pbm b/cart/test/roof_fix1.pbm new file mode 100644 index 0000000..3d16e94 --- /dev/null +++ b/cart/test/roof_fix1.pbm Binary files differ diff --git a/cart/test/roof_fix2.pbm b/cart/test/roof_fix2.pbm new file mode 100644 index 0000000..c64df5d --- /dev/null +++ b/cart/test/roof_fix2.pbm Binary files differ diff --git a/cart/test/roof_fix3.pbm b/cart/test/roof_fix3.pbm new file mode 100644 index 0000000..c35dfda --- /dev/null +++ b/cart/test/roof_fix3.pbm Binary files differ diff --git a/cart/test/roof_fix4.pbm b/cart/test/roof_fix4.pbm new file mode 100644 index 0000000..2c392ad --- /dev/null +++ b/cart/test/roof_fix4.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +@@@@@@@@@@@@@@@@ \ No newline at end of file diff --git a/cart/test/roof_fix5.pbm b/cart/test/roof_fix5.pbm new file mode 100644 index 0000000..39b7f23 --- /dev/null +++ b/cart/test/roof_fix5.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +UU��UU��UU��UU��UU��UU��UU��UU�� \ No newline at end of file diff --git a/cart/test/roof_fix6.pbm b/cart/test/roof_fix6.pbm new file mode 100644 index 0000000..8bbe9fc --- /dev/null +++ b/cart/test/roof_fix6.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +J�MVJ�MVJ�MVJ�MVJ�MVJ�MVJ�MVJ�MV \ No newline at end of file diff --git a/cart/test/roof_fix7.pbm b/cart/test/roof_fix7.pbm new file mode 100644 index 0000000..0c29640 --- /dev/null +++ b/cart/test/roof_fix7.pbm Binary files differ diff --git a/cart/test/roof_fix8.pbm b/cart/test/roof_fix8.pbm new file mode 100644 index 0000000..e90cfc3 --- /dev/null +++ b/cart/test/roof_fix8.pbm Binary files differ diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/game.dll b/cart/test/game.dll index 4431435..1d6d40a 100644 --- a/cart/test/game.dll +++ b/cart/test/game.dll Binary files differ diff --git a/cart/test/level.txt b/cart/test/level.txt index 493167c..6aa2ba2 100644 --- a/cart/test/level.txt +++ b/cart/test/level.txt @@ -1,12 +1,13 @@ c cobblestone -r roof +r roof_fix st +w wall s c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, r1 , r3 , c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 +c4, r7 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, r7 , r8 , r9 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, w2 , w2 , w2 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/level14.txt b/cart/test/level14.txt new file mode 100644 index 0000000..b285061 --- /dev/null +++ b/cart/test/level14.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door s + +c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, r1 , r2 , r3f , c5.1, r1 , r2 , r3f , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c5.1, c6 +c4, w1 , -d1 , w1 , c5.1, r7 , r8 , r9 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, w1 , d1 , w1 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/roof3f.pbm b/cart/test/roof3f.pbm new file mode 100644 index 0000000..2ecfea4 --- /dev/null +++ b/cart/test/roof3f.pbm Binary files differ diff --git a/cart/test/roof_fix1.pbm b/cart/test/roof_fix1.pbm new file mode 100644 index 0000000..3d16e94 --- /dev/null +++ b/cart/test/roof_fix1.pbm Binary files differ diff --git a/cart/test/roof_fix2.pbm b/cart/test/roof_fix2.pbm new file mode 100644 index 0000000..c64df5d --- /dev/null +++ b/cart/test/roof_fix2.pbm Binary files differ diff --git a/cart/test/roof_fix3.pbm b/cart/test/roof_fix3.pbm new file mode 100644 index 0000000..c35dfda --- /dev/null +++ b/cart/test/roof_fix3.pbm Binary files differ diff --git a/cart/test/roof_fix4.pbm b/cart/test/roof_fix4.pbm new file mode 100644 index 0000000..2c392ad --- /dev/null +++ b/cart/test/roof_fix4.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +@@@@@@@@@@@@@@@@ \ No newline at end of file diff --git a/cart/test/roof_fix5.pbm b/cart/test/roof_fix5.pbm new file mode 100644 index 0000000..39b7f23 --- /dev/null +++ b/cart/test/roof_fix5.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +UU��UU��UU��UU��UU��UU��UU��UU�� \ No newline at end of file diff --git a/cart/test/roof_fix6.pbm b/cart/test/roof_fix6.pbm new file mode 100644 index 0000000..8bbe9fc --- /dev/null +++ b/cart/test/roof_fix6.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +J�MVJ�MVJ�MVJ�MVJ�MVJ�MVJ�MVJ�MV \ No newline at end of file diff --git a/cart/test/roof_fix7.pbm b/cart/test/roof_fix7.pbm new file mode 100644 index 0000000..0c29640 --- /dev/null +++ b/cart/test/roof_fix7.pbm Binary files differ diff --git a/cart/test/roof_fix8.pbm b/cart/test/roof_fix8.pbm new file mode 100644 index 0000000..e90cfc3 --- /dev/null +++ b/cart/test/roof_fix8.pbm Binary files differ diff --git a/cart/test/roof_fix9.pbm b/cart/test/roof_fix9.pbm new file mode 100644 index 0000000..31dfb3d --- /dev/null +++ b/cart/test/roof_fix9.pbm Binary files differ diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/game.dll b/cart/test/game.dll index 4431435..1d6d40a 100644 --- a/cart/test/game.dll +++ b/cart/test/game.dll Binary files differ diff --git a/cart/test/level.txt b/cart/test/level.txt index 493167c..6aa2ba2 100644 --- a/cart/test/level.txt +++ b/cart/test/level.txt @@ -1,12 +1,13 @@ c cobblestone -r roof +r roof_fix st +w wall s c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, r1 , r3 , c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 +c4, r7 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, r7 , r8 , r9 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, w2 , w2 , w2 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/level14.txt b/cart/test/level14.txt new file mode 100644 index 0000000..b285061 --- /dev/null +++ b/cart/test/level14.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door s + +c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, r1 , r2 , r3f , c5.1, r1 , r2 , r3f , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c5.1, c6 +c4, w1 , -d1 , w1 , c5.1, r7 , r8 , r9 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, w1 , d1 , w1 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/roof3f.pbm b/cart/test/roof3f.pbm new file mode 100644 index 0000000..2ecfea4 --- /dev/null +++ b/cart/test/roof3f.pbm Binary files differ diff --git a/cart/test/roof_fix1.pbm b/cart/test/roof_fix1.pbm new file mode 100644 index 0000000..3d16e94 --- /dev/null +++ b/cart/test/roof_fix1.pbm Binary files differ diff --git a/cart/test/roof_fix2.pbm b/cart/test/roof_fix2.pbm new file mode 100644 index 0000000..c64df5d --- /dev/null +++ b/cart/test/roof_fix2.pbm Binary files differ diff --git a/cart/test/roof_fix3.pbm b/cart/test/roof_fix3.pbm new file mode 100644 index 0000000..c35dfda --- /dev/null +++ b/cart/test/roof_fix3.pbm Binary files differ diff --git a/cart/test/roof_fix4.pbm b/cart/test/roof_fix4.pbm new file mode 100644 index 0000000..2c392ad --- /dev/null +++ b/cart/test/roof_fix4.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +@@@@@@@@@@@@@@@@ \ No newline at end of file diff --git a/cart/test/roof_fix5.pbm b/cart/test/roof_fix5.pbm new file mode 100644 index 0000000..39b7f23 --- /dev/null +++ b/cart/test/roof_fix5.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +UU��UU��UU��UU��UU��UU��UU��UU�� \ No newline at end of file diff --git a/cart/test/roof_fix6.pbm b/cart/test/roof_fix6.pbm new file mode 100644 index 0000000..8bbe9fc --- /dev/null +++ b/cart/test/roof_fix6.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +J�MVJ�MVJ�MVJ�MVJ�MVJ�MVJ�MVJ�MV \ No newline at end of file diff --git a/cart/test/roof_fix7.pbm b/cart/test/roof_fix7.pbm new file mode 100644 index 0000000..0c29640 --- /dev/null +++ b/cart/test/roof_fix7.pbm Binary files differ diff --git a/cart/test/roof_fix8.pbm b/cart/test/roof_fix8.pbm new file mode 100644 index 0000000..e90cfc3 --- /dev/null +++ b/cart/test/roof_fix8.pbm Binary files differ diff --git a/cart/test/roof_fix9.pbm b/cart/test/roof_fix9.pbm new file mode 100644 index 0000000..31dfb3d --- /dev/null +++ b/cart/test/roof_fix9.pbm Binary files differ diff --git a/cart/test/wall1.pbm b/cart/test/wall1.pbm new file mode 100644 index 0000000..31e09be --- /dev/null +++ b/cart/test/wall1.pbm Binary files differ diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/game.dll b/cart/test/game.dll index 4431435..1d6d40a 100644 --- a/cart/test/game.dll +++ b/cart/test/game.dll Binary files differ diff --git a/cart/test/level.txt b/cart/test/level.txt index 493167c..6aa2ba2 100644 --- a/cart/test/level.txt +++ b/cart/test/level.txt @@ -1,12 +1,13 @@ c cobblestone -r roof +r roof_fix st +w wall s c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, r1 , r3 , c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 +c4, r7 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, r7 , r8 , r9 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, w2 , w2 , w2 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/level14.txt b/cart/test/level14.txt new file mode 100644 index 0000000..b285061 --- /dev/null +++ b/cart/test/level14.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door s + +c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, r1 , r2 , r3f , c5.1, r1 , r2 , r3f , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c5.1, c6 +c4, w1 , -d1 , w1 , c5.1, r7 , r8 , r9 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, w1 , d1 , w1 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/roof3f.pbm b/cart/test/roof3f.pbm new file mode 100644 index 0000000..2ecfea4 --- /dev/null +++ b/cart/test/roof3f.pbm Binary files differ diff --git a/cart/test/roof_fix1.pbm b/cart/test/roof_fix1.pbm new file mode 100644 index 0000000..3d16e94 --- /dev/null +++ b/cart/test/roof_fix1.pbm Binary files differ diff --git a/cart/test/roof_fix2.pbm b/cart/test/roof_fix2.pbm new file mode 100644 index 0000000..c64df5d --- /dev/null +++ b/cart/test/roof_fix2.pbm Binary files differ diff --git a/cart/test/roof_fix3.pbm b/cart/test/roof_fix3.pbm new file mode 100644 index 0000000..c35dfda --- /dev/null +++ b/cart/test/roof_fix3.pbm Binary files differ diff --git a/cart/test/roof_fix4.pbm b/cart/test/roof_fix4.pbm new file mode 100644 index 0000000..2c392ad --- /dev/null +++ b/cart/test/roof_fix4.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +@@@@@@@@@@@@@@@@ \ No newline at end of file diff --git a/cart/test/roof_fix5.pbm b/cart/test/roof_fix5.pbm new file mode 100644 index 0000000..39b7f23 --- /dev/null +++ b/cart/test/roof_fix5.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +UU��UU��UU��UU��UU��UU��UU��UU�� \ No newline at end of file diff --git a/cart/test/roof_fix6.pbm b/cart/test/roof_fix6.pbm new file mode 100644 index 0000000..8bbe9fc --- /dev/null +++ b/cart/test/roof_fix6.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +J�MVJ�MVJ�MVJ�MVJ�MVJ�MVJ�MVJ�MV \ No newline at end of file diff --git a/cart/test/roof_fix7.pbm b/cart/test/roof_fix7.pbm new file mode 100644 index 0000000..0c29640 --- /dev/null +++ b/cart/test/roof_fix7.pbm Binary files differ diff --git a/cart/test/roof_fix8.pbm b/cart/test/roof_fix8.pbm new file mode 100644 index 0000000..e90cfc3 --- /dev/null +++ b/cart/test/roof_fix8.pbm Binary files differ diff --git a/cart/test/roof_fix9.pbm b/cart/test/roof_fix9.pbm new file mode 100644 index 0000000..31dfb3d --- /dev/null +++ b/cart/test/roof_fix9.pbm Binary files differ diff --git a/cart/test/wall1.pbm b/cart/test/wall1.pbm new file mode 100644 index 0000000..31e09be --- /dev/null +++ b/cart/test/wall1.pbm Binary files differ diff --git a/cart/test/wall2.pbm b/cart/test/wall2.pbm new file mode 100644 index 0000000..1871c8b --- /dev/null +++ b/cart/test/wall2.pbm Binary files differ diff --git a/cart/test/door1.pbm b/cart/test/door1.pbm new file mode 100644 index 0000000..b290611 --- /dev/null +++ b/cart/test/door1.pbm Binary files differ diff --git a/cart/test/game.dll b/cart/test/game.dll index 4431435..1d6d40a 100644 --- a/cart/test/game.dll +++ b/cart/test/game.dll Binary files differ diff --git a/cart/test/level.txt b/cart/test/level.txt index 493167c..6aa2ba2 100644 --- a/cart/test/level.txt +++ b/cart/test/level.txt @@ -1,12 +1,13 @@ c cobblestone -r roof +r roof_fix st +w wall s c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, r1 , r3 , c5.1, r1 , r2 , r3 , c5.1, c5.1, c6 +c4, r7 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, r7 , r8 , r9 , c5.1, c5.1, c6 -c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, w2 , w2 , w2 , c5.1, c5.1, c6 c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/level14.txt b/cart/test/level14.txt new file mode 100644 index 0000000..b285061 --- /dev/null +++ b/cart/test/level14.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door s + +c1, c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c2 , c3 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, r1 , r2 , r3f , c5.1, r1 , r2 , r3f , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, r4 , r5 , r6 , c5.1, c5.1, c5.1, c6 +c4, w1 , -d1 , w1 , c5.1, r7 , r8 , r9 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, w1 , d1 , w1 , c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c4, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c5.1, c6 +c7, c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c8 , c9 diff --git a/cart/test/roof3f.pbm b/cart/test/roof3f.pbm new file mode 100644 index 0000000..2ecfea4 --- /dev/null +++ b/cart/test/roof3f.pbm Binary files differ diff --git a/cart/test/roof_fix1.pbm b/cart/test/roof_fix1.pbm new file mode 100644 index 0000000..3d16e94 --- /dev/null +++ b/cart/test/roof_fix1.pbm Binary files differ diff --git a/cart/test/roof_fix2.pbm b/cart/test/roof_fix2.pbm new file mode 100644 index 0000000..c64df5d --- /dev/null +++ b/cart/test/roof_fix2.pbm Binary files differ diff --git a/cart/test/roof_fix3.pbm b/cart/test/roof_fix3.pbm new file mode 100644 index 0000000..c35dfda --- /dev/null +++ b/cart/test/roof_fix3.pbm Binary files differ diff --git a/cart/test/roof_fix4.pbm b/cart/test/roof_fix4.pbm new file mode 100644 index 0000000..2c392ad --- /dev/null +++ b/cart/test/roof_fix4.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +@@@@@@@@@@@@@@@@ \ No newline at end of file diff --git a/cart/test/roof_fix5.pbm b/cart/test/roof_fix5.pbm new file mode 100644 index 0000000..39b7f23 --- /dev/null +++ b/cart/test/roof_fix5.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +UU��UU��UU��UU��UU��UU��UU��UU�� \ No newline at end of file diff --git a/cart/test/roof_fix6.pbm b/cart/test/roof_fix6.pbm new file mode 100644 index 0000000..8bbe9fc --- /dev/null +++ b/cart/test/roof_fix6.pbm @@ -0,0 +1,3 @@ +P4 +16 16 +J�MVJ�MVJ�MVJ�MVJ�MVJ�MVJ�MVJ�MV \ No newline at end of file diff --git a/cart/test/roof_fix7.pbm b/cart/test/roof_fix7.pbm new file mode 100644 index 0000000..0c29640 --- /dev/null +++ b/cart/test/roof_fix7.pbm Binary files differ diff --git a/cart/test/roof_fix8.pbm b/cart/test/roof_fix8.pbm new file mode 100644 index 0000000..e90cfc3 --- /dev/null +++ b/cart/test/roof_fix8.pbm Binary files differ diff --git a/cart/test/roof_fix9.pbm b/cart/test/roof_fix9.pbm new file mode 100644 index 0000000..31dfb3d --- /dev/null +++ b/cart/test/roof_fix9.pbm Binary files differ diff --git a/cart/test/wall1.pbm b/cart/test/wall1.pbm new file mode 100644 index 0000000..31e09be --- /dev/null +++ b/cart/test/wall1.pbm Binary files differ diff --git a/cart/test/wall2.pbm b/cart/test/wall2.pbm new file mode 100644 index 0000000..1871c8b --- /dev/null +++ b/cart/test/wall2.pbm Binary files differ diff --git a/test/test.c b/test/test.c index 3c64eb8..e9aa1bb 100644 --- a/test/test.c +++ b/test/test.c @@ -1,31 +1,57 @@ #include #include "parse.h" +#define GRID 14 +#define COLS 12 +#define ROWS 10 +#define PADX 0 +#define PADY 2 +#define SPRITEOFF -1 + pbm_t* player; pbm_t* player_out; +typedef enum +{ + BG_SOLID = 1, + BG_TOP = 2, +} bg_flags; + typedef struct { char* tile; pbm_t* pbm; + uint8_t flags; } bg_t; bg_t bg[100]; int num_bg = 0; -int grid[10][9]; +typedef enum +{ + GRID_FLIPX = 1, + GRID_FLIPY = 2, +} grid_flags; + +typedef struct +{ + uint8_t tile; + grid_flags flags; +} grid_t; + +grid_t grid[COLS][ROWS]; #define OUTLINE 2 -bool load_level(fname); +bool load_level(char* fname); void unload_bg(); int setup(int a) { player = f_bitmap("/player.pbm"); - player_out = d_expand_bitmap(player, OUTLINE, true, true); + player_out = d_expand_bitmap(player, OUTLINE, true, false); - if (!load_level("/level.txt")) + if (!load_level("/level14.txt")) { return 1; } @@ -49,6 +75,8 @@ } } +#define SOLID 1 +#define TOP 2 bool is_space(char c) { return isspace(c); } @@ -69,7 +97,8 @@ reset_parse = true; - char* tile_def[] = { NULL, NULL }; + // name, file, [flags] + char* tile_def[] = { NULL, NULL, NULL }; while (true) { @@ -82,14 +111,33 @@ return false; } + int not_null = 0; + for (; not_null < 3; not_null++) + { + if (!tile_def[not_null]) break; + } + if (res == NL) { - if (tile_def[0] == NULL || tile_def[1] == NULL) + if (not_null < 2) { printf("Invalid tile def on line %d\n", parse_line - 1); return false; } + printf("Parsed tile %d %s %s %s\n", not_null, tile_def[0], tile_def[1], tile_def[2]); + + bg_flags flags = 0; + if (not_null >= 3) + { + size_t flag_len = strlen(tile_def[2]); + for (int i = 0; i < flag_len; i++) + { + if (tile_def[2][i] == 's') flags |= BG_SOLID; + if (tile_def[2][i] == 't') flags |= BG_TOP; + } + } + bool found = false; char f[100]; @@ -99,7 +147,7 @@ { found = true; - bg_t b = { tile_def[0], n }; + bg_t b = { tile_def[0], n, flags }; bg[num_bg++] = b; printf("Tile %s registered as word %s\n", f, tile_def[0]); @@ -116,7 +164,7 @@ sprintf(name, "%s%d", tile_def[0], i); - bg_t b = { malloc(strlen(name) + 1), n }; + bg_t b = { malloc(strlen(name) + 1), n, flags }; strcpy(b.tile, name); bg[num_bg++] = b; @@ -132,19 +180,15 @@ printf("Not found: graphic with name %s\n", tile_def[1]); } - tile_def[0] = tile_def[1] = NULL; + memset(tile_def, 0, sizeof(tile_def)); continue; } if (res == BREAK) break; - if (tile_def[0] == NULL) + if (not_null < 3) { - tile_def[0] = parse_word; - } - else if (tile_def[1] == NULL) - { - tile_def[1] = parse_word; + tile_def[not_null++] = parse_word; } else { @@ -160,7 +204,7 @@ //printf("Parse res: %d\n", res); if (res == DONE || res == BREAK) { - if (y < 9) + if (y < ROWS) { printf("Didn't read full grid, only %d,%d\n", x, y); return false; @@ -169,7 +213,7 @@ } if (res == NL) { - if (x < 10) + if (x < COLS) { printf("Couldn't read full row, only to index %d on line %d\n", x - 1, parse_line); return false; @@ -179,13 +223,28 @@ } if (res == WORD) { - if (x >= 10 || y >= 9) + if (x >= COLS || y >= ROWS) { printf("Grid is too big, reached %d,%d on line %d\n", x, y, parse_line); return false; } - size_t l = strlen(parse_word); char* prob = NULL; + grid_flags flags = 0; + for (int i = 0; i < 2; i++) + { + if (parse_word[0] == '-') + { + flags |= GRID_FLIPX; + parse_word++; + } + else if (parse_word[0] == '!') + { + flags |= GRID_FLIPY; + parse_word++; + } + } + + size_t l = strlen(parse_word); for (int i = 0; i < l; i++) { if (parse_word[i] == '.') @@ -208,7 +267,8 @@ if (random(1, 10) > p) continue; } //printf("Tile %d on %d,%d\n", i, x, y); - grid[x][y] = i + 1; + grid_t g = { i + 1, flags }; + grid[x][y] = g; } } @@ -240,18 +300,59 @@ } } +bool move_debug = false; + +bool r_intersect(int x1, int y1, int w1, int h1, + int x2, int y2, int w2, int h2) +{ + if (x1 >= x2 + w2 || + x1 + w2 <= x2 || + y1 >= y2 + h2 || + y1 + h2 <= y2) return false; + if (move_debug) printf("INTERSECT [%d,%d + %d,%d] [%d,%d + %d,%d]\n", x1, y1, w1, h1, x2, y2, w2, h2); + return true; +} + +bool r_free(int x, int y, int w, int h) +{ + int minX = x / GRID; + int maxX = (x + w - 1) / GRID; + int minY = y / GRID; + int maxY = (y + h - 1) / GRID; + + for (int i = max(0, minX); i <= min(COLS - 1, maxX); i++) + { + for (int j = max(0, minY); j <= min(ROWS - 1, maxY); j++) + { + if (grid[i][j].tile != 0 && (bg[grid[i][j].tile - 1].flags & SOLID)) + { + if (r_intersect(x, y, w, h, + i * GRID + 1, + j * GRID + 1, + GRID - 2, + GRID - 2)) return false; + } + } + } + return true; +} + int loop(int ms) { d_clear(); - for (int i = 0; i < 10; i++) + for (int i = 0; i < COLS; i++) { - for (int j = 0; j < 9; j++) + for (int j = 0; j < ROWS; j++) { - if (grid[i][j] != 0) + if (grid[i][j].tile != 0 && !(bg[grid[i][j].tile - 1].flags & TOP)) { - d_pbm(4 + i * 16, j * 16, bg[grid[i][j] - 1].pbm, 0,0,0,0, BLACK, TRANSPARENT, R_NONE, false, false); + d_pbm( + PADX + i * GRID + SPRITEOFF, + PADY + j * GRID + SPRITEOFF, + bg[grid[i][j].tile - 1].pbm, + 0,0,0,0, BLACK, TRANSPARENT, R_NONE, grid[i][j].flags & GRID_FLIPX, grid[i][j].flags & GRID_FLIPY); } } } @@ -259,9 +360,47 @@ //d_fillRect(0, 0, SCREEN_W, SCREEN_H, BLACK); - d_pbm((uint16_t)roundf(x) - OUTLINE, (uint16_t)roundf(y) - OUTLINE, player_out, 0, 0, 0, 0, WHITE, TRANSPARENT, rot, flipX, flipY); - d_pbm((uint16_t)roundf(x), (uint16_t)roundf(y), player, 0, 0, 0, 0, BLACK, TRANSPARENT, rot, flipX, flipY); + d_pbm( + (uint16_t)roundf(x) - OUTLINE + PADX + SPRITEOFF, + (uint16_t)roundf(y) - OUTLINE + PADY + SPRITEOFF, + player_out, 0, 0, 0, 0, WHITE, TRANSPARENT, rot, flipX, flipY); + d_pbm( + (uint16_t)roundf(x) + PADX + SPRITEOFF, + (uint16_t)roundf(y) + PADY + SPRITEOFF, + player, 0, 0, 0, 0, BLACK, TRANSPARENT, rot, flipX, flipY); + for (int i = 0; i < COLS; i++) + { + for (int j = 0; j < ROWS; j++) + { + if (grid[i][j].tile != 0 && (bg[grid[i][j].tile - 1].flags & TOP)) + { + d_fillRect( + PADX + i * GRID, + PADY + j * GRID, + GRID, GRID, + WHITE + ); + } + } + } + + for (int i = 0; i < COLS; i++) + { + for (int j = 0; j < ROWS; j++) + { + if (grid[i][j].tile != 0 && (bg[grid[i][j].tile - 1].flags & TOP)) + { + d_pbm( + PADX + i * GRID + SPRITEOFF, + PADY + j * GRID + SPRITEOFF, + bg[grid[i][j].tile - 1].pbm, + 0,0,0,0, BLACK, TRANSPARENT, R_NONE, grid[i][j].flags & GRID_FLIPX, grid[i][j].flags & GRID_FLIPY); + } + } + } + + /* if (button_pressed(BUTTON_A)) { rot = (rot + 1) % 4; @@ -275,11 +414,82 @@ } printf("Flip: %d %d\n", flipX, flipY); } + */ + + float ox = x; + float oy = y; + + int ox_i = (int)roundf(ox); + int oy_i = (int)roundf(oy); float t = ms / 1000.0f; if (button_down(DPAD_RIGHT)) x += t * speed; if (button_down(DPAD_LEFT)) x -= t * speed; if (button_down(DPAD_DOWN)) y += t * speed; if (button_down(DPAD_UP)) y -= t * speed; + + if (button_pressed(BUTTON_A)) move_debug = !move_debug; + + if (x != ox || y != oy) + { + int x_i = (int)roundf(x); + int y_i = (int)roundf(y); + + if (x > ox) x_i = (int)roundf(x + 0.5f); + if (x < ox) x_i = (int)roundf(x - 0.5f); + + if (y > oy) y_i = (int)roundf(y + 0.5f); + if (y < oy) y_i = (int)roundf(y - 0.5f); + + bool goX = ox_i != x_i; + bool goY = oy_i != y_i; + + if (move_debug) printf("(%f,%f)->(%f,%f) I: (%d,%d)->(%d,%d) [%d, %d]\n", ox, oy, x, y, ox_i, oy_i, x_i, y_i, goX, goY); + + while (goX || goY) + { + if (goX) + { + int testX = ox_i < x_i ? ox_i + 1 : ox_i - 1; + bool test = r_free(testX + 1, oy_i + 1, GRID - 2, GRID - 2); + if (move_debug) printf("testX: %d => %d\n", testX, test); + if (test) + { + ox_i = testX; + if (ox_i == x_i) goX = false; + if (move_debug) printf("ox_i = %d, goX = %d\n", ox_i, goX); + } + else + { + goX = false; + if (move_debug) printf("goX = false\n"); + } + } + if (goY) + { + int testY = oy_i < y_i ? oy_i + 1 : oy_i - 1; + bool test = r_free(ox_i + 1, testY + 1, GRID - 2, GRID - 2); + if (move_debug) printf("testY: %d => %d\n", testY, test); + if (test) + { + oy_i = testY; + if (oy_i == y_i) goY = false; + if (move_debug) printf("oy_i = %d, goY = %d\n", oy_i, goY); + } + else + { + goY = false; + if (move_debug) printf("goY = false\n"); + } + } + } + + if (ox_i != x_i) x = ox_i; + if (oy_i != y_i) y = oy_i; + if (move_debug) printf("reached (%d,%d) on target of (%d,%d), x,y=(%f,%f)\n", ox_i, oy_i, x_i, y_i, x, y); + + if (move_debug) printf("\n====================\n\n"); + } + return 0; }