From b426ed81dde695458bbc24fe857eed073f2e2014 Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 14 Aug 2020 08:25:12 -0700 Subject: [PATCH 1/2] dumbass doesn't test changes before pushing directly to next (cherry picked from commit be14b8a564a89a5afb84ac19f1586f3db7f68367) --- src/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 51e477818..cbb0fa203 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -100,7 +100,6 @@ set(SRB2_CORE_HEADERS m_swap.h md5.h mserv.h - http-mserv.h p5prof.h s_sound.h screen.h From d31c33e03557c3507b1d07ee01b34ded05fb4434 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sun, 16 Aug 2020 21:18:33 -0400 Subject: [PATCH 2/2] No previous prototype for K_DropKitchenSink --- src/k_kart.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/k_kart.h b/src/k_kart.h index e6241f8ae..796065404 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -56,6 +56,7 @@ INT32 K_GetKartDriftSparkValue(player_t *player); void K_KartUpdatePosition(player_t *player); void K_DropItems(player_t *player); void K_DropRocketSneaker(player_t *player); +void K_DropKitchenSink(player_t *player); void K_StripItems(player_t *player); void K_StripOther(player_t *player); void K_MomentumToFacing(player_t *player);