diff --git a/JTMM.g3a b/JTMM.g3a index 30688e1..ddf132e 100644 Binary files a/JTMM.g3a and b/JTMM.g3a differ diff --git a/src/draw.c b/src/draw.c index e83207d..2966a64 100644 --- a/src/draw.c +++ b/src/draw.c @@ -20,9 +20,9 @@ extern image_t img_red_dot; //off red bloc texture, 16x16 extern image_t img_exit; //exit texture, 16x16 extern image_t img_water; //water texture, 16x16 extern image_t img_semi_solid; //semi solid texture, 16x16 +//animated textures (elevator) extern image_t img_teleporter_0; //teleporter 0 texture, 16x16 extern image_t img_teleporter_1; //teleporter 1 texture, 16x16 -//animated textures (elevator) extern image_t img_elevator; void draw_player(int x, int y) @@ -34,6 +34,8 @@ void draw_level(char level[], unsigned int step, char polarity, int *start_x, int *start_y, int tp_positions[]) { int const img_elevator_frame_count = img_elevator.width / 16; + int const img_teleporter_0_frame_count = img_teleporter_0.width / 16; + int const img_teleporter_1_frame_count = img_teleporter_1.width / 16; dclear(BG_COLOR); unsigned int i = 0; unsigned int x = 0; @@ -85,12 +87,14 @@ int *start_y, int tp_positions[]) dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_water); break; case 't': //teleporter 0 - dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_teleporter_0); + dsubimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_teleporter_0, + (step % img_teleporter_0_frame_count) * 16, 0, 16, 16, DIMAGE_NONE); tp_positions[0] = x + 2; tp_positions[1] = y + 2; break; case 'T': //teleporter 1 - dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_teleporter_1); + dsubimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_teleporter_1, + (step % img_teleporter_1_frame_count) * 16, 0, 16, 16, DIMAGE_NONE); tp_positions[2] = x + 2; tp_positions[3] = y + 2; break; diff --git a/texturepacks/default/elevator.png b/texturepacks/default/elevator.png index 449d458..ada442e 100644 Binary files a/texturepacks/default/elevator.png and b/texturepacks/default/elevator.png differ diff --git a/texturepacks/default/elevator1.png b/texturepacks/default/elevator1.png deleted file mode 100644 index 9b5f74f..0000000 Binary files a/texturepacks/default/elevator1.png and /dev/null differ diff --git a/texturepacks/default/elevator10.png b/texturepacks/default/elevator10.png deleted file mode 100644 index 9e41871..0000000 Binary files a/texturepacks/default/elevator10.png and /dev/null differ diff --git a/texturepacks/default/elevator11.png b/texturepacks/default/elevator11.png deleted file mode 100644 index 730dbc6..0000000 Binary files a/texturepacks/default/elevator11.png and /dev/null differ diff --git a/texturepacks/default/elevator12.png b/texturepacks/default/elevator12.png deleted file mode 100644 index efbd7be..0000000 Binary files a/texturepacks/default/elevator12.png and /dev/null differ diff --git a/texturepacks/default/elevator13.png b/texturepacks/default/elevator13.png deleted file mode 100644 index 3f13933..0000000 Binary files a/texturepacks/default/elevator13.png and /dev/null differ diff --git a/texturepacks/default/elevator14.png b/texturepacks/default/elevator14.png deleted file mode 100644 index a0b1411..0000000 Binary files a/texturepacks/default/elevator14.png and /dev/null differ diff --git a/texturepacks/default/elevator15.png b/texturepacks/default/elevator15.png deleted file mode 100644 index 3a77e45..0000000 Binary files a/texturepacks/default/elevator15.png and /dev/null differ diff --git a/texturepacks/default/elevator16.png b/texturepacks/default/elevator16.png deleted file mode 100644 index b2b4d06..0000000 Binary files a/texturepacks/default/elevator16.png and /dev/null differ diff --git a/texturepacks/default/elevator2.png b/texturepacks/default/elevator2.png deleted file mode 100644 index 57a6603..0000000 Binary files a/texturepacks/default/elevator2.png and /dev/null differ diff --git a/texturepacks/default/elevator3.png b/texturepacks/default/elevator3.png deleted file mode 100644 index ef67512..0000000 Binary files a/texturepacks/default/elevator3.png and /dev/null differ diff --git a/texturepacks/default/elevator4.png b/texturepacks/default/elevator4.png deleted file mode 100644 index f2178f1..0000000 Binary files a/texturepacks/default/elevator4.png and /dev/null differ diff --git a/texturepacks/default/elevator5.png b/texturepacks/default/elevator5.png deleted file mode 100644 index 49ec82b..0000000 Binary files a/texturepacks/default/elevator5.png and /dev/null differ diff --git a/texturepacks/default/elevator6.png b/texturepacks/default/elevator6.png deleted file mode 100644 index 8a75c06..0000000 Binary files a/texturepacks/default/elevator6.png and /dev/null differ diff --git a/texturepacks/default/elevator7.png b/texturepacks/default/elevator7.png deleted file mode 100644 index 6417a80..0000000 Binary files a/texturepacks/default/elevator7.png and /dev/null differ diff --git a/texturepacks/default/elevator8.png b/texturepacks/default/elevator8.png deleted file mode 100644 index 8a75d8a..0000000 Binary files a/texturepacks/default/elevator8.png and /dev/null differ diff --git a/texturepacks/default/elevator9.png b/texturepacks/default/elevator9.png deleted file mode 100644 index 847d00e..0000000 Binary files a/texturepacks/default/elevator9.png and /dev/null differ diff --git a/texturepacks/programmer-art/elevator.png b/texturepacks/programmer-art/elevator.png index 2df08a3..6081695 100644 Binary files a/texturepacks/programmer-art/elevator.png and b/texturepacks/programmer-art/elevator.png differ diff --git a/texturepacks/programmer-art/elevator1.png b/texturepacks/programmer-art/elevator1.png deleted file mode 100644 index 6810489..0000000 Binary files a/texturepacks/programmer-art/elevator1.png and /dev/null differ diff --git a/texturepacks/programmer-art/elevator10.png b/texturepacks/programmer-art/elevator10.png deleted file mode 100644 index 418f953..0000000 Binary files a/texturepacks/programmer-art/elevator10.png and /dev/null differ diff --git a/texturepacks/programmer-art/elevator11.png b/texturepacks/programmer-art/elevator11.png deleted file mode 100644 index d38971d..0000000 Binary files a/texturepacks/programmer-art/elevator11.png and /dev/null differ diff --git a/texturepacks/programmer-art/elevator12.png b/texturepacks/programmer-art/elevator12.png deleted file mode 100644 index aad06e5..0000000 Binary files a/texturepacks/programmer-art/elevator12.png and /dev/null differ diff --git a/texturepacks/programmer-art/elevator13.png b/texturepacks/programmer-art/elevator13.png deleted file mode 100644 index cfd1c5e..0000000 Binary files a/texturepacks/programmer-art/elevator13.png and /dev/null differ diff --git a/texturepacks/programmer-art/elevator14.png b/texturepacks/programmer-art/elevator14.png deleted file mode 100644 index 68820ba..0000000 Binary files a/texturepacks/programmer-art/elevator14.png and /dev/null differ diff --git a/texturepacks/programmer-art/elevator15.png b/texturepacks/programmer-art/elevator15.png deleted file mode 100644 index fae3c26..0000000 Binary files a/texturepacks/programmer-art/elevator15.png and /dev/null differ diff --git a/texturepacks/programmer-art/elevator16.png b/texturepacks/programmer-art/elevator16.png deleted file mode 100644 index 5b65ca4..0000000 Binary files a/texturepacks/programmer-art/elevator16.png and /dev/null differ diff --git a/texturepacks/programmer-art/elevator2.png b/texturepacks/programmer-art/elevator2.png deleted file mode 100644 index 0e8ce78..0000000 Binary files a/texturepacks/programmer-art/elevator2.png and /dev/null differ diff --git a/texturepacks/programmer-art/elevator3.png b/texturepacks/programmer-art/elevator3.png deleted file mode 100644 index 120a212..0000000 Binary files a/texturepacks/programmer-art/elevator3.png and /dev/null differ diff --git a/texturepacks/programmer-art/elevator4.png b/texturepacks/programmer-art/elevator4.png deleted file mode 100644 index f909bc8..0000000 Binary files a/texturepacks/programmer-art/elevator4.png and /dev/null differ diff --git a/texturepacks/programmer-art/elevator5.png b/texturepacks/programmer-art/elevator5.png deleted file mode 100644 index 5dd1d8a..0000000 Binary files a/texturepacks/programmer-art/elevator5.png and /dev/null differ diff --git a/texturepacks/programmer-art/elevator6.png b/texturepacks/programmer-art/elevator6.png deleted file mode 100644 index e46c9af..0000000 Binary files a/texturepacks/programmer-art/elevator6.png and /dev/null differ diff --git a/texturepacks/programmer-art/elevator7.png b/texturepacks/programmer-art/elevator7.png deleted file mode 100644 index 38035ec..0000000 Binary files a/texturepacks/programmer-art/elevator7.png and /dev/null differ diff --git a/texturepacks/programmer-art/elevator8.png b/texturepacks/programmer-art/elevator8.png deleted file mode 100644 index 227736b..0000000 Binary files a/texturepacks/programmer-art/elevator8.png and /dev/null differ diff --git a/texturepacks/programmer-art/elevator9.png b/texturepacks/programmer-art/elevator9.png deleted file mode 100644 index 811936f..0000000 Binary files a/texturepacks/programmer-art/elevator9.png and /dev/null differ