From 412b37a8de1a7f97238b817aa8616fcd4453d48b Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 3 Oct 2023 18:35:29 -0700 Subject: [PATCH] Convert k_director.c to k_director.cpp --- src/CMakeLists.txt | 2 +- src/{k_director.c => k_director.cpp} | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) rename src/{k_director.c => k_director.cpp} (98%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b7cce51f6..0f157f735 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -137,7 +137,7 @@ add_executable(SRB2SDL2 MACOSX_BUNDLE WIN32 k_terrain.c k_brightmap.c k_terrain.c - k_director.c + k_director.cpp k_follower.c k_profiles.c k_specialstage.c diff --git a/src/k_director.c b/src/k_director.cpp similarity index 98% rename from src/k_director.c rename to src/k_director.cpp index e229b46de..64f82cb59 100644 --- a/src/k_director.c +++ b/src/k_director.cpp @@ -3,6 +3,8 @@ /// \file k_director.c /// \brief SRB2kart automatic spectator camera. +#include + #include "k_kart.h" #include "k_respawn.h" #include "doomdef.h" @@ -97,7 +99,7 @@ static void K_UpdateDirectorPositions(void) if (directorinfo.gap[position] >= BREAKAWAYDIST) { - directorinfo.boredom[position] = min(BOREDOMTIME * 2, directorinfo.boredom[position] + 1); + directorinfo.boredom[position] = std::min(BOREDOMTIME * 2, directorinfo.boredom[position] + 1); } else if (directorinfo.boredom[position] > 0) {