thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'crate-sound' into 'master'

Browse source 
Crate sound

See merge request KartKrew/Kart!1786
This commit is contained in:
Oni 2024-01-06 00:39:36 +00:00
commit f56574c852
3 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/objects/crate.cpp
View file

@ -47,6 +47,7 @@ struct SA2CrateConfig
static constexpr spritenum_t kSprite = SPR_SABX; static constexpr spritenum_t kSprite = SPR_SABX;
static constexpr frame_layout kFrames = {3, 2, 0, 0, 0, 0}; static constexpr frame_layout kFrames = {3, 2, 0, 0, 0, 0};
static constexpr statenum_t kDefaultDebris = S_SA2_CRATE_DEBRIS; static constexpr statenum_t kDefaultDebris = S_SA2_CRATE_DEBRIS;
static constexpr sfxenum_t kDefaultSound = sfx_cratew;
}; };
struct IceCapBlockConfig struct IceCapBlockConfig
@ -54,6 +55,7 @@ struct IceCapBlockConfig
static constexpr spritenum_t kSprite = SPR_ICBL; static constexpr spritenum_t kSprite = SPR_ICBL;
static constexpr frame_layout kFrames = {6, 6, 0, 0, 0, 0}; static constexpr frame_layout kFrames = {6, 6, 0, 0, 0, 0};
static constexpr statenum_t kDefaultDebris = S_ICECAPBLOCK_DEBRIS; static constexpr statenum_t kDefaultDebris = S_ICECAPBLOCK_DEBRIS;
static constexpr sfxenum_t kDefaultSound = sfx_s3k82;
}; };
struct Graphic : Mobj struct Graphic : Mobj
@ -132,6 +134,10 @@ struct Box : AnyBox
statenum_t debris_state() const { return static_cast<statenum_t>(mobj_t::extravalue1); } statenum_t debris_state() const { return static_cast<statenum_t>(mobj_t::extravalue1); }
void debris_state(statenum_t n) { mobj_t::extravalue1 = n; } void debris_state(statenum_t n) { mobj_t::extravalue1 = n; }
void extravalue2() = delete;
sfxenum_t debris_sound() const {return static_cast<sfxenum_t>(mobj_t::extravalue2); }
void debris_sound(sfxenum_t n) {mobj_t::extravalue2 = n; }
auto gfx() { return MobjListView(static_cast<Graphic*>(this), [](Graphic* g) { return g->next(); }); } auto gfx() { return MobjListView(static_cast<Graphic*>(this), [](Graphic* g) { return g->next(); }); }
void init() void init()
@ -160,6 +166,7 @@ struct Box : AnyBox
side(FF_PAPERSPRITE)->xy(0, +radius)->turn(ANGLE_180); side(FF_PAPERSPRITE)->xy(0, +radius)->turn(ANGLE_180);
debris_state(Config::kDefaultDebris); debris_state(Config::kDefaultDebris);
debris_sound(Config::kDefaultSound);
} }
bool think() bool think()
@ -245,7 +252,7 @@ private:
auto rng = [&](int x, int y) { return P_RandomRange(PR_DECORATION, x, y) * scale(); }; auto rng = [&](int x, int y) { return P_RandomRange(PR_DECORATION, x, y) * scale(); };
auto rng_xyz = [&](int x) { return std::tuple(rng(-x, x), rng(-x, x), rng(0, x)); }; auto rng_xyz = [&](int x) { return std::tuple(rng(-x, x), rng(-x, x), rng(0, x)); };
auto spawn = [&] auto spawn = [&](bool playsound)
{ {
auto [x, y, z] = rng_xyz(info->height / FRACUNIT); auto [x, y, z] = rng_xyz(info->height / FRACUNIT);
Mobj* p = spawn_from<Mobj>({x, y, z}, MT_BOX_DEBRIS); Mobj* p = spawn_from<Mobj>({x, y, z}, MT_BOX_DEBRIS);
@ -258,14 +265,19 @@ private:
p->momx = (inflictor->momx / 8) + x; p->momx = (inflictor->momx / 8) + x;
p->momy = (inflictor->momy / 8) + y; p->momy = (inflictor->momy / 8) + y;
p->momz = (Fixed::hypot(inflictor->momx, inflictor->momy) / 4) + z; p->momz = (Fixed::hypot(inflictor->momx, inflictor->momy) / 4) + z;
if (playsound && debris_sound())
{
p->voice(debris_sound());
}
}; };
spawn(); spawn(true);
spawn(); spawn(false);
spawn(); spawn(false);
spawn(); spawn(false);
spawn(); spawn(false);
spawn(); spawn(false);
} }
void update_nearby() const void update_nearby() const
@ -320,6 +332,7 @@ struct Crate : Box<SA2CrateConfig>
} }
debris_state(S_SA2_CRATE_DEBRIS_METAL); debris_state(S_SA2_CRATE_DEBRIS_METAL);
debris_sound(sfx_cratem);
} }
} }

3
src/sounds.c
View file

@ -1249,6 +1249,9 @@ sfxinfo_t S_sfx[NUMSFX] =
{"glgz1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ice Cube shatters"}, {"glgz1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ice Cube shatters"},
{"cratew", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crate shatters"},
{"cratem", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Crate shatters"},
{"ivobal", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Ivo Ball {"ivobal", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Ivo Ball
{"lcfuel", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Fuel Capsule explodes"}, {"lcfuel", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Fuel Capsule explodes"},

4
src/sounds.h
View file

@ -1320,6 +1320,10 @@ typedef enum
// Ice Cube // Ice Cube
sfx_glgz1, sfx_glgz1,
// Crate
sfx_cratew,
sfx_cratem,
// Ivo Ball // Ivo Ball
sfx_ivobal, sfx_ivobal,