diff --git a/src/d_main.c b/src/d_main.c index 57c098214..18bbb985b 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1409,7 +1409,7 @@ void D_SRB2Main(void) // load wad, including the main wad file CONS_Printf("W_InitMultipleFiles(): Adding main IWAD and PWADs.\n"); - if (!W_InitMultipleFiles(startupiwads, mainwads)) + if (!W_InitMultipleFiles(startupiwads, false)) #ifdef _DEBUG CONS_Error("A main WAD file was not found or not valid.\nCheck the log to see which ones.\n"); #else @@ -1468,7 +1468,7 @@ void D_SRB2Main(void) } CONS_Printf("W_InitMultipleFiles(): Adding external PWADs.\n"); - if (!W_InitMultipleFiles(startuppwads, mainwads)) + if (!W_InitMultipleFiles(startuppwads, true)) M_StartMessage(M_GetText("A PWAD file was not found or not valid.\nCheck log.txt to see which ones.\n\nPress ESC\n"), NULL, MM_NOTHING); D_CleanFile(startuppwads); diff --git a/src/d_netcmd.c b/src/d_netcmd.c index ca5e4fd2e..1e92b846f 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -265,22 +265,22 @@ consvar_t cv_playername[MAXSPLITSCREENPLAYERS] = { {"name", "Sonic", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name_OnChange, 0, NULL, NULL, 0, 0, NULL}, {"name2", "Tails", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name2_OnChange, 0, NULL, NULL, 0, 0, NULL}, {"name3", "Knuckles", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name3_OnChange, 0, NULL, NULL, 0, 0, NULL}, - {"name4", "Dr. Eggman", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name4_OnChange, 0, NULL, NULL, 0, 0, NULL} + {"name4", "Dr. Eggman", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name4_OnChange, 0, NULL, NULL, 0, 0, NULL}, }; // player colors UINT16 lastgoodcolor[MAXSPLITSCREENPLAYERS] = {SKINCOLOR_BLUE, SKINCOLOR_BLUE, SKINCOLOR_BLUE, SKINCOLOR_BLUE}; consvar_t cv_playercolor[MAXSPLITSCREENPLAYERS] = { - {"color", "Blue", CV_SAVE|CV_CALL|CV_NOINIT, Color_cons_t, Color_OnChange, 0, NULL, NULL, 0, 0, NULL}, + {"color", "Red", CV_SAVE|CV_CALL|CV_NOINIT, Color_cons_t, Color_OnChange, 0, NULL, NULL, 0, 0, NULL}, {"color2", "Orange", CV_SAVE|CV_CALL|CV_NOINIT, Color_cons_t, Color2_OnChange, 0, NULL, NULL, 0, 0, NULL}, - {"color3", "Red", CV_SAVE|CV_CALL|CV_NOINIT, Color_cons_t, Color3_OnChange, 0, NULL, NULL, 0, 0, NULL}, - {"color4", "Red", CV_SAVE|CV_CALL|CV_NOINIT, Color_cons_t, Color4_OnChange, 0, NULL, NULL, 0, 0, NULL} + {"color3", "Blue", CV_SAVE|CV_CALL|CV_NOINIT, Color_cons_t, Color3_OnChange, 0, NULL, NULL, 0, 0, NULL}, + {"color4", "Red", CV_SAVE|CV_CALL|CV_NOINIT, Color_cons_t, Color4_OnChange, 0, NULL, NULL, 0, 0, NULL}, }; // player's skin, saved for commodity, when using a favorite skins wad.. consvar_t cv_skin[MAXSPLITSCREENPLAYERS] = { {"skin", DEFAULTSKIN, CV_SAVE|CV_CALL|CV_NOINIT, NULL, Skin_OnChange, 0, NULL, NULL, 0, 0, NULL}, {"skin2", DEFAULTSKIN2, CV_SAVE|CV_CALL|CV_NOINIT, NULL, Skin2_OnChange, 0, NULL, NULL, 0, 0, NULL}, {"skin3", DEFAULTSKIN3, CV_SAVE|CV_CALL|CV_NOINIT, NULL, Skin3_OnChange, 0, NULL, NULL, 0, 0, NULL}, - {"skin4", DEFAULTSKIN4, CV_SAVE|CV_CALL|CV_NOINIT, NULL, Skin4_OnChange, 0, NULL, NULL, 0, 0, NULL} + {"skin4", DEFAULTSKIN4, CV_SAVE|CV_CALL|CV_NOINIT, NULL, Skin4_OnChange, 0, NULL, NULL, 0, 0, NULL}, }; // player's followers. Also saved. @@ -288,15 +288,15 @@ consvar_t cv_follower[MAXSPLITSCREENPLAYERS] = { {"follower", "-1", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Follower_OnChange, 0, NULL, NULL, 0, 0, NULL}, {"follower2", "-1", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Follower2_OnChange, 0, NULL, NULL, 0, 0, NULL}, {"follower3", "-1", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Follower3_OnChange, 0, NULL, NULL, 0, 0, NULL}, - {"follower4", "-1", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Follower4_OnChange, 0, NULL, NULL, 0, 0, NULL} + {"follower4", "-1", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Follower4_OnChange, 0, NULL, NULL, 0, 0, NULL}, }; // player's follower colors... Also saved... consvar_t cv_followercolor[MAXSPLITSCREENPLAYERS] = { - {"followercolor", "Match", CV_SAVE|CV_CALL|CV_NOINIT, Followercolor_cons_t, Followercolor_OnChange, 0, NULL, NULL, 0, 0, NULL}, - {"followercolor2", "Match", CV_SAVE|CV_CALL|CV_NOINIT, Followercolor_cons_t, Followercolor2_OnChange, 0, NULL, NULL, 0, 0, NULL}, - {"followercolor3", "Match", CV_SAVE|CV_CALL|CV_NOINIT, Followercolor_cons_t, Followercolor3_OnChange, 0, NULL, NULL, 0, 0, NULL}, - {"followercolor4", "Match", CV_SAVE|CV_CALL|CV_NOINIT, Followercolor_cons_t, Followercolor4_OnChange, 0, NULL, NULL, 0, 0, NULL} + {"followercolor", "1", CV_SAVE|CV_CALL|CV_NOINIT, Followercolor_cons_t, Followercolor_OnChange, 0, NULL, NULL, 0, 0, NULL}, + {"followercolor2", "1", CV_SAVE|CV_CALL|CV_NOINIT, Followercolor_cons_t, Followercolor2_OnChange, 0, NULL, NULL, 0, 0, NULL}, + {"followercolor3", "1", CV_SAVE|CV_CALL|CV_NOINIT, Followercolor_cons_t, Followercolor3_OnChange, 0, NULL, NULL, 0, 0, NULL}, + {"followercolor4", "1", CV_SAVE|CV_CALL|CV_NOINIT, Followercolor_cons_t, Followercolor4_OnChange, 0, NULL, NULL, 0, 0, NULL}, }; @@ -543,17 +543,20 @@ const char *netxcmdnames[MAXNETXCMD - 1] = "ADDFILE", "PAUSE", "ADDPLAYER", - "TEAMCHANGE", + "TEAMCHANGE" "CLEARSCORES", - "LOGIN", "VERIFIED", "RANDOMSEED", "RUNSOC", "REQADDFILE", - "DELFILE", // replace next time we add an XD "SETMOTD", "RESPAWN", "DEMOTED", + "LUACMD", + "LUAVAR", + "LUAFILE", + + // SRB2Kart "SETUPVOTE", "MODIFYVOTE", "PICKVOTE", @@ -564,10 +567,7 @@ const char *netxcmdnames[MAXNETXCMD - 1] = "LEAVEPARTY", "CANCELPARTYINVITE", "GIVEITEM", - "ADDBOT", - "LUACMD", - "LUAVAR", - "LUAFILE" + "ADDBOT" }; // ========================================================================= @@ -767,13 +767,11 @@ void D_RegisterClientCommands(void) { INT32 i; - for (i = 0; i < numskincolors; i++) + for (i = 0; i < MAXSKINCOLORS; i++) { Color_cons_t[i].value = Followercolor_cons_t[i].value = i; Color_cons_t[i].strvalue = Followercolor_cons_t[i].strvalue = skincolors[i].name; } - Color_cons_t[MAXSKINCOLORS].value = Followercolor_cons_t[MAXSKINCOLORS+2].value = 0; - Color_cons_t[MAXSKINCOLORS].strvalue = Followercolor_cons_t[MAXSKINCOLORS+2].strvalue = NULL; Followercolor_cons_t[MAXSKINCOLORS].value = MAXSKINCOLORS; Followercolor_cons_t[MAXSKINCOLORS].strvalue = "Match"; // Add "Match" option, which will make the follower color match the player's @@ -781,6 +779,9 @@ void D_RegisterClientCommands(void) Followercolor_cons_t[MAXSKINCOLORS+1].value = MAXSKINCOLORS+1; Followercolor_cons_t[MAXSKINCOLORS+1].strvalue = "Opposite"; // Add "Opposite" option, ...which is like "Match", but for coloropposite. + Color_cons_t[MAXSKINCOLORS].value = Followercolor_cons_t[MAXSKINCOLORS+2].value = 0; + Color_cons_t[MAXSKINCOLORS].strvalue = Followercolor_cons_t[MAXSKINCOLORS+2].strvalue = NULL; + // Set default player names // Monster Iestyn (12/08/19): not sure where else I could have actually put this, but oh well for (i = 0; i < MAXPLAYERS; i++) diff --git a/src/d_netcmd.h b/src/d_netcmd.h index d9616218a..30a6e845b 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -138,29 +138,30 @@ typedef enum XD_ADDPLAYER, // 10 XD_TEAMCHANGE, // 11 XD_CLEARSCORES, // 12 - // UNUSED 13 (Because I don't want to change these comments) - XD_VERIFIED = 14,//14 - XD_RANDOMSEED, // 15 - XD_RUNSOC, // 16 - XD_REQADDFILE, // 17 - XD_DELFILE, // 18 - replace next time we add an XD - XD_SETMOTD, // 19 - XD_RESPAWN, // 20 - XD_DEMOTED, // 21 - XD_SETUPVOTE, // 22 - XD_MODIFYVOTE, // 23 - XD_PICKVOTE, // 24 - XD_REMOVEPLAYER,// 25 - XD_POWERLEVEL, // 26 - XD_PARTYINVITE, // 27 - XD_ACCEPTPARTYINVITE, // 28 - XD_LEAVEPARTY, // 29 - XD_CANCELPARTYINVITE, // 30 - XD_GIVEITEM, // 31 - XD_ADDBOT, // 32 - XD_LUACMD, // 33 - XD_LUAVAR, // 34 - XD_LUAFILE, // 35 + XD_VERIFIED, // 13 + XD_RANDOMSEED, // 14 + XD_RUNSOC, // 15 + XD_REQADDFILE, // 16 + XD_SETMOTD, // 17 + XD_RESPAWN, // 18 + XD_DEMOTED, // 19 + XD_LUACMD, // 20 + XD_LUAVAR, // 21 + XD_LUAFILE, // 22 + + // SRB2Kart + XD_SETUPVOTE, // 23 + XD_MODIFYVOTE, // 24 + XD_PICKVOTE, // 25 + XD_REMOVEPLAYER,// 26 + XD_POWERLEVEL, // 27 + XD_PARTYINVITE, // 28 + XD_ACCEPTPARTYINVITE, // 29 + XD_LEAVEPARTY, // 30 + XD_CANCELPARTYINVITE, // 31 + XD_GIVEITEM, // 32 + XD_ADDBOT, // 33 + MAXNETXCMD } netxcmd_t; diff --git a/src/dehacked.c b/src/dehacked.c index 7f3c53cae..88e545466 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -6260,16 +6260,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_SIGN_SIDE", "S_SIGN_FACE", - // Steam Riser - "S_STEAM1", - "S_STEAM2", - "S_STEAM3", - "S_STEAM4", - "S_STEAM5", - "S_STEAM6", - "S_STEAM7", - "S_STEAM8", - // Spike Ball "S_SPIKEBALL1", "S_SPIKEBALL2", @@ -7596,46 +7586,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_GHORIZ3", "S_GHORIZ4", - // Blue Diagonal Spring - "S_BDIAG1", - "S_BDIAG2", - "S_BDIAG3", - "S_BDIAG4", - "S_BDIAG5", - "S_BDIAG6", - "S_BDIAG7", - "S_BDIAG8", - - // Yellow Side Spring - "S_YHORIZ1", - "S_YHORIZ2", - "S_YHORIZ3", - "S_YHORIZ4", - "S_YHORIZ5", - "S_YHORIZ6", - "S_YHORIZ7", - "S_YHORIZ8", - - // Red Side Spring - "S_RHORIZ1", - "S_RHORIZ2", - "S_RHORIZ3", - "S_RHORIZ4", - "S_RHORIZ5", - "S_RHORIZ6", - "S_RHORIZ7", - "S_RHORIZ8", - - // Blue Side Spring - "S_BHORIZ1", - "S_BHORIZ2", - "S_BHORIZ3", - "S_BHORIZ4", - "S_BHORIZ5", - "S_BHORIZ6", - "S_BHORIZ7", - "S_BHORIZ8", - // Booster "S_BOOSTERSOUND", "S_YELLOWBOOSTERROLLER", @@ -9064,7 +9014,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_SONICBUSH", // Marble Zone - "S_FLAMEPARTICLE", + "S_MARBLEFLAMEPARTICLE", "S_MARBLETORCH", "S_MARBLELIGHT", "S_MARBLEBURNER", @@ -9077,12 +9027,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_RUSTYLAMP_ORANGE", "S_RUSTYCHAIN", - // D2 Balloon Panic - "S_BALLOON", - "S_BALLOONPOP1", - "S_BALLOONPOP2", - "S_BALLOONPOP3", - // Smokin' & Vapin' (Don't try this at home, kids!) "S_PETSMOKE0", "S_PETSMOKE1", @@ -9385,8 +9329,6 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s "MT_THOK", // Thok! mobj "MT_PLAYER", - "MT_TAILSOVERLAY", // c: - "MT_METALJETFUME", // Enemies "MT_BLUECRAWLA", // Crawla (Blue) @@ -10150,23 +10092,6 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s "MT_ROCKCRUMBLE15", "MT_ROCKCRUMBLE16", - "MT_SRB1_CRAWLA", - "MT_SRB1_BAT", - "MT_SRB1_ROBOFISH", - "MT_SRB1_VOLCANOGUY", - "MT_SRB1_HOPPY", - "MT_SRB1_HOPPYWATER", - "MT_SRB1_HOPPYSKYLAB", - "MT_SRB1_MMZFLYING", - "MT_SRB1_UFO", - "MT_SRB1_GRAYBOT", - "MT_SRB1_ROBOTOPOLIS", - "MT_SRB1_RBZBUZZ", - "MT_SRB1_RBZSPIKES", - "MT_SRB1_METALSONIC", - "MT_SRB1_GOLDBOT", - "MT_SRB1_GENREX", - // Level debris "MT_GFZDEBRIS", "MT_BRICKDEBRIS", @@ -10322,7 +10247,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s "MT_SONICBUSH", // Marble Zone - "MT_FLAMEPARTICLE", + "MT_MARBLEFLAMEPARTICLE", "MT_MARBLETORCH", "MT_MARBLELIGHT", "MT_MARBLEBURNER", @@ -10334,9 +10259,6 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s "MT_RUSTYLAMP_ORANGE", "MT_RUSTYCHAIN", - // D2 Balloon Panic - "MT_BALLOON", - // Smokin' & Vapin' (Don't try this at home, kids!) "MT_PETSMOKER", "MT_PETSMOKE", diff --git a/src/info.c b/src/info.c index f6a9512b8..dfbd9499b 100644 --- a/src/info.c +++ b/src/info.c @@ -530,14 +530,14 @@ char sprnames[NUMSPRITES + 1][5] = "HIT3","RETI","AIDU","KSPK","LZI1","LZI2","KLIT","FZSM","FZBM","FPRT", "SBUS","MARB","FUFO","RUST","BLON","VAPE","HTZA","HTZB","SGVA","SGVB", "SGVC","PGTR","PGF1","PGF2","PGF3","PGBH","DPLR","SPTL","ENM1","GARU", - "MARR","REAP","JITB","CDMO","CDBU","PINE","PPLR","DPPT","AATR","COCO", + "MARR","REAP","JITB","CDMO","CDBU","DPIN","PPLR","DPPT","AATR","COCO", "BDST","FROG","CBRA","HOLE","BBRA","EGFG","SMKP","MTYM","THWP","SNOB", - "ICEB","CNDL","DOCH","DUCK","GTRE","CHES","CHIM","DRGN","LZMN","PGSS", + "ICEB","ECND","DOCH","DUCK","GTRE","CHES","CHIM","DRGN","LZMN","PGSS", "ZTCH","MKMA","MKMP","RTCH","BOWL","BOWH","BRRL","BRRR","HRSE","TOAH", "BFRT","OFRT","RFRT","PFRT","ASPK","HBST","HBSO","HBSF","WBLZ","WBLN", - "FWRK","MXCL","RGSP","DRAF","GRES","OTFG","DBOS","EGOO","WTRL","XMS4", - "XMS5","FBUB","GCHA","CHEZ","VIEW","DBCL","DBNC","DBST", + "FWRK","MXCL","RGSP","DRAF","GRES","OTFG","DBOS","EGOO","WTRL", + "FBUB","GCHA","CHEZ","VIEW","DBCL","DBNC","DBST", }; char spr2names[NUMPLAYERSPRITES][5] = @@ -4500,7 +4500,7 @@ state_t states[NUMSTATES] = {SPR_SBUS, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SONICBUSH // Marble Zone - {SPR_MARB, FF_FULLBRIGHT|FF_ANIMATE|5, TICRATE, {NULL}, 3, 3, S_NULL}, // S_FLAMEPARTICLE + {SPR_MARB, FF_FULLBRIGHT|FF_ANIMATE|5, TICRATE, {NULL}, 3, 3, S_NULL}, // S_MARBLEFLAMEPARTICLE {SPR_MARB, FF_FULLBRIGHT|FF_ANIMATE, 8*3, {A_FlameParticle}, 3, 3, S_MARBLETORCH}, // S_MARBLETORCH {SPR_MARB, FF_FULLBRIGHT|FF_TRANS80|4, -1, {NULL}, 1, 29, S_NULL}, // S_MARBLELIGHT {SPR_MARB, 9, -1, {NULL}, 0, 0, S_NULL}, // S_MARBLEBURNER @@ -4513,12 +4513,6 @@ state_t states[NUMSTATES] = {SPR_RUST, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_RUSTYLAMP_ORANGE {SPR_RUST, 1, -1, {NULL}, 0, 0, S_NULL}, // S_RUSTYCHAIN - // D2 Balloon Panic - {SPR_BLON, FF_ANIMATE, -1, {NULL}, 2, 5, S_BALLOON}, // S_BALLOON - {SPR_BLON, FF_ANIMATE|3, 2, {NULL}, 1, 1, S_BALLOONPOP2}, // S_BALLOONPOP1 - {SPR_NULL, 0, 15*TICRATE, {NULL}, 0, 0, S_BALLOONPOP3}, // S_BALLOONPOP2 - {SPR_NULL, 0, 0, {A_SpawnFreshCopy}, 0, 0, S_NULL}, // S_BALLOONPOP3 - // Smokin' & Vapin' (Don't try this at home, kids!) {SPR_SMOK, 0, 1, {A_SetScale}, FRACUNIT/2, 0, S_PETSMOKE1}, // S_PETSMOKE0 {SPR_SMOK, 0, 5, {A_SetScale}, FRACUNIT*2, 1, S_PETSMOKE2}, // S_PETSMOKE1 @@ -8346,7 +8340,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 20*FRACUNIT, // mass 0, // damage sfx_None, // activesound - MF_SPRING|MF_NOGRAVITY, // flags + MF_NOGRAVITY, // flags S_BALLOONPOP1 // raisestate }, @@ -25539,9 +25533,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_FLAMEPARTICLE + { // MT_MARBLEFLAMEPARTICLE -1, // doomednum - S_FLAMEPARTICLE,// spawnstate + S_MARBLEFLAMEPARTICLE,// spawnstate 1000, // spawnhealth S_NULL, // seestate sfx_None, // seesound @@ -25575,7 +25569,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = 8, // reactiontime sfx_None, // attacksound S_NULL, // painstate - MT_FLAMEPARTICLE,// painchance + MT_MARBLEFLAMEPARTICLE,// painchance sfx_None, // painsound S_NULL, // meleestate S_NULL, // missilestate @@ -25728,33 +25722,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_BALLOON - 462, // doomednum - S_BALLOON, // spawnstate - 1000, // spawnhealth - S_NULL, // seestate - sfx_None, // seesound - 8, // reactiontime - sfx_None, // attacksound - S_NULL, // painstate - 0, // painchance - sfx_None, // painsound - S_NULL, // meleestate - S_NULL, // missilestate - S_BALLOONPOP1, // deathstate - S_NULL, // xdeathstate - sfx_s3k77, // deathsound - 0, // speed - 32*FRACUNIT, // radius - 64*FRACUNIT, // height - 0, // display offset - 0, // mass - 0, // damage - sfx_None, // activesound - MF_SPECIAL|MF_NOGRAVITY|MF_SCENERY, // flags - S_NULL // raisestate - }, - { // MT_PETSMOKER 2018, // doomednum S_INVISIBLE, // spawnstate diff --git a/src/info.h b/src/info.h index 86540b73d..a4ce8874c 100644 --- a/src/info.h +++ b/src/info.h @@ -5209,8 +5209,6 @@ typedef enum mobj_type MT_THOK, // Thok! mobj MT_PLAYER, - MT_TAILSOVERLAY, // c: - MT_METALJETFUME, // Enemies MT_BLUECRAWLA, // Crawla (Blue) diff --git a/src/p_floor.c b/src/p_floor.c index ca69a5c6a..8aff86421 100644 --- a/src/p_floor.c +++ b/src/p_floor.c @@ -1026,7 +1026,6 @@ static mobj_t *SearchMarioNode(msecnode_t *node) { case MT_NULL: case MT_UNKNOWN: - case MT_TAILSOVERLAY: case MT_THOK: case MT_GHOST: case MT_OVERLAY: diff --git a/src/w_wad.c b/src/w_wad.c index cad9da5e8..eeb4dd227 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -875,9 +875,6 @@ INT32 W_InitMultipleFiles(char **filenames, boolean addons) { INT32 rc = 1; - // open all the files, load headers, and count lumps - numwadfiles = 0; - // will be realloced as lumps are added for (; *filenames; filenames++) { diff --git a/src/win32/Srb2win.rc b/src/win32/Srb2win.rc index 53eb1d3f8..430566303 100644 --- a/src/win32/Srb2win.rc +++ b/src/win32/Srb2win.rc @@ -98,9 +98,9 @@ BEGIN VALUE "CompanyName", "Kart Krew\0" VALUE "FileDescription", "SRB2Kart\0" VALUE "FileVersion", VERSIONSTRING - VALUE "InternalName", "srb2\0" + VALUE "InternalName", "srb2kart\0" VALUE "LegalCopyright", "Copyright 1998-2020 by Kart Krew\0" - VALUE "LegalTrademarks", "Sonic the Hedgehog and related characters are trademarks of Sega.\0" + VALUE "LegalTrademarks", "Dr. Eggman and related characters are trademarks of Sega.\0" VALUE "OriginalFilename", "srb2kart.exe\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "SRB2Kart\0"