diff --git a/cart/rpg/game.bin b/cart/rpg/game.bin index d0dad08..58dff81 100755 --- a/cart/rpg/game.bin +++ b/cart/rpg/game.bin Binary files differ diff --git a/cart/rpg/game.bin b/cart/rpg/game.bin index d0dad08..58dff81 100755 --- a/cart/rpg/game.bin +++ b/cart/rpg/game.bin Binary files differ diff --git a/cart/rpg/game.dll b/cart/rpg/game.dll index 9e10788..afa05a6 100644 --- a/cart/rpg/game.dll +++ b/cart/rpg/game.dll Binary files differ diff --git a/cart/rpg/game.bin b/cart/rpg/game.bin index d0dad08..58dff81 100755 --- a/cart/rpg/game.bin +++ b/cart/rpg/game.bin Binary files differ diff --git a/cart/rpg/game.dll b/cart/rpg/game.dll index 9e10788..afa05a6 100644 --- a/cart/rpg/game.dll +++ b/cart/rpg/game.dll Binary files differ diff --git a/cart/rpg/game.pdb b/cart/rpg/game.pdb index cc4d80c..e726440 100755 --- a/cart/rpg/game.pdb +++ b/cart/rpg/game.pdb Binary files differ diff --git a/cart/rpg/game.bin b/cart/rpg/game.bin index d0dad08..58dff81 100755 --- a/cart/rpg/game.bin +++ b/cart/rpg/game.bin Binary files differ diff --git a/cart/rpg/game.dll b/cart/rpg/game.dll index 9e10788..afa05a6 100644 --- a/cart/rpg/game.dll +++ b/cart/rpg/game.dll Binary files differ diff --git a/cart/rpg/game.pdb b/cart/rpg/game.pdb index cc4d80c..e726440 100755 --- a/cart/rpg/game.pdb +++ b/cart/rpg/game.pdb Binary files differ diff --git a/cart/rpg/level14.bin b/cart/rpg/level14.bin index deccb0d..e43bb0c 100755 --- a/cart/rpg/level14.bin +++ b/cart/rpg/level14.bin Binary files differ diff --git a/cart/rpg/game.bin b/cart/rpg/game.bin index d0dad08..58dff81 100755 --- a/cart/rpg/game.bin +++ b/cart/rpg/game.bin Binary files differ diff --git a/cart/rpg/game.dll b/cart/rpg/game.dll index 9e10788..afa05a6 100644 --- a/cart/rpg/game.dll +++ b/cart/rpg/game.dll Binary files differ diff --git a/cart/rpg/game.pdb b/cart/rpg/game.pdb index cc4d80c..e726440 100755 --- a/cart/rpg/game.pdb +++ b/cart/rpg/game.pdb Binary files differ diff --git a/cart/rpg/level14.bin b/cart/rpg/level14.bin index deccb0d..e43bb0c 100755 --- a/cart/rpg/level14.bin +++ b/cart/rpg/level14.bin Binary files differ diff --git a/cart/rpg/level14.dll b/cart/rpg/level14.dll index fd7fcb4..d787dd6 100755 --- a/cart/rpg/level14.dll +++ b/cart/rpg/level14.dll Binary files differ diff --git a/cart/rpg/game.bin b/cart/rpg/game.bin index d0dad08..58dff81 100755 --- a/cart/rpg/game.bin +++ b/cart/rpg/game.bin Binary files differ diff --git a/cart/rpg/game.dll b/cart/rpg/game.dll index 9e10788..afa05a6 100644 --- a/cart/rpg/game.dll +++ b/cart/rpg/game.dll Binary files differ diff --git a/cart/rpg/game.pdb b/cart/rpg/game.pdb index cc4d80c..e726440 100755 --- a/cart/rpg/game.pdb +++ b/cart/rpg/game.pdb Binary files differ diff --git a/cart/rpg/level14.bin b/cart/rpg/level14.bin index deccb0d..e43bb0c 100755 --- a/cart/rpg/level14.bin +++ b/cart/rpg/level14.bin Binary files differ diff --git a/cart/rpg/level14.dll b/cart/rpg/level14.dll index fd7fcb4..d787dd6 100755 --- a/cart/rpg/level14.dll +++ b/cart/rpg/level14.dll Binary files differ diff --git a/cart/rpg/level14.pdb b/cart/rpg/level14.pdb index 3fdd209..7c293cf 100755 --- a/cart/rpg/level14.pdb +++ b/cart/rpg/level14.pdb Binary files differ diff --git a/cart/rpg/game.bin b/cart/rpg/game.bin index d0dad08..58dff81 100755 --- a/cart/rpg/game.bin +++ b/cart/rpg/game.bin Binary files differ diff --git a/cart/rpg/game.dll b/cart/rpg/game.dll index 9e10788..afa05a6 100644 --- a/cart/rpg/game.dll +++ b/cart/rpg/game.dll Binary files differ diff --git a/cart/rpg/game.pdb b/cart/rpg/game.pdb index cc4d80c..e726440 100755 --- a/cart/rpg/game.pdb +++ b/cart/rpg/game.pdb Binary files differ diff --git a/cart/rpg/level14.bin b/cart/rpg/level14.bin index deccb0d..e43bb0c 100755 --- a/cart/rpg/level14.bin +++ b/cart/rpg/level14.bin Binary files differ diff --git a/cart/rpg/level14.dll b/cart/rpg/level14.dll index fd7fcb4..d787dd6 100755 --- a/cart/rpg/level14.dll +++ b/cart/rpg/level14.dll Binary files differ diff --git a/cart/rpg/level14.pdb b/cart/rpg/level14.pdb index 3fdd209..7c293cf 100755 --- a/cart/rpg/level14.pdb +++ b/cart/rpg/level14.pdb Binary files differ diff --git a/cart/rpg/level14_2.bin b/cart/rpg/level14_2.bin new file mode 100755 index 0000000..9b3babd --- /dev/null +++ b/cart/rpg/level14_2.bin Binary files differ diff --git a/cart/rpg/game.bin b/cart/rpg/game.bin index d0dad08..58dff81 100755 --- a/cart/rpg/game.bin +++ b/cart/rpg/game.bin Binary files differ diff --git a/cart/rpg/game.dll b/cart/rpg/game.dll index 9e10788..afa05a6 100644 --- a/cart/rpg/game.dll +++ b/cart/rpg/game.dll Binary files differ diff --git a/cart/rpg/game.pdb b/cart/rpg/game.pdb index cc4d80c..e726440 100755 --- a/cart/rpg/game.pdb +++ b/cart/rpg/game.pdb Binary files differ diff --git a/cart/rpg/level14.bin b/cart/rpg/level14.bin index deccb0d..e43bb0c 100755 --- a/cart/rpg/level14.bin +++ b/cart/rpg/level14.bin Binary files differ diff --git a/cart/rpg/level14.dll b/cart/rpg/level14.dll index fd7fcb4..d787dd6 100755 --- a/cart/rpg/level14.dll +++ b/cart/rpg/level14.dll Binary files differ diff --git a/cart/rpg/level14.pdb b/cart/rpg/level14.pdb index 3fdd209..7c293cf 100755 --- a/cart/rpg/level14.pdb +++ b/cart/rpg/level14.pdb Binary files differ diff --git a/cart/rpg/level14_2.bin b/cart/rpg/level14_2.bin new file mode 100755 index 0000000..9b3babd --- /dev/null +++ b/cart/rpg/level14_2.bin Binary files differ diff --git a/cart/rpg/level14_2.dll b/cart/rpg/level14_2.dll new file mode 100755 index 0000000..262da4e --- /dev/null +++ b/cart/rpg/level14_2.dll Binary files differ diff --git a/cart/rpg/game.bin b/cart/rpg/game.bin index d0dad08..58dff81 100755 --- a/cart/rpg/game.bin +++ b/cart/rpg/game.bin Binary files differ diff --git a/cart/rpg/game.dll b/cart/rpg/game.dll index 9e10788..afa05a6 100644 --- a/cart/rpg/game.dll +++ b/cart/rpg/game.dll Binary files differ diff --git a/cart/rpg/game.pdb b/cart/rpg/game.pdb index cc4d80c..e726440 100755 --- a/cart/rpg/game.pdb +++ b/cart/rpg/game.pdb Binary files differ diff --git a/cart/rpg/level14.bin b/cart/rpg/level14.bin index deccb0d..e43bb0c 100755 --- a/cart/rpg/level14.bin +++ b/cart/rpg/level14.bin Binary files differ diff --git a/cart/rpg/level14.dll b/cart/rpg/level14.dll index fd7fcb4..d787dd6 100755 --- a/cart/rpg/level14.dll +++ b/cart/rpg/level14.dll Binary files differ diff --git a/cart/rpg/level14.pdb b/cart/rpg/level14.pdb index 3fdd209..7c293cf 100755 --- a/cart/rpg/level14.pdb +++ b/cart/rpg/level14.pdb Binary files differ diff --git a/cart/rpg/level14_2.bin b/cart/rpg/level14_2.bin new file mode 100755 index 0000000..9b3babd --- /dev/null +++ b/cart/rpg/level14_2.bin Binary files differ diff --git a/cart/rpg/level14_2.dll b/cart/rpg/level14_2.dll new file mode 100755 index 0000000..262da4e --- /dev/null +++ b/cart/rpg/level14_2.dll Binary files differ diff --git a/cart/rpg/level14_2.pdb b/cart/rpg/level14_2.pdb new file mode 100755 index 0000000..35340b8 --- /dev/null +++ b/cart/rpg/level14_2.pdb Binary files differ diff --git a/cart/rpg/game.bin b/cart/rpg/game.bin index d0dad08..58dff81 100755 --- a/cart/rpg/game.bin +++ b/cart/rpg/game.bin Binary files differ diff --git a/cart/rpg/game.dll b/cart/rpg/game.dll index 9e10788..afa05a6 100644 --- a/cart/rpg/game.dll +++ b/cart/rpg/game.dll Binary files differ diff --git a/cart/rpg/game.pdb b/cart/rpg/game.pdb index cc4d80c..e726440 100755 --- a/cart/rpg/game.pdb +++ b/cart/rpg/game.pdb Binary files differ diff --git a/cart/rpg/level14.bin b/cart/rpg/level14.bin index deccb0d..e43bb0c 100755 --- a/cart/rpg/level14.bin +++ b/cart/rpg/level14.bin Binary files differ diff --git a/cart/rpg/level14.dll b/cart/rpg/level14.dll index fd7fcb4..d787dd6 100755 --- a/cart/rpg/level14.dll +++ b/cart/rpg/level14.dll Binary files differ diff --git a/cart/rpg/level14.pdb b/cart/rpg/level14.pdb index 3fdd209..7c293cf 100755 --- a/cart/rpg/level14.pdb +++ b/cart/rpg/level14.pdb Binary files differ diff --git a/cart/rpg/level14_2.bin b/cart/rpg/level14_2.bin new file mode 100755 index 0000000..9b3babd --- /dev/null +++ b/cart/rpg/level14_2.bin Binary files differ diff --git a/cart/rpg/level14_2.dll b/cart/rpg/level14_2.dll new file mode 100755 index 0000000..262da4e --- /dev/null +++ b/cart/rpg/level14_2.dll Binary files differ diff --git a/cart/rpg/level14_2.pdb b/cart/rpg/level14_2.pdb new file mode 100755 index 0000000..35340b8 --- /dev/null +++ b/cart/rpg/level14_2.pdb Binary files differ diff --git a/cart/rpg/level14_2.txt b/cart/rpg/level14_2.txt new file mode 100644 index 0000000..8feb67e --- /dev/null +++ b/cart/rpg/level14_2.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door + +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, c5.1, c5.1 , c5.1 , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, c5.1, r1 , r2 , r3f , c5.1, c5.1, c6 +c4, w1 , -d1:d1 , w1 , c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, c5.1, c5.1 , 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, w1 , d1:d2, w1 , 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/rpg/game.bin b/cart/rpg/game.bin index d0dad08..58dff81 100755 --- a/cart/rpg/game.bin +++ b/cart/rpg/game.bin Binary files differ diff --git a/cart/rpg/game.dll b/cart/rpg/game.dll index 9e10788..afa05a6 100644 --- a/cart/rpg/game.dll +++ b/cart/rpg/game.dll Binary files differ diff --git a/cart/rpg/game.pdb b/cart/rpg/game.pdb index cc4d80c..e726440 100755 --- a/cart/rpg/game.pdb +++ b/cart/rpg/game.pdb Binary files differ diff --git a/cart/rpg/level14.bin b/cart/rpg/level14.bin index deccb0d..e43bb0c 100755 --- a/cart/rpg/level14.bin +++ b/cart/rpg/level14.bin Binary files differ diff --git a/cart/rpg/level14.dll b/cart/rpg/level14.dll index fd7fcb4..d787dd6 100755 --- a/cart/rpg/level14.dll +++ b/cart/rpg/level14.dll Binary files differ diff --git a/cart/rpg/level14.pdb b/cart/rpg/level14.pdb index 3fdd209..7c293cf 100755 --- a/cart/rpg/level14.pdb +++ b/cart/rpg/level14.pdb Binary files differ diff --git a/cart/rpg/level14_2.bin b/cart/rpg/level14_2.bin new file mode 100755 index 0000000..9b3babd --- /dev/null +++ b/cart/rpg/level14_2.bin Binary files differ diff --git a/cart/rpg/level14_2.dll b/cart/rpg/level14_2.dll new file mode 100755 index 0000000..262da4e --- /dev/null +++ b/cart/rpg/level14_2.dll Binary files differ diff --git a/cart/rpg/level14_2.pdb b/cart/rpg/level14_2.pdb new file mode 100755 index 0000000..35340b8 --- /dev/null +++ b/cart/rpg/level14_2.pdb Binary files differ diff --git a/cart/rpg/level14_2.txt b/cart/rpg/level14_2.txt new file mode 100644 index 0000000..8feb67e --- /dev/null +++ b/cart/rpg/level14_2.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door + +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, c5.1, c5.1 , c5.1 , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, c5.1, r1 , r2 , r3f , c5.1, c5.1, c6 +c4, w1 , -d1:d1 , w1 , c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, c5.1, c5.1 , 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, w1 , d1:d2, w1 , 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/rpg/Makefile b/rpg/Makefile index 5a8fda9..8a521ba 100644 --- a/rpg/Makefile +++ b/rpg/Makefile @@ -3,8 +3,9 @@ SOURCES := rpg.c parse.c -MODULES := level14 +MODULES := level14 level14_2 SOURCES_level14 := level14.c +SOURCES_level14_2 := level14_2.c include $(MAKE_ROOT)/Makefile diff --git a/cart/rpg/game.bin b/cart/rpg/game.bin index d0dad08..58dff81 100755 --- a/cart/rpg/game.bin +++ b/cart/rpg/game.bin Binary files differ diff --git a/cart/rpg/game.dll b/cart/rpg/game.dll index 9e10788..afa05a6 100644 --- a/cart/rpg/game.dll +++ b/cart/rpg/game.dll Binary files differ diff --git a/cart/rpg/game.pdb b/cart/rpg/game.pdb index cc4d80c..e726440 100755 --- a/cart/rpg/game.pdb +++ b/cart/rpg/game.pdb Binary files differ diff --git a/cart/rpg/level14.bin b/cart/rpg/level14.bin index deccb0d..e43bb0c 100755 --- a/cart/rpg/level14.bin +++ b/cart/rpg/level14.bin Binary files differ diff --git a/cart/rpg/level14.dll b/cart/rpg/level14.dll index fd7fcb4..d787dd6 100755 --- a/cart/rpg/level14.dll +++ b/cart/rpg/level14.dll Binary files differ diff --git a/cart/rpg/level14.pdb b/cart/rpg/level14.pdb index 3fdd209..7c293cf 100755 --- a/cart/rpg/level14.pdb +++ b/cart/rpg/level14.pdb Binary files differ diff --git a/cart/rpg/level14_2.bin b/cart/rpg/level14_2.bin new file mode 100755 index 0000000..9b3babd --- /dev/null +++ b/cart/rpg/level14_2.bin Binary files differ diff --git a/cart/rpg/level14_2.dll b/cart/rpg/level14_2.dll new file mode 100755 index 0000000..262da4e --- /dev/null +++ b/cart/rpg/level14_2.dll Binary files differ diff --git a/cart/rpg/level14_2.pdb b/cart/rpg/level14_2.pdb new file mode 100755 index 0000000..35340b8 --- /dev/null +++ b/cart/rpg/level14_2.pdb Binary files differ diff --git a/cart/rpg/level14_2.txt b/cart/rpg/level14_2.txt new file mode 100644 index 0000000..8feb67e --- /dev/null +++ b/cart/rpg/level14_2.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door + +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, c5.1, c5.1 , c5.1 , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, c5.1, r1 , r2 , r3f , c5.1, c5.1, c6 +c4, w1 , -d1:d1 , w1 , c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, c5.1, c5.1 , 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, w1 , d1:d2, w1 , 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/rpg/Makefile b/rpg/Makefile index 5a8fda9..8a521ba 100644 --- a/rpg/Makefile +++ b/rpg/Makefile @@ -3,8 +3,9 @@ SOURCES := rpg.c parse.c -MODULES := level14 +MODULES := level14 level14_2 SOURCES_level14 := level14.c +SOURCES_level14_2 := level14_2.c include $(MAKE_ROOT)/Makefile diff --git a/rpg/level14.c b/rpg/level14.c index 59cc068..70454e0 100644 --- a/rpg/level14.c +++ b/rpg/level14.c @@ -5,38 +5,12 @@ #include #include "rpg_imports.h" -bool in_door = false; - __EXPORT__ void level_entered_tile(ent_t* ent, int gx, int gy, grid_t g) { - if (g.tag) + if (is_player(ent)) { - if (is_player(ent)) - { - grid_t* find = NULL; - if (strcmp(g.tag, "d1") == 0) - { - if (!in_door && (find = get_tile_by_tag("d2")) != NULL) - { - int target_gx, target_gy; - grid_pos(find, &target_gx, &target_gy); - ent->x = target_gx * GRID; - ent->y = target_gy * GRID; - in_door = true; - } - } - if (strcmp(g.tag, "d2") == 0) - { - if (!in_door && (find = get_tile_by_tag("d1")) != NULL) - { - int target_gx, target_gy; - grid_pos((grid_t*)find, &target_gx, &target_gy); - ent->x = target_gx * GRID; - ent->y = target_gy * GRID; - in_door = true; - } - } - } + door(g, "d1", "level14_2", "d1"); + door(g, "d2", "level14_2", "d2"); } } __EXPORT__ void level_exited_tile(ent_t* ent, int gx, int gy, grid_t g) @@ -45,7 +19,6 @@ __EXPORT__ void level_update(float ms) { - in_door = false; } __EXPORT__ int setup(int arg) @@ -53,4 +26,5 @@ LOAD_DYN(is_player) LOAD_DYN(get_tile_by_tag) LOAD_DYN(grid_pos) + LOAD_DYN(door) } diff --git a/cart/rpg/game.bin b/cart/rpg/game.bin index d0dad08..58dff81 100755 --- a/cart/rpg/game.bin +++ b/cart/rpg/game.bin Binary files differ diff --git a/cart/rpg/game.dll b/cart/rpg/game.dll index 9e10788..afa05a6 100644 --- a/cart/rpg/game.dll +++ b/cart/rpg/game.dll Binary files differ diff --git a/cart/rpg/game.pdb b/cart/rpg/game.pdb index cc4d80c..e726440 100755 --- a/cart/rpg/game.pdb +++ b/cart/rpg/game.pdb Binary files differ diff --git a/cart/rpg/level14.bin b/cart/rpg/level14.bin index deccb0d..e43bb0c 100755 --- a/cart/rpg/level14.bin +++ b/cart/rpg/level14.bin Binary files differ diff --git a/cart/rpg/level14.dll b/cart/rpg/level14.dll index fd7fcb4..d787dd6 100755 --- a/cart/rpg/level14.dll +++ b/cart/rpg/level14.dll Binary files differ diff --git a/cart/rpg/level14.pdb b/cart/rpg/level14.pdb index 3fdd209..7c293cf 100755 --- a/cart/rpg/level14.pdb +++ b/cart/rpg/level14.pdb Binary files differ diff --git a/cart/rpg/level14_2.bin b/cart/rpg/level14_2.bin new file mode 100755 index 0000000..9b3babd --- /dev/null +++ b/cart/rpg/level14_2.bin Binary files differ diff --git a/cart/rpg/level14_2.dll b/cart/rpg/level14_2.dll new file mode 100755 index 0000000..262da4e --- /dev/null +++ b/cart/rpg/level14_2.dll Binary files differ diff --git a/cart/rpg/level14_2.pdb b/cart/rpg/level14_2.pdb new file mode 100755 index 0000000..35340b8 --- /dev/null +++ b/cart/rpg/level14_2.pdb Binary files differ diff --git a/cart/rpg/level14_2.txt b/cart/rpg/level14_2.txt new file mode 100644 index 0000000..8feb67e --- /dev/null +++ b/cart/rpg/level14_2.txt @@ -0,0 +1,16 @@ +c cobblestone +r roof st +r3f roof3f st +w wall s +d door + +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, c5.1, c5.1 , c5.1 , c5.1, c5.1, c5.1, c6 +c4, r7 , r8 , r9 , c5.1, c5.1, r1 , r2 , r3f , c5.1, c5.1, c6 +c4, w1 , -d1:d1 , w1 , c5.1, c5.1, r4 , r5 , r6 , c5.1, c5.1, c6 +c4, c5.1, c5.1 , 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, w1 , d1:d2, w1 , 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/rpg/Makefile b/rpg/Makefile index 5a8fda9..8a521ba 100644 --- a/rpg/Makefile +++ b/rpg/Makefile @@ -3,8 +3,9 @@ SOURCES := rpg.c parse.c -MODULES := level14 +MODULES := level14 level14_2 SOURCES_level14 := level14.c +SOURCES_level14_2 := level14_2.c include $(MAKE_ROOT)/Makefile diff --git a/rpg/level14.c b/rpg/level14.c index 59cc068..70454e0 100644 --- a/rpg/level14.c +++ b/rpg/level14.c @@ -5,38 +5,12 @@ #include #include "rpg_imports.h" -bool in_door = false; - __EXPORT__ void level_entered_tile(ent_t* ent, int gx, int gy, grid_t g) { - if (g.tag) + if (is_player(ent)) { - if (is_player(ent)) - { - grid_t* find = NULL; - if (strcmp(g.tag, "d1") == 0) - { - if (!in_door && (find = get_tile_by_tag("d2")) != NULL) - { - int target_gx, target_gy; - grid_pos(find, &target_gx, &target_gy); - ent->x = target_gx * GRID; - ent->y = target_gy * GRID; - in_door = true; - } - } - if (strcmp(g.tag, "d2") == 0) - { - if (!in_door && (find = get_tile_by_tag("d1")) != NULL) - { - int target_gx, target_gy; - grid_pos((grid_t*)find, &target_gx, &target_gy); - ent->x = target_gx * GRID; - ent->y = target_gy * GRID; - in_door = true; - } - } - } + door(g, "d1", "level14_2", "d1"); + door(g, "d2", "level14_2", "d2"); } } __EXPORT__ void level_exited_tile(ent_t* ent, int gx, int gy, grid_t g) @@ -45,7 +19,6 @@ __EXPORT__ void level_update(float ms) { - in_door = false; } __EXPORT__ int setup(int arg) @@ -53,4 +26,5 @@ LOAD_DYN(is_player) LOAD_DYN(get_tile_by_tag) LOAD_DYN(grid_pos) + LOAD_DYN(door) } diff --git a/rpg/level14_2.c b/rpg/level14_2.c new file mode 100644 index 0000000..ed86468 --- /dev/null +++ b/rpg/level14_2.c @@ -0,0 +1,30 @@ +#include +#include "constants.h" +#include "ent.h" + +#include +#include "rpg_imports.h" + +__EXPORT__ void level_entered_tile(ent_t* ent, int gx, int gy, grid_t g) +{ + if (is_player(ent)) + { + door(g, "d1", "level14", "d1"); + door(g, "d2", "level14", "d2"); + } +} +__EXPORT__ void level_exited_tile(ent_t* ent, int gx, int gy, grid_t g) +{ +} + +__EXPORT__ void level_update(float ms) +{ +} + +__EXPORT__ int setup(int arg) +{ + LOAD_DYN(is_player) + LOAD_DYN(get_tile_by_tag) + LOAD_DYN(grid_pos) + LOAD_DYN(door) +}