diff --git a/src/d_main.c b/src/d_main.c index 36152eb1..5d1d6933 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -947,8 +947,8 @@ void D_SRB2Main(void) dedicated = M_CheckParm("-dedicated") != 0; #endif - strcpy(title, "Sonic Robo Blast 2"); - strcpy(srb2, "Sonic Robo Blast 2"); + strcpy(title, "SRB2 Kart"); // SRB2kart 16/02/25 + strcpy(srb2, "SRB2 Kart"); D_MakeTitleString(srb2); #ifdef PC_DOS @@ -958,7 +958,7 @@ void D_SRB2Main(void) #if defined (__OS2__) && !defined (HAVE_SDL) // set PM window title snprintf(pmData->title, sizeof (pmData->title), - "Sonic Robo Blast 2" VERSIONSTRING ": %s", + "SRB2 Kart" VERSIONSTRING ": %s", title); pmData->title[sizeof (pmData->title) - 1] = '\0'; #endif @@ -1112,7 +1112,7 @@ void D_SRB2Main(void) #endif D_CleanFile(); -#if 1 // md5s last updated 12/14/14 +#if 1 // SRB2kart md5s last updated 00/00/00 // Check MD5s of autoloaded files W_VerifyFileMD5(0, "c1b9577687f8a795104aef4600720ea7"); // srb2.srb/srb2.wad diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 9c3c7ec1..c87590f9 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -290,6 +290,51 @@ consvar_t cv_bombshield = {"tv_bombshield", "5", CV_NETVAR|CV_CHEAT, chanc consvar_t cv_1up = {"tv_1up", "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_eggmanbox = {"tv_eggman", "5", CV_NETVAR|CV_CHEAT, chances_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +// SRB2kart specific settings // SRB2kart 16/02/27 +// SRB2kart Retro +consvar_t cv_r_magnet = {"retro_magnet", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_boo = {"retro_boo", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_mushroom = {"retro_mushroom", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_triplemushroom = {"retro_triplemushroom", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_megashroom = {"retro_megashroom", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_goldshroom = {"retro_goldshroom", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_star = {"retro_star", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_triplebanana = {"retro_triplebanana", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_fakeitem = {"retro_fakeitem", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_banana = {"retro_banana", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_greenshell = {"retro_greenshell", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_redshell = {"retro_redshell", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_triplegreenshell = {"retro_triplegreenshell", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_bobomb = {"retro_bobomb", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_blueshell = {"retro_blueshell", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_tossfeather = {"retro_tossfeather", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_fireflower = {"retro_fireflower", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_tripleredshell = {"retro_tripleredshell", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_bowsershell = {"retro_bowsershell", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_r_lightning = {"retro_lightning", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +// SRB2kart Neo +consvar_t cv_n_magnet = {"neo_magnet", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_ghost = {"neo_ghost", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_speedshoe = {"neo_speedshoe", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_tripleshoe = {"neo_tripleshoe", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_sizeup = {"neo_sizeup", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_rocketshoe = {"neo_rocketshoe", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_invincibility = {"neo_invincibility", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_triplebanana = {"neo_triplebanana", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_fakemonitor = {"neo_fakemonitor", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_banana = {"neo_banana", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_orbitspike = {"neo_orbitspike", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_jaws = {"neo_jaws", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_laserwisp = {"neo_laserwisp", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_tripleorbitspike = {"neo_tripleorbitspike", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_mine = {"neo_mine", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_deton = {"neo_deton", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_doublejaws = {"neo_doublejaws", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_spring = {"neo_spring", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_ghzwrecker = {"neo_ghzwrecker", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cv_n_lightning = {"neo_lightning", "On", CV_NETVAR|CV_CHEAT, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +// + consvar_t cv_ringslinger = {"ringslinger", "No", CV_NETVAR|CV_NOSHOWHELP|CV_CALL|CV_CHEAT, CV_YesNo, Ringslinger_OnChange, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_gravity = {"gravity", "0.5", CV_RESTRICT|CV_FLOAT|CV_CALL, NULL, Gravity_OnChange, 0, NULL, NULL, 0, 0, NULL}; @@ -496,6 +541,31 @@ void D_RegisterServerCommands(void) CV_RegisterVar(&cv_1up); CV_RegisterVar(&cv_eggmanbox); +// // SRB2kart 16/02/27 + CV_RegisterVar(&cv_magnet); + CV_RegisterVar(&cv_boo); + CV_RegisterVar(&cv_mushroom); + CV_RegisterVar(&cv_triplemushroom); + CV_RegisterVar(&cv_megashroom); + CV_RegisterVar(&cv_goldshroom); + CV_RegisterVar(&cv_star); + CV_RegisterVar(&cv_triplebanana); + CV_RegisterVar(&cv_fakeitem); + CV_RegisterVar(&cv_banana); + CV_RegisterVar(&cv_greenshell); + CV_RegisterVar(&cv_redshell); + CV_RegisterVar(&cv_laserwisp); + CV_RegisterVar(&cv_triplegreenshell); + CV_RegisterVar(&cv_bobomb); + CV_RegisterVar(&cv_blueshell); + CV_RegisterVar(&cv_jaws); + CV_RegisterVar(&cv_tossfeather); + CV_RegisterVar(&cv_fireflower); + CV_RegisterVar(&cv_tripleredshell); + CV_RegisterVar(&cv_bowsershell); + CV_RegisterVar(&cv_lightning); +// + CV_RegisterVar(&cv_ringslinger); CV_RegisterVar(&cv_startinglives); diff --git a/src/d_netcmd.h b/src/d_netcmd.h index e66df0c6..8ce72233 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -96,11 +96,18 @@ extern consvar_t cv_jumpshield, cv_watershield, cv_ringshield, cv_forceshield, c extern consvar_t cv_1up, cv_eggmanbox; extern consvar_t cv_recycler; -// SRB2kart settings - basically every item // SRB2kart 21/02/16 -extern consvar_t cv_magnet, cv_boo, cv_mushroom, cv_megashroom, cv_goldshroom, cv_star; -extern consvar_t cv_triplebanana, cv_fakeitem, cv_banana, cv_greenshell, cv_redshell; -extern consvar_t cv_laserwisp, cv_triplegreenshell, cv_bobomb, cv_blueshell, cv_jaws; -extern consvar_t cv_tossfeather, cv_fireflower, cv_tripleredshell, cv_bowsershell, cv_lightning; +// SRB2kart specific settings // SRB2kart 16/02/27 +// SRB2kart Retro +extern consvar_t cv_r_magnet, cv_r_boo, cv_r_mushroom, cv_r_triplemushroom, cv_r_megashroom; +extern consvar_t cv_r_goldshroom, cv_r_star, cv_r_triplebanana, cv_r_fakeitem, cv_r_banana; +extern consvar_t cv_r_greenshell, cv_r_redshell, cv_r_triplegreenshell, cv_r_bobomb, cv_r_blueshell; +extern consvar_t cv_r_tossfeather, cv_r_fireflower, cv_r_tripleredshell, cv_r_bowsershell, cv_r_lightning; +// SRB2kart Neo +extern consvar_t cv_n_magnet, cv_n_ghost, cv_n_speedshoe, cv_n_tripleshoe, cv_n_sizeup; +extern consvar_t cv_n_rocketshoe, cv_n_invincibility, cv_n_triplebanana, cv_n_fakemonitor, cv_n_banana; +extern consvar_t cv_n_orbitspike, cv_n_jaws, cv_n_laserwisp, cv_n_tripleorbitspike, cv_n_mine; +extern consvar_t cv_n_deton, cv_n_doublejaws, cv_n_spring, cv_n_ghzwrecker, cv_n_lightning; +// extern consvar_t cv_itemfinder; diff --git a/src/dehacked.c b/src/dehacked.c index c0ef29c2..22d14d04 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -7576,7 +7576,7 @@ struct { {"TOL_NIGHTS",TOL_NIGHTS}, {"TOL_ERZ3",TOL_ERZ3}, {"TOL_XMAS",TOL_XMAS}, - {"TOL_RETROKART",TOL_RETROKART}, // SRB2kart 21/02/16 + {"TOL_RETROKART",TOL_RETROKART}, // SRB2kart 16/02/21 {"TOL_NEOKART",TOL_NEOKART}, // Level flags diff --git a/src/g_game.c b/src/g_game.c index f0eaecd2..cbc06b59 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -3601,7 +3601,7 @@ void G_InitNew(UINT8 pultmode, const char *mapname, boolean resetplayer, boolean // Don't carry over custom music change to another map. mapmusic |= MUSIC_RELOADRESET; - //ultimatemode = pultmode; // SRB2kart 21/02/16 - I don't think we need Ultimate mode + //ultimatemode = pultmode; // SRB2kart 16/02/21 - I don't think we need Ultimate mode playerdeadview = false; automapactive = false; imcontinuing = false; diff --git a/src/m_menu.c b/src/m_menu.c index 06aaac0e..c3f7c156 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1390,6 +1390,67 @@ static menuitem_t OP_MonitorToggleMenu[] = {IT_STRING|IT_CVAR|IT_CV_INVISSLIDER, NULL, "Eggman Box", &cv_eggmanbox, 130}, }; +// SRB2kart specific settings // SRB2kart 16/02/27 +// SRB2kart Retro +static menuitem_t OP_KartRetroToggleMenu1[] = +{ + // Speed Items + {IT_STRING | IT_CVAR, NULL, "Magnet", &cv_r_magnet, 20}, + {IT_STRING | IT_CVAR, NULL, "Boo", &cv_r_boo, 30}, + {IT_STRING | IT_CVAR, NULL, "Mushroom", &cv_r_mushroom, 40}, + {IT_STRING | IT_CVAR, NULL, "Triple Mushroom", &cv_r_triplemushroom, 50}, + {IT_STRING | IT_CVAR, NULL, "Mega Mushroom", &cv_r_megashroom, 60}, + {IT_STRING | IT_CVAR, NULL, "Gold Mushroom", &cv_r_goldshroom, 70}, + {IT_STRING | IT_CVAR, NULL, "Star", &cv_r_star, 80}, +}; +static menuitem_t OP_KartRetroToggleMenu2[] = +{ + // Attack Items + {IT_STRING | IT_CVAR, NULL, "Triple Banana", &cv_r_triplebanana, 20}, + {IT_STRING | IT_CVAR, NULL, "Fake Item", &cv_r_fakeitem, 30}, + {IT_STRING | IT_CVAR, NULL, "Banana", &cv_r_banana, 40}, + {IT_STRING | IT_CVAR, NULL, "Green Shell", &cv_r_greenshell, 50}, + {IT_STRING | IT_CVAR, NULL, "Red Shell", &cv_r_redshell, 60}, + {IT_STRING | IT_CVAR, NULL, "Triple Green Shell", &cv_r_triplegreenshell, 70}, + {IT_STRING | IT_CVAR, NULL, "Bob-omb", &cv_r_bobomb, 80}, + {IT_STRING | IT_CVAR, NULL, "Blue Shell", &cv_r_blueshell, 90}, + {IT_STRING | IT_CVAR, NULL, "Toss-Feather", &cv_r_tossfeather, 100}, + {IT_STRING | IT_CVAR, NULL, "Fire Flower", &cv_r_fireflower, 110}, + {IT_STRING | IT_CVAR, NULL, "Triple Red Shell", &cv_r_tripleredshell, 120}, + {IT_STRING | IT_CVAR, NULL, "Bowser Shell", &cv_r_bowsershell, 130}, + {IT_STRING | IT_CVAR, NULL, "Lightning", &cv_r_lightning, 140}, +}; +// SRB2kart Neo +static menuitem_t OP_KartNeoToggleMenu1[] = +{ + // Speed Items + {IT_STRING | IT_CVAR, NULL, "Magnet", &cv_n_magnet, 20}, + {IT_STRING | IT_CVAR, NULL, "Ghost", &cv_n_ghost, 30}, + {IT_STRING | IT_CVAR, NULL, "Speed Shoe", &cv_n_speedshoe, 40}, + {IT_STRING | IT_CVAR, NULL, "Triple Shoe", &cv_n_tripleshoe, 50}, + {IT_STRING | IT_CVAR, NULL, "Size-up", &cv_n_sizeup, 60}, + {IT_STRING | IT_CVAR, NULL, "Rocket Shoe", &cv_n_rocketshoe, 70}, + {IT_STRING | IT_CVAR, NULL, "Invincibility", &cv_n_invincibility, 80}, +}; +static menuitem_t OP_KartNeoToggleMenu2[] = +{ + // Attack Items + {IT_STRING | IT_CVAR, NULL, "Triple Banana", &cv_n_triplebanana, 20}, + {IT_STRING | IT_CVAR, NULL, "Fake Monitor", &cv_n_fakemonitor, 30}, + {IT_STRING | IT_CVAR, NULL, "Banana", &cv_n_banana, 40}, + {IT_STRING | IT_CVAR, NULL, "Orbit Spike", &cv_n_orbitspike, 50}, + {IT_STRING | IT_CVAR, NULL, "Jaws", &cv_n_jaws, 60}, + {IT_STRING | IT_CVAR, NULL, "Laser Wisp", &cv_n_laserwisp, 70}, + {IT_STRING | IT_CVAR, NULL, "Triple Orbit Spike", &cv_n_tripleorbitspike, 80}, + {IT_STRING | IT_CVAR, NULL, "Mine", &cv_n_mine, 90}, + {IT_STRING | IT_CVAR, NULL, "Deton", &cv_n_deton, 100}, + {IT_STRING | IT_CVAR, NULL, "Double Jaws", &cv_n_doublejaws, 110}, + {IT_STRING | IT_CVAR, NULL, "Spring", &cv_n_spring, 120}, + {IT_STRING | IT_CVAR, NULL, "GHZ Wrecking Ball", &cv_n_ghzwrecker, 130}, + {IT_STRING | IT_CVAR, NULL, "Lightning", &cv_n_lightning, 140}, +}; +// + // ========================================================================== // ALL MENU DEFINITIONS GO HERE // ==========================================================================