summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAleksey Veresov <aleksey@veresov.pro>2021-03-01 16:52:23 +0300
committerAleksey Veresov <aleksey@veresov.pro>2021-03-01 16:52:23 +0300
commit59096860aa1b293e7bb8af6e372482b7277038a0 (patch)
tree21e4f31124363ecfd4fcc6f9597d871c083d2d66 /src
parent0e2480485a2353609dc070fbda8649bef884afb0 (diff)
downloadtakethis-59096860aa1b293e7bb8af6e372482b7277038a0.tar
takethis-59096860aa1b293e7bb8af6e372482b7277038a0.tar.xz
takethis-59096860aa1b293e7bb8af6e372482b7277038a0.zip
MAUSOLEUM
Diffstat (limited to 'src')
-rw-r--r--src/game.c8
-rw-r--r--src/globals.c3
-rw-r--r--src/globals.h3
-rw-r--r--src/main.c6
-rw-r--r--src/map.c2
5 files changed, 16 insertions, 6 deletions
diff --git a/src/game.c b/src/game.c
index 300f750..b39a140 100644
--- a/src/game.c
+++ b/src/game.c
@@ -43,11 +43,17 @@ static void step(int d)
{
SDL_Rect box = { ttplayer.x, ttplayer.y, 32, 32 };
int out = tt_room_out(ttplayer.room, &box);
- if (out) ttplayer.room = ttplayer.room->neighbours[out - 1];
if (out == 1) ttplayer.y = TT_ROOM_H * 32 - 32;
else if (out == 2) ttplayer.x = 0;
else if (out == 3) ttplayer.y = 0;
else if (out == 4) ttplayer.x = TT_ROOM_W * 32 - 32;
+ if (out) {
+ ttplayer.room = ttplayer.room->neighbours[out - 1];
+ if (ttplayer.room == ttmap + 'L') {
+ ttplayer.y -= 32;
+ Mix_PlayMusic(lenin, -1);
+ }
+ }
}
{
SDL_Rect box = { ttplayer.x, ttplayer.y, 32, 32 };
diff --git a/src/globals.c b/src/globals.c
index 54c0adf..19875b2 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -7,9 +7,10 @@ SDL_Texture *tttxr;
SDL_Renderer *ttrdr;
-Mix_Music *ponpon;
+Mix_Music *grib;
Mix_Music *ussr;
Mix_Music *stalin;
+Mix_Music *lenin;
tt_room ttmap[256];
diff --git a/src/globals.h b/src/globals.h
index b44cddc..5cb13fc 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -15,9 +15,10 @@ extern SDL_Texture *tttxr;
extern SDL_Renderer *ttrdr;
-extern Mix_Music *ponpon;
+extern Mix_Music *grib;
extern Mix_Music *ussr;
extern Mix_Music *stalin;
+extern Mix_Music *lenin;
extern tt_room ttmap[256];
diff --git a/src/main.c b/src/main.c
index 9bf2a27..8bf0bc9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -30,9 +30,10 @@ int main(int argc, char **argv)
ttrdr = SDL_CreateRenderer(wdw, -1, SDL_RENDERER_ACCELERATED);
tttxr = loadtxr("data/txr.bmp");
ttfont = TTF_OpenFont("data/font.otf", 24);
- ponpon = Mix_LoadMUS("data/ponpon.ogg");
+ grib = Mix_LoadMUS("data/grib.ogg");
ussr = Mix_LoadMUS("data/ussr.ogg");
stalin = Mix_LoadMUS("data/stalin.ogg");
+ lenin = Mix_LoadMUS("data/lenin.ogg");
tt_map_load();
srand(time(0));
@@ -46,9 +47,10 @@ int main(int argc, char **argv)
SDL_DestroyRenderer(ttrdr);
SDL_DestroyWindow(wdw);
Mix_HaltMusic();
+ Mix_FreeMusic(lenin);
Mix_FreeMusic(stalin);
Mix_FreeMusic(ussr);
- Mix_FreeMusic(ponpon);
+ Mix_FreeMusic(grib);
Mix_CloseAudio();
TTF_Quit();
SDL_Quit();
diff --git a/src/map.c b/src/map.c
index 9dd4759..61c23a6 100644
--- a/src/map.c
+++ b/src/map.c
@@ -44,7 +44,7 @@ static void togulag(tt_body *b)
static void gribtake(tt_body *b)
{
- Mix_PlayMusic(ponpon, -1);
+ Mix_PlayMusic(grib, -1);
b->collision_act = do_nothing;
b->anim = 1;
b->txrrow = 0;