diff --git a/source/duke3d/src/player.cpp b/source/duke3d/src/player.cpp index 83e2f0588..af2b02b04 100644 --- a/source/duke3d/src/player.cpp +++ b/source/duke3d/src/player.cpp @@ -5275,42 +5275,45 @@ void P_ProcessInput(int playerNum) { int const checkWalkSound = sintable[pPlayer->bobcounter & 2047] >> 12; - if ((trueFloorDist < PHEIGHT + ZOFFSET3) && (checkWalkSound == 1 || checkWalkSound == 3)) + if (trueFloorDist < PHEIGHT + ZOFFSET3) { - if (pPlayer->walking_snd_toggle == 0 && pPlayer->on_ground) + if (checkWalkSound == 1 || checkWalkSound == 3) { - switch (sectorLotag) + if (pPlayer->walking_snd_toggle == 0 && pPlayer->on_ground) { - case 0: + switch (sectorLotag) { - int const walkPicnum = (lowZhit >= 0 && (lowZhit & 49152) == 49152) - ? TrackerCast(sprite[lowZhit & (MAXSPRITES - 1)].picnum) - : TrackerCast(sector[pPlayer->cursectnum].floorpicnum); - - switch (DYNAMICTILEMAP(walkPicnum)) + case 0: { - case PANNEL1__STATIC: - case PANNEL2__STATIC: - A_PlaySound(DUKE_WALKINDUCTS, pPlayer->i); - pPlayer->walking_snd_toggle = 1; - break; - } - } - break; + int const walkPicnum = (lowZhit >= 0 && (lowZhit & 49152) == 49152) + ? TrackerCast(sprite[lowZhit & (MAXSPRITES - 1)].picnum) + : TrackerCast(sector[pPlayer->cursectnum].floorpicnum); - case ST_1_ABOVE_WATER: - if (!pPlayer->spritebridge) - { - if ((krand() & 1) == 0) - A_PlaySound(DUKE_ONWATER, pPlayer->i); - pPlayer->walking_snd_toggle = 1; + switch (DYNAMICTILEMAP(walkPicnum)) + { + case PANNEL1__STATIC: + case PANNEL2__STATIC: + A_PlaySound(DUKE_WALKINDUCTS, pPlayer->i); + pPlayer->walking_snd_toggle = 1; + break; + } } break; + + case ST_1_ABOVE_WATER: + if (!pPlayer->spritebridge) + { + if ((krand() & 1) == 0) + A_PlaySound(DUKE_ONWATER, pPlayer->i); + pPlayer->walking_snd_toggle = 1; + } + break; + } } } + else if (pPlayer->walking_snd_toggle > 0) + pPlayer->walking_snd_toggle--; } - else if (pPlayer->walking_snd_toggle > 0) - pPlayer->walking_snd_toggle--; if (pPlayer->jetpack_on == 0 && pPlayer->inv_amount[GET_STEROIDS] > 0 && pPlayer->inv_amount[GET_STEROIDS] < 400) velocityModifier <<= 1;