diff --git a/JTMM.g3a b/JTMM.g3a index efb3ab7..5acf307 100644 Binary files a/JTMM.g3a and b/JTMM.g3a differ diff --git a/src/draw.c b/src/draw.c index 2ae9bcb..9483cc5 100644 --- a/src/draw.c +++ b/src/draw.c @@ -7,7 +7,7 @@ #define DRAW_OFFSET_Y -24 #define DRAW_OFFSET_X -27 -extern image_t img_player; //player texture, 16x12 +extern image_t img_player; //player texture, 12x12 extern image_t img_solid_0; //solid texture, 16x16 extern image_t img_solid_1; //solid texture, 16x16 extern image_t img_spike; //spike texture, 16x16 @@ -19,6 +19,7 @@ extern image_t img_red; //red bloc texture, 16x16 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 extern image_t img_elevator1, img_elevator2, img_elevator3, img_elevator4; extern image_t img_elevator5, img_elevator6, img_elevator7, img_elevator8; @@ -49,9 +50,9 @@ int *start_y) case '0': dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_solid_0); break; - case '1': - dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_solid_1); - break; + case '1': + dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_solid_1); + break; case 'r': if (!polarity) dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_red); else dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_red_dot); @@ -70,8 +71,8 @@ int *start_y) dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_solid_0); dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_ice); break; - case 's': - dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_solid_0); + case '/': + dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_semi_solid); break; case '^': dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, ani_elevator[(step/2)%16]); diff --git a/up-editor/tiles.lua b/up-editor/tiles.lua index a6f13f7..90ad7a3 100644 --- a/up-editor/tiles.lua +++ b/up-editor/tiles.lua @@ -13,6 +13,6 @@ tiles = { love.graphics.newImage(img_path.."spawn.png"), love.graphics.newImage(img_path.."exit.png"), } -tiles_char = { '0', '1', 'r', 'b', 'v', '^', 'w', '*', 's', 'S', 'E' } +tiles_char = { '0', '1', 'r', 'b', 'v', '^', 'w', '*', '/', 'S', 'E' } selected_tile = 1