diff --git a/libs/dll-binaries/i686/libopenmpt.dll b/libs/dll-binaries/i686/libopenmpt.dll index 479114bcd..b3fa2eeab 100644 Binary files a/libs/dll-binaries/i686/libopenmpt.dll and b/libs/dll-binaries/i686/libopenmpt.dll differ diff --git a/libs/dll-binaries/i686/openmpt-mpg123.dll b/libs/dll-binaries/i686/openmpt-mpg123.dll deleted file mode 100644 index 60bc3b958..000000000 Binary files a/libs/dll-binaries/i686/openmpt-mpg123.dll and /dev/null differ diff --git a/libs/dll-binaries/i686/openmpt-ogg.dll b/libs/dll-binaries/i686/openmpt-ogg.dll deleted file mode 100644 index 32df3461a..000000000 Binary files a/libs/dll-binaries/i686/openmpt-ogg.dll and /dev/null differ diff --git a/libs/dll-binaries/i686/openmpt-vorbis.dll b/libs/dll-binaries/i686/openmpt-vorbis.dll deleted file mode 100644 index bb154d167..000000000 Binary files a/libs/dll-binaries/i686/openmpt-vorbis.dll and /dev/null differ diff --git a/libs/dll-binaries/i686/openmpt-zlib.dll b/libs/dll-binaries/i686/openmpt-zlib.dll deleted file mode 100644 index 948bc80f5..000000000 Binary files a/libs/dll-binaries/i686/openmpt-zlib.dll and /dev/null differ diff --git a/libs/dll-binaries/x86_64/libopenmpt.dll b/libs/dll-binaries/x86_64/libopenmpt.dll index 05c4237a7..97f768a62 100644 Binary files a/libs/dll-binaries/x86_64/libopenmpt.dll and b/libs/dll-binaries/x86_64/libopenmpt.dll differ diff --git a/libs/dll-binaries/x86_64/openmpt-mpg123.dll b/libs/dll-binaries/x86_64/openmpt-mpg123.dll deleted file mode 100644 index c917604df..000000000 Binary files a/libs/dll-binaries/x86_64/openmpt-mpg123.dll and /dev/null differ diff --git a/libs/dll-binaries/x86_64/openmpt-ogg.dll b/libs/dll-binaries/x86_64/openmpt-ogg.dll deleted file mode 100644 index de503b03f..000000000 Binary files a/libs/dll-binaries/x86_64/openmpt-ogg.dll and /dev/null differ diff --git a/libs/dll-binaries/x86_64/openmpt-vorbis.dll b/libs/dll-binaries/x86_64/openmpt-vorbis.dll deleted file mode 100644 index 5f21dee26..000000000 Binary files a/libs/dll-binaries/x86_64/openmpt-vorbis.dll and /dev/null differ diff --git a/libs/dll-binaries/x86_64/openmpt-zlib.dll b/libs/dll-binaries/x86_64/openmpt-zlib.dll deleted file mode 100644 index 1ae938ff7..000000000 Binary files a/libs/dll-binaries/x86_64/openmpt-zlib.dll and /dev/null differ diff --git a/libs/libopenmpt/SRB2NOTE.md b/libs/libopenmpt/SRB2NOTE.md new file mode 100644 index 000000000..95541107c --- /dev/null +++ b/libs/libopenmpt/SRB2NOTE.md @@ -0,0 +1,54 @@ +# libopenmpt mingw-w64 binary info + +Current built version as of 2019/01/03 is 0.4.0+r11103.pkg + +mingw binaries (.dll): `bin/[x86 or x86_64]/mingw` +mingw import libraries (.dll.a): `lib/[x86 or x86_64]/mingw` + +# Building libopenmpt with mingw-w64 + +libopenmpt must be built from the Makefile / Android dev package in the +[Downloads page](https://lib.openmpt.org/libopenmpt/download/#all-downloads) + +Use the mingw-w64 distributions from +[SourceForge](https://sourceforge.net/projects/mingw-w64/files/#readme). + +You can download the appropriate 7-zip archive, extract to a folder of +your choice, remove any existing mingw directories from your PATH, +then call `mingw32-make.exe` from its direct location. + +FOR LIBOPENMPT, YOU MUST USE A MINGW PACKAGE THAT SUPPORTS THE POSIX +THREADING MODEL! DO NOT COMPILE WITH A WIN32 THREADING MODEL! + +I use GCC 7.3.0: + +* [x86_64-posix-seh](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/7.3.0/threads-posix/seh/x86_64-7.3.0-release-posix-seh-rt_v5-rev0.7z) +* [i686-posix-dwarf](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/7.3.0/threads-posix/dwarf/i686-7.3.0-release-posix-dwarf-rt_v5-rev0.7z) + +## x86 build instructions + +``` +set CFLAGS=-march=pentium -static-libgcc +set CXXFLAGS=-march=pentium -static-libgcc -static-libstdc++ +set LDFLAGS=-Wl,--out-implib,bin/libopenmpt.dll.a -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,-Bdynamic,--no-whole-archive + +cd [libopenmpt-make-src] +[x86-mingw-w64-bin]/mingw32-make.exe CONFIG=mingw64-win32 +``` + +`libopenmpt.dll` and `libopenmpt.dll.a` will be built in the +`bin/` folder. + +## x86_64 build instructions + +``` +set CFLAGS=-march=nocona -static-libgcc +set CXXFLAGS=-march=nocona -static-libgcc -static-libstdc++ +set LDFLAGS=-Wl,--out-implib,bin/libopenmpt.dll.a -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,-Bdynamic,--no-whole-archive + +cd [libopenmpt-make-src] +[x86_64-mingw-w64-bin]/mingw32-make.exe CONFIG=mingw64-win64 +``` + +`libopenmpt.dll` and `libopenmpt.dll.a` will be built in the +`bin/` folder. \ No newline at end of file diff --git a/libs/libopenmpt/inc/libopenmpt/libopenmpt.h b/libs/libopenmpt/inc/libopenmpt/libopenmpt.h index 912cf04da..88425b5bb 100644 --- a/libs/libopenmpt/inc/libopenmpt/libopenmpt.h +++ b/libs/libopenmpt/inc/libopenmpt/libopenmpt.h @@ -1421,7 +1421,7 @@ LIBOPENMPT_API const char * openmpt_module_highlight_pattern_row_channel( openmp * - subsong (integer): The current subsong. Setting it has identical semantics as openmpt_module_select_subsong(), getting it returns the currently selected subsong. * - play.at_end (text): Chooses the behaviour when the end of song is reached. The song end is considered to be reached after the number of reptitions set by openmpt_module_set_repeat_count was played, so if the song is set to repeat infinitely, its end is never considered to be reached. * - "fadeout": Fades the module out for a short while. Subsequent reads after the fadeout will return 0 rendered frames. - * - "continue": Returns 0 rendered frames when the song end is reached. Subsequent reads will continue playing from the loop start (if the song is not programmed to loop, playback resumsed from the song start). + * - "continue": Returns 0 rendered frames when the song end is reached. Subsequent reads will continue playing from the loop start (if the song is not programmed to loop, playback resumed from the song start). * - "stop": Returns 0 rendered frames when the song end is reached. Subsequent reads will return 0 rendered frames. * - play.tempo_factor (floatingpoint): Set a floating point tempo factor. "1.0" is the default tempo. * - play.pitch_factor (floatingpoint): Set a floating point pitch factor. "1.0" is the default pitch. diff --git a/libs/libopenmpt/inc/libopenmpt/libopenmpt.hpp b/libs/libopenmpt/inc/libopenmpt/libopenmpt.hpp index 69784e8ea..35b19a9e5 100644 --- a/libs/libopenmpt/inc/libopenmpt/libopenmpt.hpp +++ b/libs/libopenmpt/inc/libopenmpt/libopenmpt.hpp @@ -1074,7 +1074,7 @@ public: - subsong (integer): The current subsong. Setting it has identical semantics as openmpt::module::select_subsong(), getting it returns the currently selected subsong. - play.at_end (text): Chooses the behaviour when the end of song is reached. The song end is considered to be reached after the number of reptitions set by openmpt::module::set_repeat_count was played, so if the song is set to repeat infinitely, its end is never considered to be reached. - "fadeout": Fades the module out for a short while. Subsequent reads after the fadeout will return 0 rendered frames. - - "continue": Returns 0 rendered frames when the song end is reached. Subsequent reads will continue playing from the loop start (if the song is not programmed to loop, playback resumsed from the song start). + - "continue": Returns 0 rendered frames when the song end is reached. Subsequent reads will continue playing from the loop start (if the song is not programmed to loop, playback resumed from the song start). - "stop": Returns 0 rendered frames when the song end is reached. Subsequent reads will return 0 rendered frames. - play.tempo_factor (floatingpoint): Set a floating point tempo factor. "1.0" is the default tempo. - play.pitch_factor (floatingpoint): Set a floating point pitch factor. "1.0" is the default pitch. diff --git a/libs/libopenmpt/inc/libopenmpt/libopenmpt_version.h b/libs/libopenmpt/inc/libopenmpt/libopenmpt_version.h index d006c9ed3..08ff71169 100644 --- a/libs/libopenmpt/inc/libopenmpt/libopenmpt_version.h +++ b/libs/libopenmpt/inc/libopenmpt/libopenmpt_version.h @@ -21,7 +21,7 @@ /*! \brief libopenmpt minor version number */ #define OPENMPT_API_VERSION_MINOR 7 /*! \brief libopenmpt patch version number */ -#define OPENMPT_API_VERSION_PATCH 3 +#define OPENMPT_API_VERSION_PATCH 5 /*! \brief libopenmpt pre-release tag */ #define OPENMPT_API_VERSION_PREREL "" /*! \brief libopenmpt pre-release flag */ diff --git a/libs/libopenmpt/lib/x86/libopenmpt.lib b/libs/libopenmpt/lib/x86/libopenmpt.lib index 6f42fb2b0..5cc0d1ab9 100644 Binary files a/libs/libopenmpt/lib/x86/libopenmpt.lib and b/libs/libopenmpt/lib/x86/libopenmpt.lib differ diff --git a/libs/libopenmpt/lib/x86/mingw/libopenmpt.dll.a b/libs/libopenmpt/lib/x86/mingw/libopenmpt.dll.a new file mode 100644 index 000000000..4b1d695e7 Binary files /dev/null and b/libs/libopenmpt/lib/x86/mingw/libopenmpt.dll.a differ diff --git a/libs/libopenmpt/lib/x86_64/libopenmpt.lib b/libs/libopenmpt/lib/x86_64/libopenmpt.lib index e2d30a94d..7699529fb 100644 Binary files a/libs/libopenmpt/lib/x86_64/libopenmpt.lib and b/libs/libopenmpt/lib/x86_64/libopenmpt.lib differ diff --git a/libs/libopenmpt/lib/x86_64/mingw/libopenmpt.dll.a b/libs/libopenmpt/lib/x86_64/mingw/libopenmpt.dll.a new file mode 100644 index 000000000..19e90d8c0 Binary files /dev/null and b/libs/libopenmpt/lib/x86_64/mingw/libopenmpt.dll.a differ diff --git a/srb2.png b/srb2.png index fccde9c3f..682809888 100644 Binary files a/srb2.png and b/srb2.png differ diff --git a/src/d_main.c b/src/d_main.c index 10fdd380c..34b940494 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -69,6 +69,7 @@ #include "filesrch.h" // refreshdirmenu, pathisdirectory #include "d_protocol.h" #include "m_perfstats.h" +#include "k_kart.h" #include "lua_script.h" @@ -1073,8 +1074,14 @@ static boolean AddIWAD(void) // extra graphic patches for saturn specific thingies boolean found_extra_kart; boolean found_extra2_kart; +boolean found_extra3_kart; -boolean snw_speedo; // snowy speedometer check +boolean xtra_speedo; // extra speedometer check +boolean xtra_speedo_clr; // extra speedometer colour check +boolean xtra_speedo3; // 80x 11 extra speedometer check +boolean xtra_speedo_clr3; // 80x 11 extra speedometer colour check +boolean achi_speedo; // achiiro speedometer check +boolean achi_speedo_clr; // extra speedometer colour check boolean clr_hud; // colour hud check boolean big_lap; // bigger lap counter boolean big_lap_color; // bigger lap counter but colour @@ -1088,6 +1095,7 @@ static void IdentifyVersion(void) const char *srb2waddir = NULL; found_extra_kart = false; found_extra2_kart = false; + found_extra3_kart = false; #if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL) // change to the directory where 'srb2.srb' is found @@ -1145,6 +1153,11 @@ static void IdentifyVersion(void) D_AddFile(va(pandf,srb2waddir,"extra2.kart"), startupwadfiles); found_extra2_kart = true; } + + if (FIL_ReadFileOK(va(pandf,srb2waddir,"extra3.kart"))) { + D_AddFile(va(pandf,srb2waddir,"extra3.kart"), startupwadfiles); + found_extra3_kart = true; + } #if !defined (HAVE_SDL) || defined (HAVE_MIXER) #define MUSICTEST(str) \ @@ -1435,6 +1448,11 @@ void D_SRB2Main(void) #endif //ifndef DEVELOP + // Possible value that changes depending on whether required files for speedometer are found or not + CV_PossibleValue_t speedo_cons_temp[NUMSPEEDOSTUFF] = {{1, "Default"}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}, {0, NULL}}; + unsigned last_speedo_i = 0; +#define PUSHSPEEDO(id, name) { ++last_speedo_i; speedo_cons_temp[last_speedo_i].value = id; speedo_cons_temp[last_speedo_i].strvalue = name; } + if (found_extra_kart || found_extra2_kart) // found the funny, add it in! { // HAYA: These are seperated for a reason lmao @@ -1443,9 +1461,25 @@ void D_SRB2Main(void) if (found_extra2_kart) mainwads++; - // now check for speedometer stuff + // now check for extra speedometer stuff if (W_CheckMultipleLumps("SP_SMSTC", "K_TRNULL", "SP_MKMH", "SP_MMPH", "SP_MFRAC", "SP_MPERC", NULL)) - snw_speedo = true; + { + xtra_speedo = true; + PUSHSPEEDO(2, "Small"); + } + + if (W_CheckMultipleLumps("SC_SMSTC", NULL)) + xtra_speedo_clr = true; + + // now check for achii speedometer stuff + if (W_CheckMultipleLumps("SP_AMSTC", "K_TRNULL", "SP_AKMH", "SP_AMPH", "SP_AFRAC", "SP_APERC", NULL)) + { + achi_speedo = true; + PUSHSPEEDO(3, "Achii"); + } + + if (W_CheckMultipleLumps("SC_AMSTC", "K_TRNULL", "SC_AKMH", "SC_AMPH", "SC_AFRAC", "SC_APERC", NULL)) + achi_speedo_clr = true; // check for bigger lap count if (W_CheckMultipleLumps("K_STLAPB", "K_STLA2B", NULL)) @@ -1453,7 +1487,7 @@ void D_SRB2Main(void) // now check for colour hud stuff if (W_CheckMultipleLumps("K_SCTIME", "K_SCTIMW", "K_SCLAPS", "K_SCLAPW", \ - "K_SCBALN", "K_SCBALW", "K_SCKARM", "K_SCTOUT", "K_ISMULC", "K_ITMULC", "K_ITBC","K_ITBCD", "K_ISBC", "K_ISBCD", NULL)) + "K_SCBALN", "K_SCBALW", "K_SCKARM", "K_SCTOUT", "K_ISMULC", "K_ITMULC", "K_ITBC", "K_ITBCD", "K_ISBC", "K_ISBCD", NULL)) clr_hud = true; // check for bigger lap count but color** its color bitch @@ -1464,8 +1498,11 @@ void D_SRB2Main(void) if (W_CheckMultipleLumps("K_KZSP1", "K_KZSP2", "K_KZSP3", "K_KZSP4", "K_KZSP5", \ "K_KZSP6", "K_KZSP7", "K_KZSP8", "K_KZSP9", "K_KZSP10", "K_KZSP11", "K_KZSP12", \ "K_KZSP13", "K_KZSP14", "K_KZSP15", "K_KZSP16", "K_KZSP17", "K_KZSP18", "K_KZSP19", \ - "K_KZSP20", "K_KZSP21", "K_KZSP22", "K_KZSP23", "K_KZSP24", "K_KZSP25", NULL)) + "K_KZSP20", "K_KZSP21", "K_KZSP22", "K_KZSP23", "K_KZSP24", "K_KZSP25", NULL)) + { kartzspeedo = true; + PUSHSPEEDO(4, "P-Meter"); + } // stat display for extended player setup if (W_CheckMultipleLumps("K_STATNB", "K_STATN1", "K_STATN2", "K_STATN3", "K_STATN4", \ @@ -1475,11 +1512,30 @@ void D_SRB2Main(void) // Nametag stuffs if (W_CheckMultipleLumps("NTLINE", "NTLINEV", "NTSP", "NTWH", NULL)) nametaggfx = true; - + if (W_CheckMultipleLumps("K_DGAU","K_DCAU","K_DGSU","K_DCSU", NULL)) driftgaugegfx = true; } + if (found_extra3_kart) + { + if (found_extra3_kart) + mainwads++; + + // 80x11 speedometer crap + if (W_CheckMultipleLumps("SP_SM3TC", NULL)) + { + xtra_speedo3 = true; + PUSHSPEEDO(5, "Extra"); + } + + if (W_CheckMultipleLumps("SC_SM3TC", NULL)) + xtra_speedo_clr3 = true; + } + +#undef PUSHSPEEDO + memcpy(speedo_cons_t, speedo_cons_temp, sizeof(speedo_cons_t)); + // // search for maps // diff --git a/src/d_main.h b/src/d_main.h index 2709dc389..23fb31619 100644 --- a/src/d_main.h +++ b/src/d_main.h @@ -27,8 +27,14 @@ extern char srb2path[256]; //Alam: SRB2's Home extern boolean found_extra_kart; // for use in k_kart.c extern boolean found_extra2_kart; // for use in k_kart.c +extern boolean found_extra3_kart; // for use in k_kart.c -extern boolean snw_speedo; // snowy speedometer check +extern boolean xtra_speedo; // extra speedometer check +extern boolean xtra_speedo_clr; // extra speedometer colour check +extern boolean xtra_speedo3; // 80x11 extra speedometer check +extern boolean xtra_speedo_clr3; // 80x11 extra speedometer colour check +extern boolean achi_speedo; // achiiro speedometer check +extern boolean achi_speedo_clr; // extra speedometer colour check extern boolean clr_hud; // colour hud check extern boolean big_lap; // bigger lap counter extern boolean big_lap_color; // bigger lap counter but colour diff --git a/src/doomdef.h b/src/doomdef.h index 248fbba39..208b6cc69 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -127,8 +127,8 @@ extern char logfilename[1024]; #else #define VERSION 1 // Game version #define SUBVERSION 6 // more precise version number -#define VERSIONSTRING "Saturn v5.1 " -#define VERSIONSTRINGW L"Saturn v5.1" +#define VERSIONSTRING "Saturn v6 " +#define VERSIONSTRINGW L"Saturn v6" // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates! // And change CMakeLists.txt (not src/, but in root), for CMake users! // AND appveyor.yml, for the build bots! diff --git a/src/g_game.c b/src/g_game.c index 5d9f35038..42cde4b0e 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -182,12 +182,8 @@ boolean gamedataloaded = false; // Time attack data for levels // These are dynamically allocated for space reasons now recorddata_t *mainrecords[NUMMAPS] = {NULL}; -//nightsdata_t *nightsrecords[NUMMAPS] = {NULL}; UINT8 mapvisited[NUMMAPS]; -// Temporary holding place for nights data for the current map -//nightsdata_t ntemprecords; - UINT32 bluescore, redscore; // CTF and Team Match team scores // ring count... for PERFECT! @@ -386,10 +382,6 @@ static CV_PossibleValue_t deadzone_cons_t[] = {{FRACUNIT/16, "MIN"}, {FRACUNIT, // don't mind me putting these here, I was lazy to figure out where else I could put those without blowing up the compiler. -// it automatically becomes compact with 20+ players, but if you like it, I guess you can turn that on! -// SRB2Kart: irrelevant for us. -//consvar_t cv_compactscoreboard= {"compactscoreboard", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; - // chat timer thingy static CV_PossibleValue_t chattime_cons_t[] = {{1, "MIN"}, {999, "MAX"}, {0, NULL}}; consvar_t cv_chattime = {"chattime", "8", CV_SAVE, chattime_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; @@ -568,13 +560,6 @@ void G_AllocMainRecordData(INT16 i) memset(mainrecords[i], 0, sizeof(recorddata_t)); } -/*void G_AllocNightsRecordData(INT16 i) -{ - if (!nightsrecords[i]) - nightsrecords[i] = Z_Malloc(sizeof(nightsdata_t), PU_STATIC, NULL); - memset(nightsrecords[i], 0, sizeof(nightsdata_t)); -}*/ - // MAKE SURE YOU SAVE DATA BEFORE CALLING THIS void G_ClearRecords(void) { @@ -586,11 +571,6 @@ void G_ClearRecords(void) Z_Free(mainrecords[i]); mainrecords[i] = NULL; } - /*if (nightsrecords[i]) - { - Z_Free(nightsrecords[i]); - nightsrecords[i] = NULL; - }*/ } } @@ -611,170 +591,6 @@ tic_t G_GetBestTime(INT16 map) return mainrecords[map-1]->time; } -// Not needed -/*tic_t G_GetBestLap(INT16 map) -{ - if (!mainrecords[map-1] || mainrecords[map-1]->lap <= 0) - return (tic_t)UINT32_MAX; - - return mainrecords[map-1]->lap; -}*/ - -/*UINT16 G_GetBestRings(INT16 map) -{ - if (!mainrecords[map-1]) - return 0; - - return mainrecords[map-1]->rings; -}*/ - -// No NiGHTS records for SRB2Kart -/*UINT32 G_GetBestNightsScore(INT16 map, UINT8 mare) -{ - if (!nightsrecords[map-1]) - return 0; - - return nightsrecords[map-1]->score[mare]; -} - -tic_t G_GetBestNightsTime(INT16 map, UINT8 mare) -{ - if (!nightsrecords[map-1] || nightsrecords[map-1]->time[mare] <= 0) - return (tic_t)UINT32_MAX; - - return nightsrecords[map-1]->time[mare]; -} - -UINT8 G_GetBestNightsGrade(INT16 map, UINT8 mare) -{ - if (!nightsrecords[map-1]) - return 0; - - return nightsrecords[map-1]->grade[mare]; -} - -// For easy adding of NiGHTS records -void G_AddTempNightsRecords(UINT32 pscore, tic_t ptime, UINT8 mare) -{ - ntemprecords.score[mare] = pscore; - ntemprecords.grade[mare] = P_GetGrade(pscore, gamemap, mare - 1); - ntemprecords.time[mare] = ptime; - - // Update nummares - // Note that mare "0" is overall, mare "1" is the first real mare - if (ntemprecords.nummares < mare) - ntemprecords.nummares = mare; -} - -void G_SetNightsRecords(void) -{ - INT32 i; - UINT32 totalscore = 0; - tic_t totaltime = 0; - - const size_t glen = strlen(srb2home)+1+strlen("replay")+1+strlen(timeattackfolder)+1+strlen("MAPXX")+1; - char *gpath; - char lastdemo[256], bestdemo[256]; - - if (!ntemprecords.nummares) - return; - - // Set overall - { - UINT8 totalrank = 0, realrank = 0; - - for (i = 1; i <= ntemprecords.nummares; ++i) - { - totalscore += ntemprecords.score[i]; - totalrank += ntemprecords.grade[i]; - totaltime += ntemprecords.time[i]; - } - - // Determine overall grade - realrank = (UINT8)((FixedDiv((fixed_t)totalrank << FRACBITS, ntemprecords.nummares << FRACBITS) + (FRACUNIT/2)) >> FRACBITS); - - // You need ALL rainbow As to get a rainbow A overall - if (realrank == GRADE_S && (totalrank / ntemprecords.nummares) != GRADE_S) - realrank = GRADE_A; - - ntemprecords.score[0] = totalscore; - ntemprecords.grade[0] = realrank; - ntemprecords.time[0] = totaltime; - } - - // Now take all temp records and put them in the actual records - { - nightsdata_t *maprecords; - - if (!nightsrecords[gamemap-1]) - G_AllocNightsRecordData(gamemap-1); - maprecords = nightsrecords[gamemap-1]; - - if (maprecords->nummares != ntemprecords.nummares) - maprecords->nummares = ntemprecords.nummares; - - for (i = 0; i < ntemprecords.nummares + 1; ++i) - { - if (maprecords->score[i] < ntemprecords.score[i]) - maprecords->score[i] = ntemprecords.score[i]; - if (maprecords->grade[i] < ntemprecords.grade[i]) - maprecords->grade[i] = ntemprecords.grade[i]; - if (!maprecords->time[i] || maprecords->time[i] > ntemprecords.time[i]) - maprecords->time[i] = ntemprecords.time[i]; - } - } - - memset(&ntemprecords, 0, sizeof(nightsdata_t)); - - // Save demo! - bestdemo[255] = '\0'; - lastdemo[255] = '\0'; - G_SetDemoTime(totaltime, totalscore); - G_CheckDemoStatus(); - - I_mkdir(va("%s"PATHSEP"replay", srb2home), 0755); - I_mkdir(va("%s"PATHSEP"replay"PATHSEP"%s", srb2home, timeattackfolder), 0755); - - if ((gpath = malloc(glen)) == NULL) - I_Error("Out of memory for replay filepath\n"); - - sprintf(gpath,"%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s", srb2home, timeattackfolder, G_BuildMapName(gamemap)); - snprintf(lastdemo, 255, "%s-last.lmp", gpath); - - if (FIL_FileExists(lastdemo)) - { - UINT8 *buf; - size_t len = FIL_ReadFile(lastdemo, &buf); - - snprintf(bestdemo, 255, "%s-time-best.lmp", gpath); - if (!FIL_FileExists(bestdemo) || G_CmpDemoTime(bestdemo, lastdemo) & 1) - { // Better time, save this demo. - if (FIL_FileExists(bestdemo)) - remove(bestdemo); - FIL_WriteFile(bestdemo, buf, len); - CONS_Printf("\x83%s\x80 %s '%s'\n", M_GetText("NEW RECORD TIME!"), M_GetText("Saved replay as"), bestdemo); - } - - snprintf(bestdemo, 255, "%s-score-best.lmp", gpath); - if (!FIL_FileExists(bestdemo) || (G_CmpDemoTime(bestdemo, lastdemo) & (1<<1))) - { // Better score, save this demo. - if (FIL_FileExists(bestdemo)) - remove(bestdemo); - FIL_WriteFile(bestdemo, buf, len); - CONS_Printf("\x83%s\x80 %s '%s'\n", M_GetText("NEW HIGH SCORE!"), M_GetText("Saved replay as"), bestdemo); - } - - //CONS_Printf("%s '%s'\n", M_GetText("Saved replay as"), lastdemo); - - Z_Free(buf); - } - free(gpath); - - // If the mare count changed, this will update the score display - CV_AddValue(&cv_nextmap, 1); - CV_AddValue(&cv_nextmap, -1); -}*/ - // for consistency among messages: this modifies the game and removes savemoddata. void G_SetGameModified(boolean silent, boolean major) { @@ -2127,31 +1943,6 @@ boolean G_CouldView(INT32 playernum) return false; } - // SRB2Kart: we have no team-based modes, YET... - /*if (G_GametypeHasTeams()) - { - if (players[consoleplayer].ctfteam - && player->ctfteam != players[consoleplayer].ctfteam) - return false; - } - else if (gametype == GT_HIDEANDSEEK) - { - if (players[consoleplayer].pflags & PF_TAGIT) - return false; - } - // Other Tag-based gametypes? - else if (G_TagGametype()) - { - if (!players[consoleplayer].spectator - && (players[consoleplayer].pflags & PF_TAGIT) != (player->pflags & PF_TAGIT)) - return false; - } - else if (G_GametypeHasSpectators() && G_BattleGametype()) - { - if (!players[consoleplayer].spectator) - return false; - }*/ - return true; } @@ -2859,39 +2650,7 @@ void G_PlayerReborn(INT32 player) p->maxlink = 0; // If NiGHTS, find lowest mare to start with. - p->mare = 0; /*P_FindLowestMare(); - - CONS_Debug(DBG_NIGHTS, M_GetText("Current mare is %d\n"), p->mare); - - if (p->mare == 255) - p->mare = 0;*/ - - // Check to make sure their color didn't change somehow... - /*if (G_GametypeHasTeams()) - { - if (p->ctfteam == 1 && p->skincolor != skincolor_redteam) - { - if (p == &players[consoleplayer]) - CV_SetValue(&cv_playercolor, skincolor_redteam); - else if (p == &players[displayplayers[1]]) - CV_SetValue(&cv_playercolor2, skincolor_redteam); - else if (p == &players[displayplayers[2]]) - CV_SetValue(&cv_playercolor3, skincolor_redteam); - else if (p == &players[displayplayers[3]]) - CV_SetValue(&cv_playercolor4, skincolor_redteam); - } - else if (p->ctfteam == 2 && p->skincolor != skincolor_blueteam) - { - if (p == &players[consoleplayer]) - CV_SetValue(&cv_playercolor, skincolor_blueteam); - else if (p == &players[displayplayers[1]]) - CV_SetValue(&cv_playercolor2, skincolor_blueteam); - else if (p == &players[displayplayers[2]]) - CV_SetValue(&cv_playercolor3, skincolor_blueteam); - else if (p == &players[displayplayers[3]]) - CV_SetValue(&cv_playercolor4, skincolor_blueteam); - } - }*/ + p->mare = 0; } // @@ -3405,12 +3164,8 @@ INT32 G_GetGametypeByName(const char *gametypestr) // boolean G_IsSpecialStage(INT32 mapnum) { -#if 0 - return (gametype == GT_COOP && modeattacking != ATTACKING_RECORD && mapnum >= sstage_start && mapnum <= sstage_end); -#else (void)mapnum; return false; -#endif } // @@ -3422,17 +3177,7 @@ boolean G_IsSpecialStage(INT32 mapnum) boolean G_GametypeUsesLives(void) { // SRB2kart NEEDS no lives -#if 0 - // Coop, Competitive - if ((gametype == GT_COOP || gametype == GT_COMPETITION) - && !modeattacking // No lives in Time Attack - //&& !G_IsSpecialStage(gamemap) - && !(maptol & TOL_NIGHTS)) // No lives in NiGHTS - return true; return false; -#else - return false; -#endif } // @@ -4141,11 +3886,6 @@ void G_LoadGameData(void) //For records tic_t rectime; tic_t reclap; - //UINT32 recscore; - //UINT16 recrings; - - //UINT8 recmares; - //INT32 curmare; // Clear things so previously read gamedata doesn't transfer // to new gamedata @@ -4236,43 +3976,15 @@ void G_LoadGameData(void) { rectime = (tic_t)READUINT32(save_p); reclap = (tic_t)READUINT32(save_p); - //recscore = READUINT32(save_p); - //recrings = READUINT16(save_p); - - /*if (recrings > 10000 || recscore > MAXSCORE) - goto datacorrupt;*/ if (rectime || reclap) { G_AllocMainRecordData((INT16)i); mainrecords[i]->time = rectime; mainrecords[i]->lap = reclap; - //mainrecords[i]->score = recscore; - //mainrecords[i]->rings = recrings; } } - // Nights records - /*for (i = 0; i < NUMMAPS; ++i) - { - if ((recmares = READUINT8(save_p)) == 0) - continue; - - G_AllocNightsRecordData((INT16)i); - - for (curmare = 0; curmare < (recmares+1); ++curmare) - { - nightsrecords[i]->score[curmare] = READUINT32(save_p); - nightsrecords[i]->grade[curmare] = READUINT8(save_p); - nightsrecords[i]->time[curmare] = (tic_t)READUINT32(save_p); - - if (nightsrecords[i]->grade[curmare] > GRADE_S) - goto datacorrupt; - } - - nightsrecords[i]->nummares = recmares; - }*/ - // done Z_Free(savebuffer); save_p = NULL; @@ -4372,7 +4084,6 @@ void G_SaveGameData(boolean force) WRITEUINT32(save_p, timesBeaten); WRITEUINT32(save_p, timesBeatenWithEmeralds); - //WRITEUINT32(save_p, timesBeatenUltimate); // Main records for (i = 0; i < NUMMAPS; i++) @@ -4381,8 +4092,6 @@ void G_SaveGameData(boolean force) { WRITEUINT32(save_p, mainrecords[i]->time); WRITEUINT32(save_p, mainrecords[i]->lap); - //WRITEUINT32(save_p, mainrecords[i]->score); - //WRITEUINT16(save_p, mainrecords[i]->rings); } else { @@ -4391,25 +4100,6 @@ void G_SaveGameData(boolean force) } } - // NiGHTS records - /*for (i = 0; i < NUMMAPS; i++) - { - if (!nightsrecords[i] || !nightsrecords[i]->nummares) - { - WRITEUINT8(save_p, 0); - continue; - } - - WRITEUINT8(save_p, nightsrecords[i]->nummares); - - for (curmare = 0; curmare < (nightsrecords[i]->nummares + 1); ++curmare) - { - WRITEUINT32(save_p, nightsrecords[i]->score[curmare]); - WRITEUINT8(save_p, nightsrecords[i]->grade[curmare]); - WRITEUINT32(save_p, nightsrecords[i]->time[curmare]); - } - }*/ - length = save_p - savebuffer; FIL_WriteFile(va(pandf, srb2home, gamedatafilename), savebuffer, length); @@ -4701,28 +4391,7 @@ void G_InitNew(UINT8 pencoremode, const char *mapname, boolean resetplayer, bool players[i].playerstate = PST_REBORN; players[i].starpostangle = players[i].starpostnum = players[i].starposttime = 0; players[i].starpostx = players[i].starposty = players[i].starpostz = 0; - -#if 0 - if (netgame || multiplayer) - { - players[i].lives = cv_startinglives.value; - players[i].continues = 0; - } - else if (pultmode) - { - players[i].lives = 1; - players[i].continues = 0; - } - else - { - players[i].lives = 3; - players[i].continues = 1; - } - - players[i].xtralife = 0; -#else players[i].lives = 1; // SRB2Kart -#endif // The latter two should clear by themselves, but just in case players[i].pflags &= ~(PF_TAGIT|PF_TAGGED|PF_FULLSTASIS); @@ -5674,7 +5343,7 @@ void G_WriteGhostTic(mobj_t *ghost, INT32 playernum) ziptic_p = demo_p++; // the ziptic, written at the end of this function - #define MAXMOM (0x7FFF<<8) +#define MAXMOM (0x7FFF<<8) // GZT_XYZ is only useful if you've moved 256 FRACUNITS or more in a single tic. if (abs(ghost->x-oldghost[playernum].x) > MAXMOM @@ -5729,7 +5398,7 @@ void G_WriteGhostTic(mobj_t *ghost, INT32 playernum) oldghost[playernum].z += oldghost[playernum].momz<<8; } - #undef MAXMOM +#undef MAXMOM // Only store the 8 most relevant bits of angle // because exact values aren't too easy to discern to begin with when only 8 angles have different sprites @@ -6820,11 +6489,6 @@ void G_BeginRecording(void) WRITEUINT32(demo_p,UINT32_MAX); // time WRITEUINT32(demo_p,UINT32_MAX); // lap break; - /*case ATTACKING_NIGHTS: // 2 - demotime_p = demo_p; - WRITEUINT32(demo_p,UINT32_MAX); // time - WRITEUINT32(demo_p,0); // score - break;*/ default: // 3 break; } @@ -6975,12 +6639,6 @@ void G_SetDemoTime(UINT32 ptime, UINT32 plap) WRITEUINT32(demotime_p, plap); demotime_p = NULL; } - /*else if (demoflags & DF_NIGHTSATTACK) - { - WRITEUINT32(demotime_p, ptime); - WRITEUINT32(demotime_p, pscore); - demotime_p = NULL; - }*/ } static void G_LoadDemoExtraFiles(UINT8 **pp) @@ -7192,11 +6850,6 @@ UINT8 G_CmpDemoTime(char *oldname, char *newname) newtime = READUINT32(p); newlap = READUINT32(p); } - /*else if (flags & DF_NIGHTSATTACK) - { - newtime = READUINT32(p); - newscore = READUINT32(p); - }*/ else // appease compiler return 0; @@ -7262,11 +6915,6 @@ UINT8 G_CmpDemoTime(char *oldname, char *newname) oldtime = READUINT32(p); oldlap = READUINT32(p); } - /*else if (flags & DF_NIGHTSATTACK) - { - oldtime = READUINT32(p); - oldscore = READUINT32(p); - }*/ else // appease compiler return UINT8_MAX; @@ -7409,13 +7057,6 @@ void G_LoadDemoInfo(menudemo_t *pdemo) if (pdemoflags & DF_ENCORE) pdemo->kartspeed |= DF_ENCORE; - /*// Temporary info until this is actually present in replays. - (void)extrainfo_p; - sprintf(pdemo->winnername, "transrights420"); - pdemo->winnerskin = 1; - pdemo->winnercolor = SKINCOLOR_MOONSLAM; - pdemo->winnertime = 6666;*/ - // Read standings! count = 0; @@ -7705,10 +7346,6 @@ void G_DoPlayDemo(char *defdemoname) hu_demotime = READUINT32(demo_p); hu_demolap = READUINT32(demo_p); break; - /*case ATTACKING_NIGHTS: // 2 - hu_demotime = READUINT32(demo_p); - hu_demoscore = READUINT32(demo_p); - break;*/ default: // 3 modeattacking = ATTACKING_NONE; break; @@ -8375,9 +8012,6 @@ void G_UpdateStaffGhostName(lumpnum_t l) case ATTACKING_RECORD: // 1 p += 8; // demo time, lap break; - /*case ATTACKING_NIGHTS: // 2 - p += 8; // demo time left, score - break;*/ default: // 3 break; } diff --git a/src/hu_stuff.c b/src/hu_stuff.c index eb9fdfa92..d4d8c89a4 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -1992,8 +1992,6 @@ static void HU_DrawChat(void) // For anyone who, for some godforsaken reason, likes oldchat. - - static void HU_DrawChat_Old(void) { INT32 t = 0, c = 0, y = HU_INPUTY; @@ -2064,164 +2062,6 @@ static void HU_DrawChat_Old(void) } #endif -// draw the Crosshair, at the exact center of the view. -// -// Crosshairs are pre-cached at HU_Init - -/*static inline void HU_DrawCrosshair(void) -{ - INT32 i, x, y; - - i = cv_crosshair.value & 3; - if (!i) - return; - - if ((netgame || multiplayer) && players[displayplayers[0]].spectator) - return; - -#ifdef HWRENDER - if (rendermode != render_soft) - { - x = (INT32)gr_basewindowcenterx; - y = (INT32)gr_basewindowcentery; - } - else -#endif - { - x = viewwindowx + (viewwidth>>1); - y = viewwindowy + (viewheight>>1); - } - - V_DrawScaledPatch(x, y, V_NOSCALESTART|V_OFFSET|V_TRANSLUCENT, crosshair[i - 1]); -} - -static inline void HU_DrawCrosshair2(void) -{ - INT32 i, x, y; - - i = cv_crosshair2.value & 3; - if (!i) - return; - - if ((netgame || multiplayer) && players[displayplayers[1]].spectator) - return; - -#ifdef HWRENDER - if (rendermode != render_soft) - { - x = (INT32)gr_basewindowcenterx; - y = (INT32)gr_basewindowcentery; - } - else -#endif - { - x = viewwindowx + (viewwidth>>1); - y = viewwindowy + (viewheight>>1); - } - - if (splitscreen) - { - if (splitscreen > 1) -#ifdef HWRENDER - if (rendermode != render_soft) - x += (INT32)gr_viewwidth; - else -#endif - x += viewwidth; - else - { -#ifdef HWRENDER - if (rendermode != render_soft) - y += (INT32)gr_viewheight; - else -#endif - y += viewheight; - } - - V_DrawScaledPatch(x, y, V_NOSCALESTART|V_OFFSET|V_TRANSLUCENT, crosshair[i - 1]); - } -} - -static inline void HU_DrawCrosshair3(void) -{ - INT32 i, x, y; - - i = cv_crosshair3.value & 3; - if (!i) - return; - - if ((netgame || multiplayer) && players[displayplayers[2]].spectator) - return; - -#ifdef HWRENDER - if (rendermode != render_soft) - { - x = (INT32)gr_basewindowcenterx; - y = (INT32)gr_basewindowcentery; - } - else -#endif - { - x = viewwindowx + (viewwidth>>1); - y = viewwindowy + (viewheight>>1); - } - - if (splitscreen > 1) - { -#ifdef HWRENDER - if (rendermode != render_soft) - y += (INT32)gr_viewheight; - else -#endif - y += viewheight; - - V_DrawScaledPatch(x, y, V_NOSCALESTART|V_OFFSET|V_TRANSLUCENT, crosshair[i - 1]); - } -} - -static inline void HU_DrawCrosshair4(void) -{ - INT32 i, x, y; - - i = cv_crosshair4.value & 3; - if (!i) - return; - - if ((netgame || multiplayer) && players[displayplayers[3]].spectator) - return; - -#ifdef HWRENDER - if (rendermode != render_soft) - { - x = (INT32)gr_basewindowcenterx; - y = (INT32)gr_basewindowcentery; - } - else -#endif - { - x = viewwindowx + (viewwidth>>1); - y = viewwindowy + (viewheight>>1); - } - - if (splitscreen > 2) - { -#ifdef HWRENDER - if (rendermode != render_soft) - { - x += (INT32)gr_viewwidth; - y += (INT32)gr_viewheight; - } - else -#endif - { - x += viewwidth; - y += viewheight; - } - - V_DrawScaledPatch(x, y, V_NOSCALESTART|V_OFFSET|V_TRANSLUCENT, crosshair[i - 1]); - } -}*/ - static void HU_DrawCEcho(void) { INT32 i = 0; diff --git a/src/k_kart.c b/src/k_kart.c index 463b99dca..65bfdf248 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -75,7 +75,7 @@ IMPL_HUD_OFFSET(stat); // Stats consvar_t cv_showstats = {"showstats", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_showinput = {"showinput", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; -static CV_PossibleValue_t speedo_cons_t[] = {{1, "Default"}, {2, "Small"}, {3, "P-Meter"}, {0, NULL}}; +CV_PossibleValue_t speedo_cons_t[NUMSPEEDOSTUFF]; consvar_t cv_newspeedometer = {"newspeedometer", "Default", CV_SAVE, speedo_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; //hardcode saltyhop mhhm @@ -3217,18 +3217,6 @@ static void K_QuiteSaltyHop(player_t *p) } } -/*static INT32 K_FindPlayerNum(player_t *plyr) -{ - INT32 i; - - for(i = 0; i < 4; i++) - { - if (plyr == &players[displayplayers[i]]) - return i; - } - return 0; // technically defaulting to player 1 but fuck it -}*/ - #define SLOPEROLL_DIV 3 void K_RollMobjBySlopes(mobj_t* mo, boolean usedistance) @@ -3374,14 +3362,10 @@ void K_SpawnSparkleTrail(mobj_t *mo) sparkle = P_SpawnMobj(newx, newy, newz, MT_SPARKLETRAIL); K_FlipFromObject(sparkle, mo); - //if (i == 0) - //P_SetMobjState(sparkle, S_KARTINVULN_LARGE1); - P_SetTarget(&sparkle->target, mo); sparkle->destscale = mo->destscale; P_SetScale(sparkle, mo->scale); sparkle->color = mo->color; - //sparkle->colorized = mo->colorized; } P_SetMobjState(sparkle, S_KARTINVULN_LARGE1); @@ -6942,6 +6926,7 @@ static patch_t *kp_bumperstickerwideclr; static patch_t *kp_karmastickerclr; static patch_t *kp_timeoutstickerclr; static patch_t *skp_smallstickerclr; +static patch_t *skp_smallstickerclr3; static patch_t *kp_itemmulstickerclr[2]; static patch_t *kp_itembgclr[4]; @@ -7022,8 +7007,14 @@ static patch_t *driftgaugesmallcolor; static patch_t *kp_yougotem; static patch_t *skp_smallsticker; +static patch_t *skp_smallsticker3; static patch_t *skp_speedpatches[5]; +static patch_t *skp_smallstickerachi; +static patch_t *skp_speedpatchesachi[5]; +static patch_t *skp_smallstickerachiclr; +static patch_t *skp_speedpatchesachiclr[5]; + void K_LoadKartHUDGraphics(void) { INT32 i, j; @@ -7044,10 +7035,35 @@ void K_LoadKartHUDGraphics(void) kp_karmasticker = W_CachePatchName("K_STKARM", PU_HUDGFX); kp_splitkarmabomb = W_CachePatchName("K_SPTKRM", PU_HUDGFX); kp_timeoutsticker = W_CachePatchName("K_STTOUT", PU_HUDGFX); + + if (xtra_speedo) // snowy speedometer + { + skp_smallsticker = W_CachePatchName("SP_SMSTC", PU_HUDGFX); + skp_speedpatches[0] = W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd + skp_speedpatches[1] = W_CachePatchName("SP_MKMH", PU_HUDGFX); + skp_speedpatches[2] = W_CachePatchName("SP_MMPH", PU_HUDGFX); + skp_speedpatches[3] = W_CachePatchName("SP_MFRAC", PU_HUDGFX); + skp_speedpatches[4] = W_CachePatchName("SP_MPERC", PU_HUDGFX); + } + + if (xtra_speedo3) // 80x11 patch scaled to size + { + skp_smallsticker3 = W_CachePatchName("SP_SM3TC", PU_HUDGFX); + } + + if (achi_speedo) + { + skp_smallstickerachi = W_CachePatchName("SP_AMSTC", PU_HUDGFX); + skp_speedpatchesachi[0] = W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd + skp_speedpatchesachi[1] = W_CachePatchName("SP_AKMH", PU_HUDGFX); + skp_speedpatchesachi[2] = W_CachePatchName("SP_AMPH", PU_HUDGFX); + skp_speedpatchesachi[3] = W_CachePatchName("SP_AFRAC", PU_HUDGFX); + skp_speedpatchesachi[4] = W_CachePatchName("SP_APERC", PU_HUDGFX); + } if (big_lap){ - kp_lapstickerbig = W_CachePatchName("K_STLAPB", PU_HUDGFX); - kp_lapstickerbig2 = W_CachePatchName("K_STLA2B", PU_HUDGFX); + kp_lapstickerbig = W_CachePatchName("K_STLAPB", PU_HUDGFX); + kp_lapstickerbig2 = W_CachePatchName("K_STLA2B", PU_HUDGFX); } // Colourized hud @@ -7072,8 +7088,21 @@ void K_LoadKartHUDGraphics(void) kp_lapstickerbig2clr = W_CachePatchName("K_SCLA2B", PU_HUDGFX); } - if (snw_speedo) + if (xtra_speedo && xtra_speedo_clr) skp_smallstickerclr = W_CachePatchName("SC_SMSTC", PU_HUDGFX); + + if (xtra_speedo3 && xtra_speedo_clr3) // 80x11 patch scaled to size + skp_smallstickerclr3 = W_CachePatchName("SC_SM3TC", PU_HUDGFX); + + if (achi_speedo && achi_speedo_clr) + { + skp_smallstickerachiclr = W_CachePatchName("SC_AMSTC", PU_HUDGFX); + skp_speedpatchesachiclr[0] = W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd + skp_speedpatchesachiclr[1] = W_CachePatchName("SC_AKMH", PU_HUDGFX); + skp_speedpatchesachiclr[2] = W_CachePatchName("SC_AMPH", PU_HUDGFX); + skp_speedpatchesachiclr[3] = W_CachePatchName("SC_AFRAC", PU_HUDGFX); + skp_speedpatchesachiclr[4] = W_CachePatchName("SC_APERC", PU_HUDGFX); + } } // KartZ speedo @@ -7348,16 +7377,6 @@ void K_LoadKartHUDGraphics(void) } kp_yougotem = (patch_t *) W_CachePatchName("YOUGOTEM", PU_HUDGFX); - - if (snw_speedo) // snowy speedometer - { - skp_smallsticker = W_CachePatchName("SP_SMSTC", PU_HUDGFX); - skp_speedpatches[0] = W_CachePatchName("K_TRNULL", PU_HUDGFX); // lolxd - skp_speedpatches[1] = W_CachePatchName("SP_MKMH", PU_HUDGFX); - skp_speedpatches[2] = W_CachePatchName("SP_MMPH", PU_HUDGFX); - skp_speedpatches[3] = W_CachePatchName("SP_MFRAC", PU_HUDGFX); - skp_speedpatches[4] = W_CachePatchName("SP_MPERC", PU_HUDGFX); - } } // For the item toggle menu @@ -7748,7 +7767,7 @@ static void K_drawKartStats(void) //Internal offset for speedometer if (cv_kartspeedometer.value) { - if (cv_newspeedometer.value == 2 && snw_speedo) + if ((cv_newspeedometer.value == 2 && xtra_speedo) || (cv_newspeedometer.value == 3 && achi_speedo) || (cv_newspeedometer.value == 5 && xtra_speedo3)) spdoffset = -10; else spdoffset = -14; @@ -8746,7 +8765,7 @@ static void K_drawKartSpeedometer(void) } // man. - if ((cv_newspeedometer.value == 1) || (cv_newspeedometer.value == 2 && !snw_speedo) || (cv_newspeedometer.value == 3 && !kartzspeedo)) + if ((cv_newspeedometer.value == 1) || (cv_newspeedometer.value == 2 && !xtra_speedo) || (cv_newspeedometer.value == 3 && !achi_speedo) || (cv_newspeedometer.value == 4 && !kartzspeedo) || (cv_newspeedometer.value == 5 && !xtra_speedo3)) { switch (speedtype) { case 1: @@ -8759,7 +8778,7 @@ static void K_drawKartSpeedometer(void) V_DrawKartString(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, va("%3d fu/t", convSpeed)); break; case 4: // if extra.kart is found, use its included % symbol - if (!snw_speedo) + if (!xtra_speedo) V_DrawKartString(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, va("%4d P", convSpeed)); else V_DrawKartString(SPDM_X, SPDM_Y, V_HUDTRANS|splitflags, va("%4d %%", convSpeed)); @@ -8768,25 +8787,53 @@ static void K_drawKartSpeedometer(void) break; } } - else if (cv_newspeedometer.value == 2 && snw_speedo) // why bother if we dont? + else if (cv_newspeedometer.value == 2 && xtra_speedo) // why bother if we dont? { - if (!K_UseColorHud()) - V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, (V_HUDTRANS|splitflags), (skp_smallsticker)); - else //Colourized hud + if (K_UseColorHud() && xtra_speedo_clr) //Colourized hud { UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE); V_DrawMappedPatch(SPDM_X + 1, SPDM_Y + 4, (V_HUDTRANS|splitflags), (skp_smallstickerclr), colormap); } + else + V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, (V_HUDTRANS|splitflags), (skp_smallsticker)); V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed, 3, NULL); + V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatches[cv_kartspeedometer.value]); + } + else if (cv_newspeedometer.value == 3 && achi_speedo) // why bother if we dont? + { + if (K_UseColorHud() && achi_speedo_clr) //Colourized hud + { + UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE); + V_DrawMappedPatch(SPDM_X + 1, SPDM_Y + 4, (V_HUDTRANS|splitflags), (skp_smallstickerachiclr), colormap); + V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed, 3, NULL); + V_DrawMappedPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatchesachiclr[cv_kartspeedometer.value], colormap); + } + else + { + V_DrawScaledPatch(SPDM_X + 1, SPDM_Y + 4, (V_HUDTRANS|splitflags), (skp_smallstickerachi)); + V_DrawRankNum(SPDM_X + 26, SPDM_Y + 4, V_HUDTRANS|splitflags, convSpeed, 3, NULL); + V_DrawScaledPatch(SPDM_X + 31, SPDM_Y + 4, V_HUDTRANS|splitflags, skp_speedpatchesachi[cv_kartspeedometer.value]); + } + } + else if (cv_newspeedometer.value == 5 && xtra_speedo3) // why bother if we dont? + { + if (K_UseColorHud() && xtra_speedo_clr3) //Colourized hud + { + UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, K_GetHudColor(), GTC_CACHE); + V_DrawStretchyFixedPatch((SPDM_X-1)<speed, mapobjectscale)/FRACUNIT; diff --git a/src/k_kart.h b/src/k_kart.h index a486f8cf2..66307aa8a 100644 --- a/src/k_kart.h +++ b/src/k_kart.h @@ -32,6 +32,9 @@ extern consvar_t cv_stat_xoffset; extern consvar_t cv_stat_yoffset; extern consvar_t cv_showstats; +#define NUMSPEEDOSTUFF 6 +extern CV_PossibleValue_t speedo_cons_t[NUMSPEEDOSTUFF]; + boolean K_IsPlayerLosing(player_t *player); boolean K_IsPlayerWanted(player_t *player); void K_KartBouncing(mobj_t *mobj1, mobj_t *mobj2, boolean bounce, boolean solid); diff --git a/src/m_menu.c b/src/m_menu.c index af5c93459..a13c21c7f 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -240,9 +240,6 @@ static char *M_GetConditionString(condition_t cond); menu_t SR_MainDef, SR_UnlockChecklistDef; // Misc. Main Menu -#if 0 // Bring this back when we have actual single-player -static void M_SinglePlayerMenu(INT32 choice); -#endif static void M_Options(INT32 choice); static void M_LocalSkinMenu(INT32 choice); static void M_LocalSkinChange(INT32 choice); @@ -267,18 +264,15 @@ menu_t MISC_ScrambleTeamDef, MISC_ChangeTeamDef, MISC_ChangeSpectateDef; //static void M_LoadGame(INT32 choice); static void M_TimeAttack(INT32 choice); static boolean M_QuitTimeAttackMenu(void); -//static void M_NightsAttack(INT32 choice); static void M_Statistics(INT32 choice); static void M_HandleStaffReplay(INT32 choice); static void M_ReplayTimeAttack(INT32 choice); static void M_ChooseTimeAttack(INT32 choice); -//static void M_ChooseNightsAttack(INT32 choice); static void M_ModeAttackEndGame(INT32 choice); static void M_SetGuestReplay(INT32 choice); //static void M_ChoosePlayer(INT32 choice); menu_t SP_LevelStatsDef; static menu_t SP_TimeAttackDef, SP_ReplayDef, SP_GuestReplayDef, SP_GhostDef; -//static menu_t SP_NightsAttackDef, SP_NightsReplayDef, SP_NightsGuestReplayDef, SP_NightsGhostDef; // Multiplayer #ifndef NONET @@ -460,7 +454,6 @@ static void M_HandleMonitorToggles(INT32 choice); static void Nextmap_OnChange(void); static void Newgametype_OnChange(void); static void Dummymenuplayer_OnChange(void); -//static void Dummymares_OnChange(void); static void Dummystaff_OnChange(void); // ========================================================================== @@ -538,7 +531,6 @@ static consvar_t cv_dummyscramble = {"dummyscramble", "Random", CV_HIDEN, dummys static consvar_t cv_dummyrings = {"dummyrings", "0", CV_HIDEN, ringlimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; static consvar_t cv_dummylives = {"dummylives", "0", CV_HIDEN, liveslimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; static consvar_t cv_dummycontinues = {"dummycontinues", "0", CV_HIDEN, liveslimit_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -//static consvar_t cv_dummymares = {"dummymares", "Overall", CV_HIDEN|CV_CALL, dummymares_cons_t, Dummymares_OnChange, 0, NULL, NULL, 0, 0, NULL}; static consvar_t cv_dummystaff = {"dummystaff", "0", CV_HIDEN|CV_CALL, dummystaff_cons_t, Dummystaff_OnChange, 0, NULL, NULL, 0, 0, NULL}; // ========================================================================== @@ -1106,7 +1098,6 @@ static menuitem_t OP_MainMenu[] = {IT_SUBMENU|IT_STRING, NULL, "Server Options...", &OP_ServerOptionsDef, 70}, {IT_SUBMENU|IT_STRING, NULL, "Data Options...", &OP_DataOptionsDef, 90}, - {IT_CALL|IT_STRING, NULL, "Custom Options...", M_CustomCvarMenu, 100}, {IT_CALL|IT_STRING, NULL, "Tricks & Secrets (F1)", M_Manual, 110}, @@ -1336,8 +1327,8 @@ static const char* OP_VideoTooltips[] = "Enable fullscreen.", #endif "Gamma (brightness) of the game.", - NULL, - NULL, + "Saturation of the game.", + "Advanced color settings of the game.", "How far away objects are drawn.", "How far away weather is drawn.", "Toggle being able to see the sky.", @@ -2283,7 +2274,6 @@ static menuitem_t OP_NametagMenu[] = //{IT_STRING | IT_CVAR, NULL, "Nametag Scaling", &cv_nametagscaling, 70} }; - static const char* OP_NametagTooltips[] = { NULL, @@ -3048,24 +3038,6 @@ static void Dummymenuplayer_OnChange(void) CV_StealthSetValue(&cv_dummymenuplayer, 1); } -/*static void Dummymares_OnChange(void) -{ - if (!nightsrecords[cv_nextmap.value-1]) - { - CV_StealthSetValue(&cv_dummymares, 0); - return; - } - else - { - UINT8 mares = nightsrecords[cv_nextmap.value-1]->nummares; - - if (cv_dummymares.value < 0) - CV_StealthSetValue(&cv_dummymares, mares); - else if (cv_dummymares.value > mares) - CV_StealthSetValue(&cv_dummymares, 0); - } -}*/ - char dummystaffname[22]; static void Dummystaff_OnChange(void) @@ -3112,11 +3084,7 @@ static void Newgametype_OnChange(void) P_AllocMapHeader((INT16)(cv_nextmap.value-1)); if ((cv_newgametype.value == GT_RACE && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_RACE)) || // SRB2kart - //(cv_newgametype.value == GT_COMPETITION && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_COMPETITION)) || - //(cv_newgametype.value == GT_RACE && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_RACE)) || - ((cv_newgametype.value == GT_MATCH || cv_newgametype.value == GT_TEAMMATCH) && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_MATCH))) // || - //((cv_newgametype.value == GT_TAG || cv_newgametype.value == GT_HIDEANDSEEK) && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_TAG)) || - //(cv_newgametype.value == GT_CTF && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_CTF))) + ((cv_newgametype.value == GT_MATCH || cv_newgametype.value == GT_TEAMMATCH) && !(mapheaderinfo[cv_nextmap.value-1]->typeoflevel & TOL_MATCH))) { INT32 value = 0; @@ -4126,45 +4094,20 @@ void M_StartControlPanel(void) } else if (!(netgame || multiplayer)) // Single Player { - if (gamestate != GS_LEVEL /*|| ultimatemode*/) // intermission, so gray out stuff. + if (gamestate != GS_LEVEL) // intermission, so gray out stuff. { SPauseMenu[spause_pandora].status = (M_SecretUnlocked(SECRET_PANDORA)) ? (IT_GRAYEDOUT) : (IT_DISABLED); SPauseMenu[spause_retry].status = IT_GRAYEDOUT; } else { - //INT32 numlives = 2; - SPauseMenu[spause_pandora].status = (M_SecretUnlocked(SECRET_PANDORA)) ? (IT_STRING | IT_CALL) : (IT_DISABLED); - - /*if (&players[consoleplayer]) - { - numlives = players[consoleplayer].lives; - if (players[consoleplayer].playerstate != PST_LIVE) - ++numlives; - } - - // The list of things that can disable retrying is (was?) a little too complex - // for me to want to use the short if statement syntax - if (numlives <= 1 || G_IsSpecialStage(gamemap)) - SPauseMenu[spause_retry].status = (IT_GRAYEDOUT); - else*/ - SPauseMenu[spause_retry].status = (IT_STRING | IT_CALL); + SPauseMenu[spause_retry].status = (IT_STRING | IT_CALL); } - // We can always use level select though. :33 - //SPauseMenu[spause_levelselect].status = (gamecomplete) ? (IT_STRING | IT_CALL) : (IT_DISABLED); - // And emblem hints. SPauseMenu[spause_hints].status = (M_SecretUnlocked(SECRET_EMBLEMHINTS)) ? (IT_STRING | IT_CALL) : (IT_DISABLED); - // Shift up Pandora's Box if both pandora and levelselect are active - /*if (SPauseMenu[spause_pandora].status != (IT_DISABLED) - && SPauseMenu[spause_levelselect].status != (IT_DISABLED)) - SPauseMenu[spause_pandora].alphaKey = 24; - else - SPauseMenu[spause_pandora].alphaKey = 32;*/ - currentMenu = &SPauseDef; itemOn = spause_continue; } @@ -4446,7 +4389,6 @@ void M_Init(void) CV_RegisterVar(&cv_dummyrings); CV_RegisterVar(&cv_dummylives); CV_RegisterVar(&cv_dummycontinues); - //CV_RegisterVar(&cv_dummymares); CV_RegisterVar(&cv_dummystaff); quitmsg[QUITMSG] = M_GetText("Eggman's tied explosives\nto your girlfriend, and\nwill activate them if\nyou press the 'Y' key!\nPress 'N' to save her!\n\n(Press 'Y' to quit)"); @@ -4502,14 +4444,15 @@ void M_Init(void) } #endif - if (!snw_speedo && !kartzspeedo) // why bother? + if (!xtra_speedo && !kartzspeedo && !achi_speedo) // why bother? OP_SaturnMenu[sm_speedometer].status = IT_GRAYEDOUT; - if (!snw_speedo && kartzspeedo) - OP_SaturnMenu[sm_speedometer].text = "Speedometer (No Small)"; + //if (!xtra_speedo && kartzspeedo) + //OP_SaturnMenu[sm_speedometer].text = "Speedometer (No Small)"; - if (snw_speedo && !kartzspeedo) - OP_SaturnMenu[sm_speedometer].text = "Speedometer (No PMeter)"; + //if (xtra_speedo && !kartzspeedo) + //OP_SaturnMenu[sm_speedometer].text = "Speedometer (No PMeter)"; + // idk i dont wanna bother with this tbh lmao if (!clr_hud){ // uhguauhauguuhee OP_SaturnMenu[sm_colorhud].status = IT_GRAYEDOUT; @@ -5233,7 +5176,6 @@ static void M_DrawGenericScrollMenu(void) case IT_CV_INVISSLIDER: // monitor toggles use this break; case IT_CV_STRING: -#if 1 if (y + 12 > (currentMenu->y + 2*scrollareaheight)) break; M_DrawTextBox(x, y + 4, MAXSTRINGLENGTH, 1); @@ -5241,18 +5183,6 @@ static void M_DrawGenericScrollMenu(void) if (skullAnimCounter < 4 && i == itemOn) V_DrawCharacter(x + 8 + V_StringWidth(cv->string, 0), y + 12, '_' | 0x80, false); -#else // cool new string type stuff, not ready for limelight - if (i == itemOn) - { - V_DrawFill(x-2, y-1, MAXSTRINGLENGTH*8 + 4, 8+3, 159); - V_DrawString(x, y, lowercase, cv->string); - if (skullAnimCounter < 4) - V_DrawCharacter(x + V_StringWidth(cv->string, 0), y, '_' | 0x80, false); - } - else - V_DrawRightAlignedString(BASEVIDWIDTH - x, y, - highlightflags|lowercase, cv->string); -#endif break; default: V_DrawRightAlignedString(BASEVIDWIDTH - x, y, @@ -5658,18 +5588,6 @@ boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt) return false; } - /*if (gt == GT_COOP && (mapheaderinfo[mapnum]->typeoflevel & TOL_COOP)) - return true; - - if (gt == GT_COMPETITION && (mapheaderinfo[mapnum]->typeoflevel & TOL_COMPETITION)) - return true; - - if (gt == GT_CTF && (mapheaderinfo[mapnum]->typeoflevel & TOL_CTF)) - return true; - - if ((gt == GT_TAG || gt == GT_HIDEANDSEEK) && (mapheaderinfo[mapnum]->typeoflevel & TOL_TAG)) - return true;*/ - if ((gt == GT_MATCH || gt == GT_TEAMMATCH) && (mapheaderinfo[mapnum]->typeoflevel & TOL_MATCH)) return true; @@ -5709,20 +5627,6 @@ boolean M_CanShowLevelInList(INT32 mapnum, INT32 gt) return false;*/ return true; - /*case LLM_NIGHTSATTACK: - if (!(mapheaderinfo[mapnum]->menuflags & LF2_NIGHTSATTACK)) - return false; - - if (M_MapLocked(mapnum+1)) - return false; // not unlocked - - if (mapheaderinfo[mapnum]->menuflags & LF2_NOVISITNEEDED) - return true; - - if (!mapvisited[mapnum]) - return false; - - return true;*/ default: return false; } @@ -6044,16 +5948,13 @@ static void M_AddonsInternal(void) { const char *pathname = "."; -#if 1 if (cv_addons_option.value == 0) pathname = usehome ? srb2home : srb2path; else if (cv_addons_option.value == 1) pathname = srb2home; else if (cv_addons_option.value == 2) pathname = srb2path; - else -#endif - if (cv_addons_option.value == 3 && *cv_addons_folder.string != '\0') + else if (cv_addons_option.value == 3 && *cv_addons_folder.string != '\0') pathname = cv_addons_folder.string; strlcpy(menupath, pathname, 1024); @@ -6524,15 +6425,8 @@ static void M_HandleAddons(INT32 choice) char *tempname = NULL; if (dirmenu && dirmenu[dir_on[menudepthleft]]) tempname = Z_StrDup(dirmenu[dir_on[menudepthleft]]+DIR_STRING); // don't need to I_Error if can't make - not important, just QoL -#if 0 // much slower - if (!preparefilemenu(true, false)) - { - UNEXIST; - return; - } -#else // streamlined + searchfilemenu(tempname); -#endif } switch (choice) @@ -8228,10 +8122,6 @@ static size_t st_namescrollstate = 0; static void M_MusicTest(INT32 choice) { - //INT32 ul = skyRoomMenuTranslations[choice-1]; - //UINT8 i; - //char buf[8]; - (void)choice; if (!S_PrepareSoundTest()) @@ -8240,24 +8130,6 @@ static void M_MusicTest(INT32 choice) return; } - /*STRBUFCPY(buf, "M_RADIOn"); - for (i = 0; i < 9; i++) - { - if (st_radio[i]) - W_UnlockCachedPatch(st_radio[i]); - buf[7] = (char)('0'+i); - st_radio[i] = W_CachePatchName(buf, PU_STATIC); - } - - STRBUFCPY(buf, "M_LPADn"); - for (i = 0; i < 4; i++) - { - if (st_launchpad[i]) - W_UnlockCachedPatch(st_launchpad[i]); - buf[6] = (char)('0'+i); - st_launchpad[i] = W_CachePatchName(buf, PU_STATIC); - }*/ - curplaying = NULL; st_time = 0; @@ -8269,31 +8141,17 @@ static void M_MusicTest(INT32 choice) static void M_DrawMusicTest(void) { INT32 x, y, i; - //char* title; - //fixed_t hscale = FRACUNIT/2, vscale = FRACUNIT/2, bounce = 0; - //UINT8 frame[4] = {0, 0, -1, SKINCOLOR_RUBY}; // let's handle the ticker first. ideally we'd tick this somewhere else, BUT... if (curplaying) { { fixed_t work; - //angle_t ang; - //bpm = FixedDiv((60*TICRATE)<= (FRACUNIT << (FRACBITS - 2))) // prevent overflow jump - takes about 15 minutes of loop on the same song to reach st_time = work; - //work = FixedDiv(work*180, bpm); - //frame[0] = 8-(work/(20<>ANGLETOFINESHIFT) & FINEMASK; - //bounce = (FINESINE(ang) - FRACUNIT/2); - //hscale -= bounce/16; - //vscale += bounce/16; - st_time += renderdeltatics; } } @@ -8301,34 +8159,6 @@ static void M_DrawMusicTest(void) x = 90<width/2), - 112 + 8 - (ngradeletters[bestgrade]->height/2), - 0, ngradeletters[bestgrade]); - } - - if (!bestscore) - sprintf(beststr, "(none)"); - else - sprintf(beststr, "%u", bestscore); - - V_DrawString(160 - 88, 122, highlightflags, "BEST SCORE:"); - V_DrawRightAlignedString(160 + 88, 122, V_ALLOWLOWERCASE, beststr); - - if (besttime == UINT32_MAX) - sprintf(beststr, "(none)"); - else - sprintf(beststr, "%i:%02i.%02i", G_TicsToMinutes(besttime, true), - G_TicsToSeconds(besttime), - G_TicsToCentiseconds(besttime)); - - V_DrawString(160-88, 132, highlightflags, "BEST TIME:"); - V_DrawRightAlignedString(160+88, 132, V_ALLOWLOWERCASE, beststr); - - if (cv_dummymares.value == 0) { - // Draw record emblems. - em = M_GetLevelEmblems(cv_nextmap.value); - while (em) - { - switch (em->type) - { - case ET_NGRADE: yHeight = 112; break; - case ET_NTIME: yHeight = 132; break; - default: - goto skipThisOne; - } - - if (em->collected) - V_DrawSmallMappedPatch(160+88, yHeight, 0, W_CachePatchName(M_GetEmblemPatch(em), PU_CACHE), - R_GetTranslationColormap(TC_DEFAULT, M_GetEmblemColor(em), GTC_MENUCACHE)); - else - V_DrawSmallScaledPatch(160+88, yHeight, 0, W_CachePatchName("NEEDIT", PU_CACHE)); - - skipThisOne: - em = M_GetLevelEmblems(-1); - } - } - } - // ALWAYS DRAW level name even when not on this menu! - else - { - consvar_t *ncv; - INT32 x = SP_NightsAttackDef.x; - INT32 y = SP_NightsAttackDef.y; - - ncv = (consvar_t *)SP_NightsAttackMenu[0].itemaction; - V_DrawString(x, y + SP_NightsAttackMenu[0].alphaKey, V_TRANSLUCENT, SP_NightsAttackMenu[0].text); - V_DrawString(BASEVIDWIDTH - x - V_StringWidth(ncv->string, 0), - y + SP_NightsAttackMenu[0].alphaKey, highlightflags|V_TRANSLUCENT, ncv->string); - } - } -}*/ - -// Going to Nights Attack menu... -/*static void M_NightsAttack(INT32 choice) -{ - (void)choice; - - memset(skins_cons_t, 0, sizeof (skins_cons_t)); - - levellistmode = LLM_NIGHTSATTACK; // Don't be dependent on cv_newgametype - - if (M_CountLevelsToShowInList() == 0) - { - M_StartMessage(M_GetText("No NiGHTS-attackable levels found.\n"),NULL,MM_NOTHING); - return; - } - - // This is really just to make sure Sonic is the played character, just in case - M_PatchSkinNameTable(); - - M_PrepareLevelSelect(); - M_SetupNextMenu(&SP_NightsAttackDef); - Nextmap_OnChange(); - - itemOn = nastart; // "Start" is selected. - - G_SetGamestate(GS_TIMEATTACK); - S_ChangeMusicInternal("racent", true); -}*/ - -// Player has selected the "START" from the nights attack screen -/*static void M_ChooseNightsAttack(INT32 choice) -{ - char nameofdemo[256]; - (void)choice; - emeralds = 0; - M_ClearMenus(true); - modeattacking = ATTACKING_NIGHTS; - - I_mkdir(va("%s"PATHSEP"replay", srb2home), 0755); - I_mkdir(va("%s"PATHSEP"replay"PATHSEP"%s", srb2home, timeattackfolder), 0755); - - snprintf(nameofdemo, sizeof nameofdemo, "replay"PATHSEP"%s"PATHSEP"%s-last", timeattackfolder, G_BuildMapName(cv_nextmap.value)); - - if (!cv_autorecord.value) - remove(va("%s"PATHSEP"%s.lmp", srb2home, nameofdemo)); - else - G_RecordDemo(nameofdemo); - - G_DeferedInitNew(false, G_BuildMapName(cv_nextmap.value), 0, 0, false); -}*/ - // Player has selected the "START" from the time attack screen static void M_ChooseTimeAttack(INT32 choice) { @@ -9352,28 +9011,6 @@ static void M_ReplayTimeAttack(INT32 choice) // srb2/replay/main/map01-sonic-time-best.lmp G_DoPlayDemo(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-%s-%s.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value), cv_chooseskin.string, which)); } - /*else if (currentMenu == &SP_NightsReplayDef) - { - switch(choice) { - default: - case 0: // best score - which = "score-best"; - break; - case 1: // best time - which = "time-best"; - break; - case 2: // last - which = "last"; - break; - case 3: // staff - return; // M_HandleStaffReplay - case 4: // guest - which = "guest"; - break; - } - // srb2/replay/main/map01-score-best.lmp - G_DoPlayDemo(va("%s"PATHSEP"replay"PATHSEP"%s"PATHSEP"%s-%s.lmp", srb2home, timeattackfolder, G_BuildMapName(cv_nextmap.value), which)); - }*/ } static void M_EraseGuest(INT32 choice) @@ -9382,12 +9019,8 @@ static void M_EraseGuest(INT32 choice) (void)choice; if (FIL_FileExists(rguest)) remove(rguest); - /*if (currentMenu == &SP_NightsGuestReplayDef) - M_SetupNextMenu(&SP_NightsAttackDef); - else*/ - { - M_SetupNextMenu(&SP_TimeAttackDef); - } + + M_SetupNextMenu(&SP_TimeAttackDef); CV_AddValue(&cv_nextmap, -1); CV_AddValue(&cv_nextmap, 1); M_StartMessage(M_GetText("Guest replay data erased.\n"),NULL,MM_NOTHING); @@ -9408,10 +9041,8 @@ static void M_OverwriteGuest(const char *which) } FIL_WriteFile(rguest, buf, len); Z_Free(rguest); - /*if (currentMenu == &SP_NightsGuestReplayDef) - M_SetupNextMenu(&SP_NightsAttackDef); - else*/ - M_SetupNextMenu(&SP_TimeAttackDef); + + M_SetupNextMenu(&SP_TimeAttackDef); CV_AddValue(&cv_nextmap, -1); CV_AddValue(&cv_nextmap, 1); M_StartMessage(M_GetText("Guest replay data saved.\n"),NULL,MM_NOTHING); @@ -9429,19 +9060,6 @@ static void M_OverwriteGuest_Lap(INT32 choice) M_OverwriteGuest("lap-best"); } -/* SRB2Kart -static void M_OverwriteGuest_Score(INT32 choice) -{ - (void)choice; - M_OverwriteGuest("score-best"); -} - -static void M_OverwriteGuest_Rings(INT32 choice) -{ - (void)choice; - M_OverwriteGuest("rings-best"); -}*/ - static void M_OverwriteGuest_Last(INT32 choice) { (void)choice; @@ -9496,9 +9114,6 @@ static void M_ModeAttackEndGame(INT32 choice) case ATTACKING_RECORD: currentMenu = &SP_TimeAttackDef; break; - /*case ATTACKING_NIGHTS: - currentMenu = &SP_NightsAttackDef; - break;*/ } itemOn = currentMenu->lastOn; G_SetGamestate(GS_TIMEATTACK); @@ -9985,7 +9600,6 @@ static void M_CheckMODVersion(int id) static void Check_new_version_thread (int *id) { - M_SetWaitingMode(M_WAITING_VERSION); M_CheckMODVersion(*id); @@ -9998,7 +9612,6 @@ Check_new_version_thread (int *id) { free(id); } - } #endif #endif/*defined (UPDATE_ALERT) && defined (HAVE_THREADS)*/ @@ -10048,7 +9661,6 @@ static void M_ConnectMenu(INT32 choice) #endif/*defined (MASTERSERVER) && defined (HAVE_THREADS)*/ } - static void M_ConnectMenuModChecks(INT32 choice) { (void)choice; @@ -10098,7 +9710,6 @@ static void M_HandleMasterServerResetChoice(event_t *ev) } } } - } void M_PopupMasterServerConnectError(void) @@ -10816,8 +10427,6 @@ static void M_DrawSetupMultiPlayerMenu(void) break; } - - M_DrawTextBox(mx + 32, my - 8 + nameboxaddy, MAXPLAYERNAME, 1); V_DrawString(mx + 40, my + nameboxaddy, V_ALLOWLOWERCASE, setupm_name); @@ -10982,9 +10591,9 @@ static void M_DrawSetupMultiPlayerMenu(void) V_DrawScaledPatch(statx - 30, staty + 63 -(5 *i), 0, W_CachePatchName("K_STATN5", PU_CACHE)); } } + #undef GETSELECTEDSPEED #undef GETSELECTEDWEIGHT - break; case SKINMENUTYPE_GRID: @@ -11735,7 +11344,8 @@ static void M_HandleSetupMultiPlayer(INT32 choice) default: if (choice < 32 || choice > 127) break; - if (itemOn == 0){ + if (itemOn == 0) + { l = strlen(setupm_name); if (l < MAXPLAYERNAME) { @@ -11745,10 +11355,6 @@ static void M_HandleSetupMultiPlayer(INT32 choice) } } break; - - - - } #undef BREAKWHENLOCKED diff --git a/src/p_inter.c b/src/p_inter.c index 365c8e7b6..14c712033 100644 --- a/src/p_inter.c +++ b/src/p_inter.c @@ -918,201 +918,6 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck) } return; -// ********************************** // -// NiGHTS gameplay items and powerups // -// ********************************** // - /*case MT_NIGHTSDRONE: - if (player->bot) - return; - if (player->exiting) - return; - if (player->bonustime) - { - if (G_IsSpecialStage(gamemap)) //After-mare bonus time/emerald reward in special stages. - { - // only allow the player with the emerald in-hand to leave. - if (toucher->tracer && toucher->tracer->target - && toucher->tracer->target->type == MT_GOTEMERALD) - { - } - else // Make sure that SOMEONE has the emerald, at least! - { - for (i = 0; i < MAXPLAYERS; i++) - if (playeringame[i] && players[i].playerstate == PST_LIVE - && players[i].mo->tracer && players[i].mo->tracer->target - && players[i].mo->tracer->target->type == MT_GOTEMERALD) - return; - // Well no one has an emerald, so exit anyway! - } - P_GiveEmerald(false); - // Don't play Ideya sound in special stage mode - } - else - S_StartSound(toucher, special->info->activesound); - } - else //Initial transformation. Don't allow second chances in special stages! - { - if (player->pflags & PF_NIGHTSMODE) - return; - - S_StartSound(toucher, sfx_supert); - } - if (!(netgame || multiplayer) && !(player->pflags & PF_NIGHTSMODE)) - P_SetTarget(&special->tracer, toucher); - P_NightserizePlayer(player, special->health); // Transform! - return; - case MT_NIGHTSLOOPHELPER: - // One second delay - if (special->fuse < toucher->fuse - TICRATE) - { - thinker_t *th; - mobj_t *mo2; - INT32 count; - fixed_t x,y,z, gatherradius; - angle_t d; - statenum_t sparklestate = S_NULL; - - if (special->target != toucher) // These ain't your helpers, pal! - return; - - x = special->x>>FRACBITS; - y = special->y>>FRACBITS; - z = special->z>>FRACBITS; - count = 1; - - // scan the remaining thinkers - for (th = thinkercap.next; th != &thinkercap; th = th->next) - { - if (th->function.acp1 != (actionf_p1)P_MobjThinker) - continue; - - mo2 = (mobj_t *)th; - - if (mo2 == special) - continue; - - // Not our stuff! - if (mo2->target != toucher) - continue; - - if (mo2->type == MT_NIGHTSPARKLE) - mo2->tics = 1; - else if (mo2->type == MT_NIGHTSLOOPHELPER) - { - if (mo2->fuse >= special->fuse) - { - count++; - x += mo2->x>>FRACBITS; - y += mo2->y>>FRACBITS; - z += mo2->z>>FRACBITS; - } - P_RemoveMobj(mo2); - } - } - x = (x/count)<x - x, special->y - y), special->z - z); - P_RemoveMobj(special); - - if (player->powers[pw_nights_superloop]) - { - gatherradius *= 2; - sparklestate = mobjinfo[MT_NIGHTSPARKLE].seestate; - } - - if (gatherradius < 30*FRACUNIT) // Player is probably just sitting there. - return; - - for (d = 0; d < 16; d++) - P_SpawnParaloop(x, y, z, gatherradius, 16, MT_NIGHTSPARKLE, sparklestate, d*ANGLE_22h, false); - - S_StartSound(toucher, sfx_prloop); - - // Now we RE-scan all the thinkers to find close objects to pull - // in from the paraloop. Isn't this just so efficient? - for (th = thinkercap.next; th != &thinkercap; th = th->next) - { - if (th->function.acp1 != (actionf_p1)P_MobjThinker) - continue; - - mo2 = (mobj_t *)th; - - if (P_AproxDistance(P_AproxDistance(mo2->x - x, mo2->y - y), mo2->z - z) > gatherradius) - continue; - - if (mo2->flags & MF_SHOOTABLE) - { - P_DamageMobj(mo2, toucher, toucher, 1); - continue; - } - - // Make these APPEAR! - // Tails 12-15-2003 - if (mo2->flags & MF_NIGHTSITEM) - { - // Requires Bonus Time - if ((mo2->flags2 & MF2_STRONGBOX) && !player->bonustime) - continue; - - if (!(mo2->flags & MF_SPECIAL) && mo2->health) - { - P_SetMobjState(mo2, mo2->info->seestate); - mo2->flags |= MF_SPECIAL; - mo2->flags &= ~MF_NIGHTSITEM; - S_StartSound(toucher, sfx_hidden); - continue; - } - } - - if (!(mo2->type == MT_NIGHTSWING || mo2->type == MT_RING || mo2->type == MT_COIN - || mo2->type == MT_BLUEBALL)) - continue; - - // Yay! The thing's in reach! Pull it in! - mo2->flags |= MF_NOCLIP|MF_NOCLIPHEIGHT; - mo2->flags2 |= MF2_NIGHTSPULL; - P_SetTarget(&mo2->tracer, toucher); - } - } - return; - case MT_EGGCAPSULE: - if (player->bot) - return; - - // make sure everything is as it should be, THEN take rings from players in special stages - if (player->pflags & PF_NIGHTSMODE && !toucher->target) - return; - - if (player->mare != special->threshold) // wrong mare - return; - - if (special->reactiontime > 0) // capsule already has a player attacking it, ignore - return; - - if (G_IsSpecialStage(gamemap) && !player->exiting) - { // In special stages, share rings. Everyone gives up theirs to the player who touched the capsule - for (i = 0; i < MAXPLAYERS; i++) - if (playeringame[i] && (&players[i] != player) && players[i].mo->health > 1) - { - toucher->health += players[i].mo->health-1; - player->health = toucher->health; - players[i].mo->health = 1; - players[i].health = players[i].mo->health; - } - } - - if (!(player->health > 1) || player->exiting) - return; - - // Mark the player as 'pull into the capsule' - P_SetTarget(&player->capsule, special); - special->reactiontime = (player-players)+1; - P_SetTarget(&special->target, NULL); - - // Clear text - player->texttimer = 0; - return;*/ case MT_NIGHTSBUMPER: // Don't trigger if the stage is ended/failed if (player->exiting) diff --git a/src/p_user.c b/src/p_user.c index edf585626..60a69ec71 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -265,7 +265,6 @@ void P_ResetScore(player_t *player) player->scoreadd = 0; } - // // P_FindLowestLap // @@ -632,7 +631,8 @@ static UINT8 getPlayerPos(player_t *player) static boolean isPlayerLosing(player_t *player) { - if (G_BattleGametype()) { + if (G_BattleGametype()) + { UINT8 pos = 1; UINT8 maxpos = 1; @@ -1830,7 +1830,6 @@ static void P_DoPlayerHeadSigns(player_t *player) } } - // // P_DoJumpShield // @@ -3311,7 +3310,6 @@ void P_DemoCameraMovement(camera_t *cam) cam->aiming = R_PointToAngle2(0, cam->z, R_PointToDist2(cam->x, cam->y, lastp->mo->x, lastp->mo->y), lastp->mo->z + lastp->mo->scale*128*P_MobjFlip(lastp->mo)); // This is still unholy. Aim a bit above their heads. } - cam->momx = cam->momy = cam->momz = 0; if (cmd->forwardmove != 0) { @@ -3527,7 +3525,6 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall if (P_CameraThinker(player, thiscam, resetcalled)) return true; - if (thiscam == &camera[1]) // Camera 2 { num = 1; @@ -4819,8 +4816,7 @@ void P_PlayerThink(player_t *player) player->losstime--; // Flash player after being hit. - if (!(//player->pflags & PF_NIGHTSMODE || - player->kartstuff[k_hyudorotimer] // SRB2kart - fixes Hyudoro not flashing when it should. + if (!(player->kartstuff[k_hyudorotimer] // SRB2kart - fixes Hyudoro not flashing when it should. || player->kartstuff[k_growshrinktimer] > 0 // Grow doesn't flash either. || player->kartstuff[k_respawn] // Respawn timer (for drop dash effect) || (player->pflags & PF_TIMEOVER) // NO CONTEST explosion diff --git a/src/sdl/SDL_icon.xpm b/src/sdl/SDL_icon.xpm index 0acac88ec..bc74641d6 100644 --- a/src/sdl/SDL_icon.xpm +++ b/src/sdl/SDL_icon.xpm @@ -1,100 +1,72 @@ -/* XPM */ -static const char *SDL_icon_xpm[] = { -/* columns rows colors chars-per-pixel */ -"64 64 32 1", -" c None", -". c #E7E7E7", -"+ c #DFDFDF", -"@ c #AFAFAF", -"# c #979797", -"$ c #8F8F8F", -"% c #B7B7B7", -"& c #F7F7F7", -"* c #D7D7D7", -"= c #4F4F4F", -"- c #0F0F0F", -"; c #070707", -"> c #575757", -", c #C7C7C7", -"' c #676767", -") c #7F7F7F", -"! c #5F5F5F", -"~ c #777777", -"{ c #474747", -"] c #878787", -"^ c #6F6F6F", -"/ c #BFBFBF", -"( c #373737", -"_ c #1F1F1F", -": c #272727", -"< c #2F2F2F", -"[ c #3F3F3F", -"} c #EFEFEF", -"| c #A7A7A7", -"1 c #9F9F9F", -"2 c #171717", -"3 c #CFCFCF", -" ", -" .................... ", -" ...+@##$$$$###@%&....... ", -" ..*=-;;;-;;;;;;;;@........ ", -" ..+-;;;;--;;;;;;;>.......... ", -" ...,')!!'~>{!)$)>'....*]>^%&.. ", -" ../(__(>:{<)$![[[%&...^!!!!!~*. ", -" ..@;;;;;({=]:;;;;;~..*_;;;;;;;_.. ", -" .}>;;;;;^#=;;;;;;>...<;;;;;;;;;|.. ", -" ..*1)))))%]))))))%&..1])))))))))#}. ", -" ..%[;;;;;[2;;;;;;;:..#;;;2[[-;;;;;=.. ", -" .&:;[{;;;{;;;~={:;^.._;;'}...>;;;;;,. ", -" .}<;;:{;_:2!'-;;;]*.&(_].|{=@.~___[/.. ", -" ..*$))]@%//,111111}..|1*.@1111@.3111|&. ", -" .,:;;;;;'#^;;;;;;;]./;;+);;;;;;$*;;;;.. ", -" .^;;;;;;));;;;;;;;$.~;$*;;;;;;;-+^;;;#. ", -" ..$;;;;;;>;;;;;;;;>}.^-.!;;;;;;;;)*:;;|. ", -" .&@$|#)))|)))1||#]+..$/}]))))))))$.3))#.. ", -" .#;;;[{;->;-^[;;;;].~;@];;;;;;;;;;1#;;-}. ", -" .{;;;;{<[:(~-;;;;;$.(-.<;;;;;;;;;;{};;;3. ", -" ..);;;;;~~[!;;;;;;-/.>=.>;;;;;;;;;;2}^;:3. ", -" .&#)))))$}@)))))))@.}]3.*))))))))))).,)).. ", -" .3;;;;;;;);;;;;;;;2+|;%.';;;;;;;;;;;]1;;1. ", -" .1_(:;;;;{;;;[=[:;;.];}.);;;;;;;;;;;=,;;]. ", -" .%2-(!2;2{;_':;;;;).1;..+:;;;;;;;;;;_.;;1. ", -" .+))))@1$1#@))))))3.,@...1))))))))))].1#3. ", -" .{;;;;;^<>);;;;;;;-.[). .-;;;;;;;;;;;3{;#. ", -" ._;;;;;-~];;;;;;;;;};#. ._;;;;;;;;;;;/^;#. ", -" .$'!!!!!1]!!!!!!!!%}[,. .'[[[[[[[[[[[,|>}. ", -" ..'{::___!{___:(>___:[@...~[[[[[[[[[[[1#{,. ", -" .+;-<=(;;[:;;(=-;;;;;;;;;;;;;;;;;;;;;;;;;). ", -" .*;;;;[=;[_;{(;;;;;;;;;;;;;;;;;;;;;;;;;;-#. ", -" .&)!!!!)$]~)$!!!!!!!!!!!!!!!!!!!!!!!!!!!^+. ", -" .&(_____!$)!____________________________<3. ", -" .%;;;;;;;@|;;;;;;;;;;;;==))))))))))))))]*&. ", -" .*22;;;;;({;;;;;_-;;;;%.&.................. ", -" .&+~#]!!!~]!=[!^>[[[[{}... ", -" ../__:^^:(!_[$>[[[[[[{+. ", -" .<;;;;<^2{;'2;;;;;;;;]. ", -" .;;;;;;:~=>:;;;;;;;;;]. ", -" .@!!!!!!]3|!!!!!!!!!!*. ", -" .#_______#_____:<____~.. ", -" .^_{[_;;;=2;;;<<-;;;;;,.................. ", -" .@<;;{~2;_>;;((;;;;;;;3,-----------|.$-!. ", -" ..@))))|@)|)$|)))))))#}&/))))))))))}./)/. ", -" .&:;;;;;=>>;^;;;;;;;;;_.[;;;;;;;;;;^.{;|. ", -" ..2;;;;;;{#<[;;;;;;;;;;+';;;;;;;;;;~*;;.. ", -" .^;;;;;;;'%;;;;;;;;;;{&}#;;;;;;;;[+|;-.. ", -" .&3$1$))))%))))1]))))]+&}$))))))@&./)@. ", -" ..(;_<'{;;(-;;[2;;;;;;-@3;;;;;;;_}};;~. ", -" .=;;;;:~<-(;-[;;;;;;;;:.=;;;;;;>.!;;,. ", -" ./:;;;;;!!!;=-;;;;;;;;>.+$;;;;[.&_;=.. ", -" ..&|)))))$,|%)))))))))]1&.|]]@&.|]]}. ", -" .&;;;;;;;:@=;;;;;;;;;;;-/....3:;;;}. ", -" ..!;;;;;;;([;;;;_2;;;;;;;>)){;;;;^.. ", -" ..=2_:-;;;(;;;2<;;;;;;;;;;;;;;-).. ", -" ...%$#@%#)#))|))))))))))))))|}&. ", -" ..!;;;2!]{_-[;;;;;;;;;;;;;;;&.. ", -" ..^-;;;;^)(:;;;;;;;;;;;;;;'.. ", -" ..*'-;;;:]-;;;;;;;;;;;;-$.. ", -" ....}./1))))))))))))]/... ", -" ........}3||1#$$$]1... ", -" ................... ", -" "}; +/* XPM */ +static const char *SDL_icon_xpm[] = { +"64 64 5 1", +" c None", +". c #6B6451", +"+ c #9F926D", +"@ c #CFBD8A", +"# c #FFE7A6", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ........................ ", +" ....++++...++++++++++...++++... ", +" ....++++...++++++++++...++++... ", +" ...+++++...++++++++++++++++...++++.... ", +" ..++++++@.####++++++++++++++####.@++++++.. ", +" ..+++++@@@.########################.@@@+++++.. ", +" ..+++++@@@.########################.@@@+++++.. ", +" .++++++@@..##########################..@@++++++. ", +" .+++++@@@.@@@########################@@@.@@@+++++. ", +" ..+++++@@@.@@@@@@@##################@@@@@@@.@@@+++++.. ", +" ..+++++@@@.@@@@@@@##################@@@@@@@.@@@+++++.. ", +" .++++++@@...@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@...@@++++++. ", +" .+++++@@@. .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. .@@@+++++. ", +" .++++@@@. .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. .@@@++++. ", +" .++++@@@. .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. .@@@++++. ", +" .++++@@@. .####@@@@@@@@@@@@@@@@@@@@@@@@####. .@@@++++. ", +" .++++@@@. .################################. .@@@++++. ", +" .++++@@@@. .################################. .@@@@++++. ", +" .++++@@@@. .################################. .@@@@++++. ", +" .++++@@@@@...################################...@@@@@++++. ", +" .+++++@@@@@@@...##########################...@@@@@@@+++++. ", +" .+++++++@@@@@@@@....##################....@@@@@@@@+++++++. ", +" .+++++++@@@@@@@@....##################....@@@@@@@@+++++++. ", +" .++++++++@@@@@@@@@@..................@@@@@@@@@@++++++++. ", +" ..++++++++++@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@++++++++++.. ", +" .+++++++++++++@@@@@@@@@@@@@@@@@@@@@@+++++++++++++. ", +" .+++++++++++++@@@@@@@@@@@@@@@@@@@@@@+++++++++++++. ", +" ...++++++++++++++++++++++++++++++++++++++++++... ", +" ..++++++++++++++++++++++++++++++++++++++.. ", +" ....++++++++++++++++++++++++++++++.... ", +" ....++++++++++++++++++++++++++++++.... ", +" .............................. ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/src/sdl/Srb2SDL.ico b/src/sdl/Srb2SDL.ico index 4e3f81336..87bd2766e 100644 Binary files a/src/sdl/Srb2SDL.ico and b/src/sdl/Srb2SDL.ico differ diff --git a/src/sdl/srb2icon.png b/src/sdl/srb2icon.png index 2aca4b204..39e170ff2 100644 Binary files a/src/sdl/srb2icon.png and b/src/sdl/srb2icon.png differ diff --git a/src/win32/Srb2win.ico b/src/win32/Srb2win.ico index 4e3f81336..87bd2766e 100644 Binary files a/src/win32/Srb2win.ico and b/src/win32/Srb2win.ico differ