UserTrackSkip button detection and removal of duplicate definitions in eSoundID

plugin_sa/game_sa/CPad.cpp

@@ -178,6 +178,11 @@ bool CPad::LastStationJustUp() {
     return plugin::CallMethodAndReturn<bool, 0x5405E0, CPad *>(this);
 }
 
+// Converted from thiscall bool CPad::UserTrackSkipButtonJustPressed(void) 0x4E7F20
+bool CPad::UserTrackSkipButtonJustPressed() {
+    return plugin::CallMethodAndReturn<bool, 0x4E7F20, CPad *>(this);
+}
+
 // Converted from thiscall bool CPad::CycleWeaponLeftJustDown(void) 0x540610
 bool CPad::CycleWeaponLeftJustDown() {
     return plugin::CallMethodAndReturn<bool, 0x540610, CPad *>(this);
@@ -300,4 +305,4 @@ void CPad::UpdatePads() {
 
 void CPad::ClearMouseHistory() {
     plugin::Call<0x541BD0>();
-}
+}

plugin_sa/game_sa/CPad.h

@@ -298,6 +298,7 @@ class CPad {
     bool GetAccelerateJustDown();
     bool NextStationJustUp();
     bool LastStationJustUp();
+    bool UserTrackSkipButtonJustPressed();
     bool CycleWeaponLeftJustDown();
     bool CycleWeaponRightJustDown();
     bool GetTarget();
@@ -352,4 +353,4 @@ VALIDATE_OFFSET(CPad, AverageWeapon, 0x124);
 VALIDATE_OFFSET(CPad, AverageEntries, 0x128);
 VALIDATE_OFFSET(CPad, NoShakeBeforeThis, 0x12C);
 VALIDATE_OFFSET(CPad, NoShakeFreq, 0x130);
-VALIDATE_SIZE(CPad, 0x134);
+VALIDATE_SIZE(CPad, 0x134);

plugin_sa/game_sa/enums/eSoundID.h

@@ -27,32 +27,32 @@ enum eSoundID
     SOUND_WAREHOUSE_DOOR_SLIDE_STOP,
     SOUND_CLAXON_START,
     SOUND_CLAXON_STOP,
-    SOUND_BLAST_DOOR_SLIDE_START,
-    SOUND_BLAST_DOOR_SLIDE_STOP,
+    SOUND_BLAST_DOOR_SLIDE_START_UNUSED,
+    SOUND_BLAST_DOOR_SLIDE_STOP_UNUSED,
     SOUND_BONNET_DENT,
     SOUND_BASKETBALL_BOUNCE,
-    SOUND_BASKETBALL_HIT_HOOP,
-    SOUND_BASKETBALL_SCORE,
-    SOUND_POOL_BREAK,
-    SOUND_POOL_HIT_WHITE,
+    SOUND_BASKETBALL_HIT_HOOP_UNUSED,
+    SOUND_BASKETBALL_SCORE_UNUSED,
+    SOUND_POOL_BREAK_UNUSED,
+    SOUND_POOL_HIT_WHITE_UNUSED,
     SOUND_POOL_BALL_HIT_BALL,
     SOUND_POOL_HIT_CUSHION,
     SOUND_POOL_BALL_POT,
-    SOUND_POOL_CHALK_CUE,
+    SOUND_POOL_CHALK_CUE_UNUSED,
     SOUND_CRANE_ENTER,
     SOUND_CRANE_MOVE_START,
     SOUND_CRANE_MOVE_STOP,
     SOUND_CRANE_EXIT,
     SOUND_CRANE_SMASH_PORTACABIN,
     SOUND_CONTAINER_COLLISION,
-    SOUND_VIDEO_POKER_PAYOUT,
-    SOUND_VIDEO_POKER_BUTTON,
+    SOUND_VIDEO_POKER_PAYOUT_UNUSED,
+    SOUND_VIDEO_POKER_BUTTON_UNUSED,
     SOUND_WHEEL_OF_FORTUNE_CLACKER,
-    SOUND_KEYPAD_BEEP,
-    SOUND_KEYPAD_PASS,
-    SOUND_KEYPAD_FAIL,
+    SOUND_KEYPAD_BEEP_UNUSED,
+    SOUND_KEYPAD_PASS_UNUSED,
+    SOUND_KEYPAD_FAIL_UNUSED,
     SOUND_SHOOTING_RANGE_TARGET_SHATTER,
-    SOUND_SHOOTING_RANGE_TARGET_DROP,
+    SOUND_SHOOTING_RANGE_TARGET_DROP_UNUSED,
     SOUND_SHOOTING_RANGE_TARGET_MOVE_START,
     SOUND_SHOOTING_RANGE_TARGET_MOVE_STOP,
     SOUND_SHUTTER_DOOR_START,
@@ -99,18 +99,18 @@ enum eSoundID
     SOUND_BEE_TRACK_START,
     SOUND_BEE_TRACK_STOP,
     SOUND_BEE_GAME_OVER,
-    SOUND_FREEZER_OPEN,
-    SOUND_FREEZER_CLOSE,
-    SOUND_MEAT_TRACK_START,
-    SOUND_MEAT_TRACK_STOP,
+    SOUND_FREEZER_OPEN_UNUSED,
+    SOUND_FREEZER_CLOSE_UNUSED,
+    SOUND_MEAT_TRACK_START_UNUSED,
+    SOUND_MEAT_TRACK_STOP_UNUSED,
     SOUND_ROULETTE_ADD_CASH,
     SOUND_ROULETTE_REMOVE_CASH,
     SOUND_ROULETTE_NO_CASH,
-    SOUND_ROULETTE_SPIN,
+    SOUND_ROULETTE_SPIN_UNUSED,
     SOUND_BANDIT_INSERT_COIN,
-    SOUND_BANDIT_WHEEL_STOP,
-    SOUND_BANDIT_WHEEL_START,
-    SOUND_BANDIT_PAYOUT,
+    SOUND_BANDIT_WHEEL_STOP_UNUSED,
+    SOUND_BANDIT_WHEEL_START_UNUSED,
+    SOUND_BANDIT_PAYOUT_UNUSED,
     SOUND_OFFICE_FIRE_ALARM_START,
     SOUND_OFFICE_FIRE_ALARM_STOP,
     SOUND_OFFICE_FIRE_COUGHING_START,
@@ -122,30 +122,30 @@ enum eSoundID
     SOUND_MOLOTOV,
     SOUND_MESH_GATE_OPEN_START,
     SOUND_MESH_GATE_OPEN_STOP,
-    SOUND_OGLOC_DOORBELL,
-    SOUND_OGLOC_WINDOW_RATTLE_BANG,
-    SOUND_STINGER_RELOAD,
+    SOUND_OGLOC_DOORBELL_UNUSED,
+    SOUND_OGLOC_WINDOW_RATTLE_BANG_UNUSED,
+    SOUND_STINGER_RELOAD_UNUSED,
     SOUND_HEAVY_DOOR_START,
     SOUND_HEAVY_DOOR_STOP,
-    SOUND_SHOOT_CONTROLS,
-    SOUND_CARGO_PLANE_DOOR_START,
-    SOUND_CARGO_PLANE_DOOR_STOP,
-    SOUND_DA_NANG_CONTAINER_OPEN,
-    SOUND_DA_NANG_HEAVY_DOOR_OPEN,
+    SOUND_SHOOT_CONTROLS_UNUSED,
+    SOUND_CARGO_PLANE_DOOR_START_UNUSED,
+    SOUND_CARGO_PLANE_DOOR_STOP_UNUSED,
+    SOUND_DA_NANG_CONTAINER_OPEN_UNUSED,
+    SOUND_DA_NANG_HEAVY_DOOR_OPEN_UNUSED,
     SOUND_DA_NANG_MUFFLED_REFUGEES,
     SOUND_GYM_BIKE_START,
     SOUND_GYM_BIKE_STOP,
-    SOUND_GYM_BOXING_BELL,
-    SOUND_GYM_INCREASE_DIFFICULTY,
-    SOUND_GYM_REST_WEIGHTS,
+    SOUND_GYM_BOXING_BELL_UNUSED,
+    SOUND_GYM_INCREASE_DIFFICULTY_UNUSED,
+    SOUND_GYM_REST_WEIGHTS_UNUSED,
     SOUND_GYM_RUNNING_MACHINE_START,
     SOUND_GYM_RUNNING_MACHINE_STOP,
     SOUND_OTB_BET_ZERO,
     SOUND_OTB_INCREASE_BET,
     SOUND_OTB_LOSE,
     SOUND_OTB_PLACE_BET,
     SOUND_OTB_WIN,
-    SOUND_STINGER_FIRE,
+    SOUND_STINGER_FIRE_UNUSED,
     SOUND_HEAVY_GATE_START,
     SOUND_HEAVY_GATE_STOP,
     SOUND_VERTICAL_BIRD_LIFT_START,
@@ -171,12 +171,12 @@ enum eSoundID
     SOUND_MAGNET_VEHICLE_COLLISION,
     SOUND_PROPERTY_PURCHASED,
     SOUND_PICKUP_STANDARD,
-    SOUND_MECHANIC_SLIDE_OUT,
-    SOUND_MECHANIC_ATTACH_CAR_BOMB,
+    SOUND_MECHANIC_SLIDE_OUT_UNUSED,
+    SOUND_MECHANIC_ATTACH_CAR_BOMB_UNUSED,
     SOUND_GARAGE_DOOR_START,
     SOUND_GARAGE_DOOR_STOP,
-    SOUND_CAT2_SECURITY_ALARM,
-    SOUND_CAT2_WOODEN_DOOR_BREACH,
+    SOUND_CAT2_SECURITY_ALARM_UNUSED,
+    SOUND_CAT2_WOODEN_DOOR_BREACH_UNUSED,
     SOUND_MINITANK_FIRE,
     SOUND_OTB_NO_CASH,
     SOUND_EXPLOSION,
@@ -192,15 +192,15 @@ enum eSoundID
     SOUND_RESTAURANT_CJ_PUKE,
     SOUND_TEMPEST_PLAYER_SHOOT,
     SOUND_TEMPEST_ENEMY_SHOOT,
-    SOUND_TEMPEST_EXPLOSION,
+    SOUND_TEMPEST_EXPLOSION_UNUSED,
     SOUND_TEMPEST_PICKUP1,
     SOUND_TEMPEST_PICKUP2,
     SOUND_TEMPEST_PICKUP3,
-    SOUND_TEMPEST_WARP,
+    SOUND_TEMPEST_WARP_UNUSED,
     SOUND_TEMPEST_SHIELD_GLOW,
     SOUND_TEMPEST_GAME_OVER,
-    SOUND_TEMPEST_HIGHLIGHT,
-    SOUND_TEMPEST_SELECT,
+    SOUND_TEMPEST_HIGHLIGHT_UNUSED,
+    SOUND_TEMPEST_SELECT_UNUSED,
     SOUND_TEMPEST_TRACK_START,
     SOUND_TEMPEST_TRACK_STOP,
     SOUND_DRIVING_AWARD_TRACK_START,
@@ -6577,7 +6577,7 @@ enum eSoundID
     SOUND_DRINKS_CAN = 42600,
     SOUND_VENDING_EAT,
     SOUND_LIFT_LOOP = 42800,
-    SOUND_SECURITY_ALARM,
+    SOUND_SECURITY_ALARM_2,
     SOUND_LIFT_START,
     SOUND_LIFT_STOP,
     SOUND_VIDEO_POKER_BUTTON = 43000,
@@ -7091,4 +7091,4 @@ enum eSoundID
     SOUND_ZER4_OF,
     SOUND_ZER4_OG,
     SOUND_BLIP_DETECTED = 45400
-};
+};