update textures, animations & add new keyboard keys for debug

dev
Milang 3 years ago
parent ef10b6c6e6
commit 4fb0254dba
  1. 4
      SuperCbr.dlw
  2. BIN
      SuperCbr.g1a
  3. BIN
      assets-fx/img/bloc.png
  4. BIN
      assets-fx/img/mariobig.png
  5. BIN
      assets-fx/img/mariosmall.png
  6. 2
      src/keyboard.c
  7. 17
      src/mario.c

@ -2,7 +2,7 @@
[_1]
Type=5
Order=0
Order=1
Top=15
Left=2235
Height=4740
@ -13,7 +13,7 @@ OptionA=0
[_2]
Type=1
Order=1
Order=0
Top=15
Left=7800
Height=4740

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

@ -141,6 +141,8 @@ void mkb_update()
if(e.key==KEY_DOWN)
k=MK_DOWN;
if(e.key==KEY_XOT)
k=MK_RUN;
if(e.key==KEY_OPTN)
k=MK_RUN;

@ -52,20 +52,19 @@ void mario_draw()
{
if ( (mario_immunity==0 || (mario_immunity/7)%2==0) && (mario_star_mode/2)%2==0)
{
const int mx=mario.p.x-camera_x(mario.p.x);
const int my=mario.p.y-camera_y(mario.p.y);
if (mario.size==M_SMALL)
{
if (mario.p.vx*sgn(mario.p.vx)>=3) draw_tile(mario.p.x-camera_x(mario.p.x), mario.p.y-camera_y(mario.p.y), &mario_small, 2*last_vx_sign+(id_frame/4)%2, 0);
else if (mario.p.vx*sgn(mario.p.vx)>=1) draw_tile(mario.p.x-camera_x(mario.p.x), mario.p.y-camera_y(mario.p.y), &mario_small, 2*last_vx_sign+(id_frame/8)%2, 0);
else draw_tile(mario.p.x-camera_x(mario.p.x), mario.p.y-camera_y(mario.p.y), &mario_small, 2*last_vx_sign, 0);
if (abs(mario.p.vx)>=3) draw_tile(mx, my, &mario_small, 2*last_vx_sign+(id_frame/4)%2, 0);
else if (abs(mario.p.vx)>=1) draw_tile(mx, my, &mario_small, 2*last_vx_sign+(id_frame/8)%2, 0);
else draw_tile(mx, my, &mario_small, 2*last_vx_sign, 0);
}
else
{
if (mario.p.vx*sgn(mario.p.vx)>=3)
draw_tile(mario.p.x-camera_x(mario.p.x), mario.p.y-camera_y(mario.p.y), &mario_big, 4*last_vx_sign+(id_frame/4)%2, mario_has_bullets);
else if (mario.p.vx*sgn(mario.p.vx)>=1)
draw_tile(mario.p.x-camera_x(mario.p.x), mario.p.y-camera_y(mario.p.y), &mario_big, 4*last_vx_sign+(id_frame/8)%2, mario_has_bullets);
else
draw_tile(mario.p.x-camera_x(mario.p.x), mario.p.y-camera_y(mario.p.y), &mario_big, 3*last_vx_sign, mario_has_bullets);
if (abs(mario.p.vx)>=3) draw_tile(mx, my, &mario_big, 1+3*last_vx_sign+(id_frame/4)%2, mario_has_bullets);
else if (abs(mario.p.vx)>=1) draw_tile(mx, my, &mario_big, 1+3*last_vx_sign+(id_frame/8)%2, mario_has_bullets);
else draw_tile(mx, my, &mario_big, 3*last_vx_sign, mario_has_bullets);
}
}
}

Loading…
Cancel
Save