From cb2b1a0a64ab44a17b67c480f277bbac71ae4fdc Mon Sep 17 00:00:00 2001 From: Aleksey Veresov Date: Tue, 2 Mar 2021 01:16:37 +0300 Subject: Preparation for the keys. --- data/map/0 | 3 +-- data/map/3 | 6 +++--- data/txr.bmp | Bin 229514 -> 245898 bytes src/game.c | 12 ++++++------ src/map.c | 10 +++++----- src/player.c | 8 ++++---- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/data/map/0 b/data/map/0 index 906c8f5..92bb90a 100644 --- a/data/map/0 +++ b/data/map/0 @@ -14,10 +14,9 @@ r7. . . . . . . . . . . . . . . . . . r5 r7. . $ . . . . . . . . . . . . . . . r5 r7. . . . . . . . . ^2. . . ^1. . . . r5 r7. . . . ^ . . . . . . . . . . . . . r5 -r7. . . . . . . . . . . . . . . . . . r5 +r7= . . . . . . . . . . . . . . . . . r5 r2r6r6r6r6r6r6r6r6r6r6r6r6r6r6r6r6r6r6r3 +000+000 +000+000 +000+000 +000+000 -+000+000 diff --git a/data/map/3 b/data/map/3 index 9a2fca3..9276a82 100644 --- a/data/map/3 +++ b/data/map/3 @@ -1,6 +1,6 @@ 0 1... -r0r4r4r4r4r4r4r4r4. . r4r4r4r4r4r4r4r4r1 +r0r4r4r4r4r4r4r4rb. . rar4r4r4r4r4r4r4r1 r7. . . . . . . . . . . . . . . . . . r5 r7. . . . . . . . . . . ^3. . . . . . r5 r7. . ^1. . . . . . . . . . . . . . . r5 @@ -14,9 +14,9 @@ r7. . . . . . . . . . . . . . . . . . r5 r7. . $ . . . . . . . . . . . . . . . r5 r7. . . . . . . . . ^2. . . ^1. . . . r5 r7. . . . ^ . . . . . . . . . . . . . r5 -r7. . . . . . . . . . . . . . . . . . r5 +r7= . . . . . . . . . . . . . . . . . r5 r2r6r6r6r6r6r6r6r6r6r6r6r6r6r6r6r6r6r6r3 +000+000 +000+000 +000+000 -+000+000 ++000+000=Mario was right... Coins are mushroom people. diff --git a/data/txr.bmp b/data/txr.bmp index 55c999d..5f74b89 100644 Binary files a/data/txr.bmp and b/data/txr.bmp differ diff --git a/src/game.c b/src/game.c index 9e81e16..8e1afaf 100644 --- a/src/game.c +++ b/src/game.c @@ -50,7 +50,7 @@ static void step(int d) b->xrem = 0; b->yrem = 0; b->rem = 0; - b->txrrow = 7; + b->txrrow = 8; b->txrcol = rand() % 4; b->anim = 4; b->rate = 150 + (rand() % 50 - 25); @@ -165,7 +165,7 @@ static void gotofirstroom() SDL_Rect d = { 14, 14, 32 * 20, 32 * 16 }; SDL_RenderFillRect(ttrdr, &d); { - SDL_Rect src = { 0, 16 * 5, 16, 16 }; + SDL_Rect src = { 0, 16 * 6, 16, 16 }; SDL_Rect dst = { 14 + ttplayer.x - delta + rand() % delta, 14 + ttplayer.y - delta + @@ -313,7 +313,7 @@ static void mausoleum() } tt_player_draw(); if (delta >= 500) { - SDL_Rect src = { 96, 16 * 11, 64, 48 }; + SDL_Rect src = { 96, 16 * 12, 64, 48 }; SDL_Rect dst = { 14 + ttplayer.lenin_pos - 32, 110, 128, 96 }; SDL_RenderCopy(ttrdr, tttxr, &src, &dst); @@ -357,14 +357,14 @@ static void mausoleum() tt_player_draw(); { int lenin_size = delta * (48 - 4 - 6) / 14300; - SDL_Rect src = { 32, 16 * 11 + 4, 32, lenin_size }; + SDL_Rect src = { 32, 16 * 12 + 4, 32, lenin_size }; SDL_Rect dst = { 14 + ttplayer.lenin_pos, 14 + 32 + 96 - 8 - lenin_size * 2, 64, lenin_size * 2 }; SDL_RenderCopy(ttrdr, tttxr, &src, &dst); } { - SDL_Rect src = { 96, 16 * 11, 64, 48 }; + SDL_Rect src = { 96, 16 * 12, 64, 48 }; SDL_Rect dst = { 14 + ttplayer.lenin_pos - 32, 110, 128, 96 }; SDL_RenderCopy(ttrdr, tttxr, &src, &dst); @@ -509,7 +509,7 @@ void changeroom(int out) else if (ttplayer.ywalk == -1) dir = 4; SDL_Rect s = { 16 * (8 * ttplayer.variant + dir + (ttplayer.rem / 100 % 2)), - 16 * 5, + 16 * 6, 16, 16 }; SDL_RenderCopy(ttrdr, tttxr, &s, &d); } diff --git a/src/map.c b/src/map.c index 6c52e24..091a7a9 100644 --- a/src/map.c +++ b/src/map.c @@ -159,7 +159,7 @@ static void loadroom(tt_room *r, FILE *f) b->xvel = 0; b->yvel = 0; b->rem = 0; - b->txrrow = 7; + b->txrrow = 8; b->txrcol = id; b->anim = 4; b->rate = 150 + (rand() % 50 - 25); @@ -177,7 +177,7 @@ static void loadroom(tt_room *r, FILE *f) b->xvel = 0; b->yvel = 0; b->rem = 0; - b->txrrow = 7; + b->txrrow = 8; b->txrcol = id; b->anim = 4; b->rate = 150 + (rand() % 50 - 25); @@ -195,7 +195,7 @@ static void loadroom(tt_room *r, FILE *f) b->xvel = 0; b->yvel = 0; b->rem = 0; - b->txrrow = 9; + b->txrrow = 10; b->txrcol = id; b->anim = 1; b->rate = 100; @@ -214,7 +214,7 @@ static void loadroom(tt_room *r, FILE *f) b->xvel = 0; b->yvel = 0; b->rem = 0; - b->txrrow = 8; + b->txrrow = 9; b->txrcol = id; b->anim = 4; b->rate = 150 + (rand() % 50 - 25); @@ -248,7 +248,7 @@ static void loadroom(tt_room *r, FILE *f) b->xrem = 0; b->yrem = 0; b->rem = 0; - b->txrrow = 6; + b->txrrow = 7; b->txrcol = id; b->anim = 4; b->rate = 100 + (rand() % 50 - 25); diff --git a/src/player.c b/src/player.c index b4846bf..d0ab5b1 100644 --- a/src/player.c +++ b/src/player.c @@ -27,14 +27,14 @@ void tt_player_draw() if (ttplayer.zhiv_lenin) { { SDL_Rect src = { 32 + 32 * (ttplayer.lenin_rem / 200 % 2), - 16 * 11 + 4, 32, 38 }; + 16 * 12 + 4, 32, 38 }; SDL_Rect dst = { 14 + ttplayer.lenin_pos, 14 + 32 + 96 - 8 - 38 * 2, 64, 38 * 2 }; SDL_RenderCopy(ttrdr, tttxr, &src, &dst); } { SDL_Rect src = { 96 + 64 * (ttplayer.lenin_rem / 200 % 2), - 16 * 11, 64, 48 }; + 16 * 12, 64, 48 }; SDL_Rect dst = { 14 + ttplayer.lenin_pos - 32, 110, 128, 96 }; SDL_RenderCopy(ttrdr, tttxr, &src, &dst); @@ -67,7 +67,7 @@ void tt_player_draw() else if (ttplayer.ywalk == -1) dir = 4; SDL_Rect s = { 16 * (8 * ttplayer.variant + dir + (ttplayer.rem / 100 % 2)), - 16 * 5, + 16 * 6, 16, 16 }; SDL_RenderCopy(ttrdr, tttxr, &s, &d); @@ -75,7 +75,7 @@ void tt_player_draw() double r = ttplayer.until_gulag / 10; double f = (double)(ttplayer.until_gulag) / 3000 * 2 * 3.14159265358979323846; - SDL_Rect s = { 0, 16 * 11, 32, 48 }; + SDL_Rect s = { 0, 16 * 12, 32, 48 }; SDL_Rect d = { ttplayer.x - 16 + r * cos(f), ttplayer.y - 32 + r * sin(f), 64, 96 }; -- cgit v1.2.3