diff --git a/extras/ACS/lib/inc/ACS/bkcommon.acs b/extras/ACS/lib/inc/ACS/bkcommon.acs index 3f9f2b1e4..dadc53dff 100644 --- a/extras/ACS/lib/inc/ACS/bkcommon.acs +++ b/extras/ACS/lib/inc/ACS/bkcommon.acs @@ -10,7 +10,7 @@ // // Header for target library libacs. // -// Defines for Dr. Robotnik's Ring Racers' ACS. +// Defines for BlanKart's ACS. // //----------------------------------------------------------------------------- diff --git a/extras/blanbinary/BlanKartBinary-Config.cfg b/extras/blanbinary/BlanKartBinary-Config.cfg index c1714f624..76a17ce41 100644 --- a/extras/blanbinary/BlanKartBinary-Config.cfg +++ b/extras/blanbinary/BlanKartBinary-Config.cfg @@ -1,10 +1,11 @@ /*********************************************************\ vim: ai Zone Builder Game Configuration - For Dr. Robotnik's Ring Racers - Based on the Configuration for Sonic Robo Blast 2 Version 2.2 + For BlanKart + Based on the Configuration for Dr. Robotnik's Ring Racers and Sonic Robo Blast 2 Version 2.2 Contributors (alphabetical): * Foxboy + * GenericHeroGuy * James(/Jart) * JJames19119 * Kalaron @@ -13,6 +14,7 @@ * MK * Morpheus * Neo Chaotikal + * NepDisk * Oogaland * Rob * SeventhSentinel @@ -128,12 +130,8 @@ skins Sonic; Tails; Knuckles; - Amy; - Mighty; - Motobug; Eggman; MetalSonic; - Fang; } // Gametypes diff --git a/extras/blanudmf/Includes/BlanKart_things.cfg b/extras/blanudmf/Includes/BlanKart_things.cfg index b941fe9b6..8318a53ed 100644 --- a/extras/blanudmf/Includes/BlanKart_things.cfg +++ b/extras/blanudmf/Includes/BlanKart_things.cfg @@ -4558,171 +4558,6 @@ udmf } } - /* - // We want these objects, but they went over a billion of - // other Ring Racers objects... - hauntedheights - { - color = 10; // Green - title = "Haunted Heights"; - - 2000 - { - title = "Smashing Spikeball"; - sprite = "FMCEA0"; - width = 18; - height = 28; - arg0 - { - title = "Initial delay"; - } - } - 2001 - { - title = "HHZ Grass"; - sprite = "HHZMA0"; - width = 16; - height = 40; - } - 2002 - { - title = "HHZ Tentacle 1"; - sprite = "HHZMB0"; - width = 16; - height = 40; - } - 2003 - { - title = "HHZ Tentacle 2"; - sprite = "HHZMC0"; - width = 16; - height = 40; - } - 2004 - { - title = "HHZ Stalagmite (Tall)"; - sprite = "HHZME0"; - width = 16; - height = 40; - } - 2005 - { - title = "HHZ Stalagmite (Short)"; - sprite = "HHZMF0"; - width = 16; - height = 40; - } - 2006 - { - title = "Jack-o'-lantern 1"; - sprite = "PUMKA0"; - width = 16; - height = 40; - arg0 - { - title = "Flicker"; - type = 11; - enum = "yesno"; - } - } - 2007 - { - title = "Jack-o'-lantern 2"; - sprite = "PUMKB0"; - width = 16; - height = 40; - arg0 - { - title = "Flicker"; - type = 11; - enum = "yesno"; - } - } - 2008 - { - title = "Jack-o'-lantern 3"; - sprite = "PUMKC0"; - width = 16; - height = 40; - arg0 - { - title = "Flicker"; - type = 11; - enum = "yesno"; - } - } - 2009 - { - title = "Purple Mushroom"; - sprite = "SHRMD0"; - width = 16; - height = 48; - } - 2010 - { - title = "HHZ Tree"; - sprite = "HHPLC0"; - width = 12; - height = 40; - } - } - */ - - frozenhillside - { - color = 10; // Green - title = "Frozen Hillside"; - - 2100 - { - title = "Ice Shard (Small)"; - sprite = "FHZIA0"; - width = 8; - height = 32; - } - 2101 - { - title = "Ice Shard (Large)"; - sprite = "FHZIB0"; - width = 8; - height = 32; - } - 2102 - { - title = "Crystal Tree (Aqua)"; - sprite = "TRE3A0"; - width = 20; - height = 200; - } - 2103 - { - title = "Crystal Tree (Pink)"; - sprite = "TRE3B0"; - width = 20; - height = 200; - } - 2104 - { - title = "Amy Cameo"; - sprite = "ROSYA1"; - width = 16; - height = 48; - arg0 - { - title = "Grayscale?"; - type = 11; - enum = "noyes"; - } - } - 2105 - { - title = "Mistletoe"; - sprite = "XMS6A0"; - width = 52; - height = 106; - } - } - tutorial { color = 10; // Green @@ -4741,148 +4576,6 @@ udmf } } - /* - // We want these objects, but they went over a billion of - // other Ring Racers objects... - flickies - { - color = 10; // Green - title = "Flickies"; - width = 8; - height = 20; - arg0 - { - title = "Radius"; - } - arg1 - { - title = "Flags"; - type = 12; - enum - { - 1 = "Move aimlessly"; - 2 = "No movement"; - 4 = "Hop"; - } - } - - 2200 - { - title = "Bluebird"; - sprite = "FL01A1"; - } - 2201 - { - title = "Rabbit"; - sprite = "FL02A1"; - } - 2202 - { - title = "Chicken"; - sprite = "FL03A1"; - } - 2203 - { - title = "Seal"; - sprite = "FL04A1"; - } - 2204 - { - title = "Pig"; - sprite = "FL05A1"; - } - 2205 - { - title = "Chipmunk"; - sprite = "FL06A1"; - } - 2206 - { - title = "Penguin"; - sprite = "FL07A1"; - } - 2207 - { - title = "Fish"; - sprite = "FL08A1"; - arg2 - { - title = "Color"; - type = 11; - enum - { - 0 = "Random"; - 1 = "Red"; - 2 = "Cyan"; - 3 = "Blue"; - 4 = "Vapor"; - 5 = "Purple"; - 6 = "Bubblegum"; - 7 = "Neon"; - 8 = "Black"; - 9 = "Beige"; - 10 = "Lavender"; - 11 = "Ruby"; - 12 = "Salmon"; - 13 = "Sunset"; - 14 = "Orange"; - 15 = "Yellow"; - } - } - } - 2208 - { - title = "Ram"; - sprite = "FL09A1"; - } - 2209 - { - title = "Puffin"; - sprite = "FL10A1"; - } - 2210 - { - title = "Cow"; - sprite = "FL11A1"; - } - 2211 - { - title = "Rat"; - sprite = "FL12A1"; - } - 2212 - { - title = "Bear"; - sprite = "FL13A1"; - } - 2213 - { - title = "Dove"; - sprite = "FL14A1"; - } - 2214 - { - title = "Cat"; - sprite = "FL15A1"; - } - 2215 - { - title = "Canary"; - sprite = "FL16A1"; - } - 2216 - { - title = "Spider"; - sprite = "FS01A1"; - } - 2217 - { - title = "Bat"; - sprite = "FS02A0"; - } - } - */ - marble { color = 10; // Green diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c7af7bf91..21883fb15 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -117,7 +117,7 @@ if(${SRB2_CONFIG_HAVE_ZLIB}) set(SRB2_HAVE_ZLIB ON) target_compile_definitions(SRB2SDL2 PRIVATE -DHAVE_ZLIB) else() - message(WARNING "You have specified that ZLIB is available but it was not found. Dr Robotnik's Ring Racers may not compile correctly.") + message(WARNING "You have specified that ZLIB is available but it was not found. BlanKart may not compile correctly.") endif() endif() @@ -140,7 +140,7 @@ if(${SRB2_CONFIG_HAVE_PNG} AND ${SRB2_CONFIG_HAVE_ZLIB}) target_compile_definitions(SRB2SDL2 PRIVATE -D_LARGEFILE64_SOURCE) target_sources(SRB2SDL2 PRIVATE apng.c) else() - message(WARNING "You have specified that PNG is available but it was not found. Dr Robotnik's Ring Racers may not compile correctly.") + message(WARNING "You have specified that PNG is available but it was not found. BlanKart may not compile correctly.") endif() endif() endif() diff --git a/src/acs/acsvm.hpp b/src/acs/acsvm.hpp index b80510ee4..f6961faed 100644 --- a/src/acs/acsvm.hpp +++ b/src/acs/acsvm.hpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2016 by James Haley, David Hill, et al. (Team Eternity) // Copyright (C) 2024 by Sally "TehRealSalt" Cochenour diff --git a/src/acs/call-funcs.cpp b/src/acs/call-funcs.cpp index d941898b7..180ca604c 100644 --- a/src/acs/call-funcs.cpp +++ b/src/acs/call-funcs.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2016 by James Haley, David Hill, et al. (Team Eternity) // Copyright (C) 2022 by Sally "TehRealSalt" Cochenour diff --git a/src/acs/call-funcs.hpp b/src/acs/call-funcs.hpp index 735c39343..cd6c40498 100644 --- a/src/acs/call-funcs.hpp +++ b/src/acs/call-funcs.hpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2016 by James Haley, David Hill, et al. (Team Eternity) // Copyright (C) 2022 by Sally "TehRealSalt" Cochenour diff --git a/src/acs/environment.cpp b/src/acs/environment.cpp index b49323938..b8adb179d 100644 --- a/src/acs/environment.cpp +++ b/src/acs/environment.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2016 by James Haley, David Hill, et al. (Team Eternity) // Copyright (C) 2022 by Sally "TehRealSalt" Cochenour diff --git a/src/acs/environment.hpp b/src/acs/environment.hpp index e709162e1..f925036e5 100644 --- a/src/acs/environment.hpp +++ b/src/acs/environment.hpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2016 by James Haley, David Hill, et al. (Team Eternity) // Copyright (C) 2022 by Sally "TehRealSalt" Cochenour diff --git a/src/acs/interface.cpp b/src/acs/interface.cpp index 13a53c04e..1e5ab8e03 100644 --- a/src/acs/interface.cpp +++ b/src/acs/interface.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2016 by James Haley, David Hill, et al. (Team Eternity) // Copyright (C) 2022 by Sally "TehRealSalt" Cochenour diff --git a/src/acs/interface.h b/src/acs/interface.h index 12acc1ca7..e113cb159 100644 --- a/src/acs/interface.h +++ b/src/acs/interface.h @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2016 by James Haley, David Hill, et al. (Team Eternity) // Copyright (C) 2022 by Sally "TehRealSalt" Cochenour diff --git a/src/acs/stream.cpp b/src/acs/stream.cpp index 3d7fb85bf..5d97ad22f 100644 --- a/src/acs/stream.cpp +++ b/src/acs/stream.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2016 by James Haley, David Hill, et al. (Team Eternity) // Copyright (C) 2022 by Sally "TehRealSalt" Cochenour diff --git a/src/acs/stream.hpp b/src/acs/stream.hpp index 456a72532..4b34b7902 100644 --- a/src/acs/stream.hpp +++ b/src/acs/stream.hpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2016 by James Haley, David Hill, et al. (Team Eternity) // Copyright (C) 2022 by Sally "TehRealSalt" Cochenour diff --git a/src/acs/thread.cpp b/src/acs/thread.cpp index 35d088e22..8d56b2ee1 100644 --- a/src/acs/thread.cpp +++ b/src/acs/thread.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2016 by James Haley, David Hill, et al. (Team Eternity) // Copyright (C) 2022 by Sally "TehRealSalt" Cochenour diff --git a/src/acs/thread.hpp b/src/acs/thread.hpp index 98f541609..bb7505e2b 100644 --- a/src/acs/thread.hpp +++ b/src/acs/thread.hpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2016 by James Haley, David Hill, et al. (Team Eternity) // Copyright (C) 2022 by Sally "TehRealSalt" Cochenour diff --git a/src/byteptr.h b/src/byteptr.h index e8deb88a2..43325347d 100644 --- a/src/byteptr.h +++ b/src/byteptr.h @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Kart Krew. // Copyright (C) 2020 by Sonic Team Junior. diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 73898fd65..e75cf91f7 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Ronald "Eidolon" Kinard // Copyright (C) 2024 by Kart Krew diff --git a/src/core/memory.h b/src/core/memory.h index 3d75143f2..ba49e3d51 100644 --- a/src/core/memory.h +++ b/src/core/memory.h @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Ronald "Eidolon" Kinard // Copyright (C) 2024 by Kart Krew diff --git a/src/core/static_vec.hpp b/src/core/static_vec.hpp index dc81e8692..244728c3b 100644 --- a/src/core/static_vec.hpp +++ b/src/core/static_vec.hpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Ronald "Eidolon" Kinard // Copyright (C) 2024 by Kart Krew diff --git a/src/core/thread_pool.cpp b/src/core/thread_pool.cpp index 753628391..c83779a13 100644 --- a/src/core/thread_pool.cpp +++ b/src/core/thread_pool.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Ronald "Eidolon" Kinard // Copyright (C) 2024 by Kart Krew diff --git a/src/core/thread_pool.h b/src/core/thread_pool.h index 28f8a4fb3..75961614e 100644 --- a/src/core/thread_pool.h +++ b/src/core/thread_pool.h @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Ronald "Eidolon" Kinard // Copyright (C) 2024 by Kart Krew diff --git a/src/g_party.cpp b/src/g_party.cpp index a5dd79270..e4781f815 100644 --- a/src/g_party.cpp +++ b/src/g_party.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2025 by James Robert Roman // Copyright (C) 2025 by Kart Krew diff --git a/src/g_party.h b/src/g_party.h index b5fd5c2b0..496cfc433 100644 --- a/src/g_party.h +++ b/src/g_party.h @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2025 by James Robert Roman // Copyright (C) 2025 by Kart Krew diff --git a/src/k_bot.cpp b/src/k_bot.cpp index abac77156..e44bd1bdc 100644 --- a/src/k_bot.cpp +++ b/src/k_bot.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Sally "TehRealSalt" Cochenour // Copyright (C) 2024 by Kart Krew diff --git a/src/k_bot.h b/src/k_bot.h index 6f68403e4..9230a2182 100644 --- a/src/k_bot.h +++ b/src/k_bot.h @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Sally "TehRealSalt" Cochenour // Copyright (C) 2024 by Kart Krew diff --git a/src/k_botitem.cpp b/src/k_botitem.cpp index 7de10933a..a539dcaac 100644 --- a/src/k_botitem.cpp +++ b/src/k_botitem.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Sally "TehRealSalt" Cochenour // Copyright (C) 2024 by Kart Krew diff --git a/src/k_botsearch.cpp b/src/k_botsearch.cpp index b25df5763..1c4e0fc35 100644 --- a/src/k_botsearch.cpp +++ b/src/k_botsearch.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Sally "TehRealSalt" Cochenour // Copyright (C) 2024 by Kart Krew diff --git a/src/k_brightmap.c b/src/k_brightmap.c index 371d4a70d..cd213ae5c 100644 --- a/src/k_brightmap.c +++ b/src/k_brightmap.c @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2021 by Sally "TehRealSalt" Cochenour // Copyright (C) 2021 by Kart Krew diff --git a/src/k_brightmap.h b/src/k_brightmap.h index 7986b48e2..9726c792a 100644 --- a/src/k_brightmap.h +++ b/src/k_brightmap.h @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2021 by Sally "TehRealSalt" Cochenour // Copyright (C) 2021 by Kart Krew diff --git a/src/k_follower.h b/src/k_follower.h index 9d5c44fd6..e9854aec2 100644 --- a/src/k_follower.h +++ b/src/k_follower.h @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2018-2022 by "Lat'" // Copyright (C) 2018-2022 by Kart Krew diff --git a/src/k_kart.c b/src/k_kart.c index 133e20998..15e0d15dc 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -1,9 +1,23 @@ -// SONIC ROBO BLAST 2 KART ~ ZarroTsu +// BLANKART +//----------------------------------------------------------------------------- +// Copyright (C) 2025 by NepDisk. +// Copyright (C) 2025 by Kart Krew. +// Copyright (C) 2018 by ZarroTsu. +// +// This program is free software distributed under the +// terms of the GNU General Public License, version 2. +// See the 'LICENSE' file for more details. //----------------------------------------------------------------------------- /// \file k_kart.c /// \brief SRB2kart general. /// All of the SRB2kart-unique stuff. +// TODO: Break this up into more files. +// Files dedicated only for "general miscellanea" +// are straight-up bad coding practice. +// It's better to have niche files that are +// too short than one file that's too massive. + #include "k_kart.h" #include "d_netcmd.h" #include "d_player.h" @@ -8327,28 +8341,8 @@ static boolean K_SetPlayerNextWaypoint(player_t *player) continue; } - if ((waypoint->nextwaypoints != NULL) && (waypoint->numnextwaypoints > 0U)) - { - for (size_t j = 0U; j < waypoint->numnextwaypoints; j++) - { - if (!K_GetWaypointIsEnabled(waypoint->nextwaypoints[j])) - { - continue; - } - if (waypoint->nextwaypoints[j] == waypoint) - { - continue; - } - - bestwaypoint = waypoint->nextwaypoints[j]; - break; - } - } - else - { - bestwaypoint = waypoint->prevwaypoints[i]; - } + bestwaypoint = waypoint->prevwaypoints[i]; nextbestdelta = angledelta; nextbestmomdelta = momdelta; diff --git a/src/k_mapuser.c b/src/k_mapuser.c index 9253e1eaa..bb81ea51f 100644 --- a/src/k_mapuser.c +++ b/src/k_mapuser.c @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) by Sally "TehRealSalt" Cochenour // Copyright (C) by Kart Krew diff --git a/src/k_mapuser.h b/src/k_mapuser.h index 6bbb6e516..45a6e6623 100644 --- a/src/k_mapuser.h +++ b/src/k_mapuser.h @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) by Sally "TehRealSalt" Cochenour // Copyright (C) by Kart Krew diff --git a/src/k_pwrlv.c b/src/k_pwrlv.c index b25d26cda..2ba511960 100644 --- a/src/k_pwrlv.c +++ b/src/k_pwrlv.c @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2018-2022 by Sally Cochenour // diff --git a/src/k_pwrlv.h b/src/k_pwrlv.h index 32ab6c84e..919d12682 100644 --- a/src/k_pwrlv.h +++ b/src/k_pwrlv.h @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2018-2022 by Sally Cochenour // diff --git a/src/k_terrain.c b/src/k_terrain.c index 7166e2d21..9a27c42e8 100644 --- a/src/k_terrain.c +++ b/src/k_terrain.c @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 1998-2021 by ZDoom + GZDoom teams, and contributors // Copyright (C) 2021 by Sally "TehRealSalt" Cochenour diff --git a/src/k_terrain.h b/src/k_terrain.h index 12367a2d3..3292c5dfa 100644 --- a/src/k_terrain.h +++ b/src/k_terrain.h @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 1998-2021 by ZDoom + GZDoom teams, and contributors // Copyright (C) 2021 by Sally "TehRealSalt" Cochenour diff --git a/src/k_waypoint.cpp b/src/k_waypoint.cpp index 9584b2b17..55e64f283 100644 --- a/src/k_waypoint.cpp +++ b/src/k_waypoint.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Sean "Sryder" Ryder // Copyright (C) 2024 by Kart Krew diff --git a/src/k_waypoint.h b/src/k_waypoint.h index ca4aa351a..c41305fe1 100644 --- a/src/k_waypoint.h +++ b/src/k_waypoint.h @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Sean "Sryder" Ryder // Copyright (C) 2024 by Kart Krew diff --git a/src/math/fixed.hpp b/src/math/fixed.hpp index 01a6b8756..8e40d5ed9 100644 --- a/src/math/fixed.hpp +++ b/src/math/fixed.hpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by James Robert Roman // Copyright (C) 2024 by Kart Krew diff --git a/src/math/line_equation.hpp b/src/math/line_equation.hpp index beedd2cec..128a3feab 100644 --- a/src/math/line_equation.hpp +++ b/src/math/line_equation.hpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by James Robert Roman // Copyright (C) 2024 by Kart Krew diff --git a/src/math/line_segment.hpp b/src/math/line_segment.hpp index 9e63902e8..36ef003eb 100644 --- a/src/math/line_segment.hpp +++ b/src/math/line_segment.hpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by James Robert Roman // Copyright (C) 2024 by Kart Krew diff --git a/src/math/traits.hpp b/src/math/traits.hpp index 43ec8905d..702e91fbb 100644 --- a/src/math/traits.hpp +++ b/src/math/traits.hpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by James Robert Roman // Copyright (C) 2024 by Kart Krew diff --git a/src/math/vec.hpp b/src/math/vec.hpp index 73023d484..2d77479ba 100644 --- a/src/math/vec.hpp +++ b/src/math/vec.hpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by James Robert Roman // Copyright (C) 2024 by Kart Krew diff --git a/src/objects/loops.cpp b/src/objects/loops.cpp index 74e604fdb..a9c94e744 100644 --- a/src/objects/loops.cpp +++ b/src/objects/loops.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2023 by James R. // Copyright (C) 2023 by Kart Krew diff --git a/src/p_mapthing.cpp b/src/p_mapthing.cpp index 5c7dc277f..d5ac47e4e 100644 --- a/src/p_mapthing.cpp +++ b/src/p_mapthing.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Kart Krew. // Copyright (C) 2020 by Sonic Team Junior. diff --git a/src/p_sight.c b/src/p_sight.c index f934e1a6d..2f4522be2 100644 --- a/src/p_sight.c +++ b/src/p_sight.c @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Sally "TehRealSalt" Cochenour. // Copyright (C) 2024 by Kart Krew. diff --git a/src/p_sweep.cpp b/src/p_sweep.cpp index 971e2bdb5..580db3cde 100644 --- a/src/p_sweep.cpp +++ b/src/p_sweep.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by James Robert Roman // Copyright (C) 2024 by Kart Krew diff --git a/src/p_sweep.hpp b/src/p_sweep.hpp index 68c6ac359..bf8c5fe16 100644 --- a/src/p_sweep.hpp +++ b/src/p_sweep.hpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2023 by James Robert Roman // diff --git a/src/p_test.cpp b/src/p_test.cpp index 1b13b8adf..0fba3e4cb 100644 --- a/src/p_test.cpp +++ b/src/p_test.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2023 by James Robert Roman // diff --git a/src/r_bsp.cpp b/src/r_bsp.cpp index e00321086..82cbcecc1 100644 --- a/src/r_bsp.cpp +++ b/src/r_bsp.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Kart Krew. // Copyright (C) 2020 by Sonic Team Junior. diff --git a/src/r_draw.cpp b/src/r_draw.cpp index 00488b78d..a95384c57 100644 --- a/src/r_draw.cpp +++ b/src/r_draw.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Kart Krew. // Copyright (C) 2020 by Sonic Team Junior. diff --git a/src/r_draw_column.cpp b/src/r_draw_column.cpp index 31f1501a8..cdda6d40f 100644 --- a/src/r_draw_column.cpp +++ b/src/r_draw_column.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Kart Krew. // Copyright (C) 2020 by Sonic Team Junior. diff --git a/src/r_draw_span.cpp b/src/r_draw_span.cpp index 9d0d0fcae..0fe27b3ce 100644 --- a/src/r_draw_span.cpp +++ b/src/r_draw_span.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Kart Krew. // Copyright (C) 2020 by Sonic Team Junior. diff --git a/src/r_plane.cpp b/src/r_plane.cpp index 4809537c4..87a4fd308 100644 --- a/src/r_plane.cpp +++ b/src/r_plane.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Kart Krew. // Copyright (C) 2020 by Sonic Team Junior. diff --git a/src/r_segs.cpp b/src/r_segs.cpp index 2c52c2ad4..7197ee609 100644 --- a/src/r_segs.cpp +++ b/src/r_segs.cpp @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by Kart Krew. // Copyright (C) 2020 by Sonic Team Junior. diff --git a/src/sdl/CMakeLists.txt b/src/sdl/CMakeLists.txt index e84dfafcc..e49596525 100644 --- a/src/sdl/CMakeLists.txt +++ b/src/sdl/CMakeLists.txt @@ -44,7 +44,7 @@ if("${CMAKE_SYSTEM_NAME}" MATCHES Darwin) target_sources(SRB2SDL2 PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/macosx/Srb2mac.icns") set_target_properties(SRB2SDL2 PROPERTIES MACOSX_BUNDLE_ICON_FILE "Srb2mac" - MACOSX_BUNDLE_BUNDLE_NAME "Dr. Robotnik's Ring Racers" + MACOSX_BUNDLE_BUNDLE_NAME "SRB2Kart V2" MACOSX_BUNDLE_BUNDLE_VERSION ${SRB2_VERSION} RESOURCE "${CMAKE_CURRENT_SOURCE_DIR}/macosx/Srb2mac.icns" diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index 6a91f94c8..95ed62cd1 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -346,7 +346,7 @@ static void write_backtrace(INT32 signal) static void I_ShowErrorMessageBox(const char *messagefordevelopers, boolean dumpmade) { static char finalmessage[2048]; - size_t firstimpressionsline = 3; // "Dr Robotnik's Ring Racers" has encountered... + size_t firstimpressionsline = 3; // "SRB2Kart V2" has encountered... if (M_CheckParm("-dedicated")) return; diff --git a/src/slope_anchors.c b/src/slope_anchors.c index b276a21da..b8309927c 100644 --- a/src/slope_anchors.c +++ b/src/slope_anchors.c @@ -1,4 +1,4 @@ -// DR. ROBOTNIK'S RING RACERS +// BLANKART //----------------------------------------------------------------------------- // Copyright (C) 2024 by James Robert Roman. // Copyright (C) 2024 by Kart Krew.