thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle doomdef.h a bit

Browse source
This commit is contained in:
SteelT 2020-08-04 01:06:15 -04:00
parent 11671aa6d8
commit 6d850b51d9
1 changed files with 4 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/doomdef.h
View file

@ -131,11 +131,7 @@ extern char logfilename[1024];
#endif #endif
/* A mod name to further distinguish versions. */ /* A mod name to further distinguish versions. */
<<<<<<< HEAD
#define SRB2APPLICATION "SRB2Kart" #define SRB2APPLICATION "SRB2Kart"
=======
#define SRB2APPLICATION "SRB2"
>>>>>>> srb2/next
//#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3 //#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
#ifdef DEVELOP #ifdef DEVELOP
@ -146,7 +142,6 @@ extern char logfilename[1024];
// most interface strings are ignored in development mode. // most interface strings are ignored in development mode.
// we use comprevision and compbranch instead. // we use comprevision and compbranch instead.
#else #else
<<<<<<< HEAD
#define VERSION 2 // Game version #define VERSION 2 // Game version
#define SUBVERSION 0 // more precise version number #define SUBVERSION 0 // more precise version number
#define VERSIONSTRING "v2.0" #define VERSIONSTRING "v2.0"
@ -154,18 +149,10 @@ extern char logfilename[1024];
// Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates! // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates!
// And change CMakeLists.txt, for CMake users! // And change CMakeLists.txt, for CMake users!
// AND appveyor.yml, for the build bots! // AND appveyor.yml, for the build bots!
=======
#define VERSION 202 // Game version
#define SUBVERSION 4 // more precise version number
#define VERSIONSTRING "v2.2.4"
#define VERSIONSTRINGW L"v2.2.4"
// Hey! If you change this, add 1 to the MODVERSION below!
// Otherwise we can't force updates!
>>>>>>> srb2/next
#endif #endif
/* A custom URL protocol for server links. */ /* A custom URL protocol for server links. */
#define SERVER_URL_PROTOCOL "srb2://" #define SERVER_URL_PROTOCOL "srb2kart://"
// Does this version require an added patch file? // Does this version require an added patch file?
// Comment or uncomment this as necessary. // Comment or uncomment this as necessary.
@ -220,25 +207,15 @@ extern char logfilename[1024];
// The Modification ID; must be obtained from Rob ( https://mb.srb2.org/private.php?do=newpm&u=546 ). // The Modification ID; must be obtained from Rob ( https://mb.srb2.org/private.php?do=newpm&u=546 ).
// DO NOT try to set this otherwise, or your modification will be unplayable through the Master Server. // DO NOT try to set this otherwise, or your modification will be unplayable through the Master Server.
<<<<<<< HEAD
// "12" is the default mod ID for version 2.1 // "12" is the default mod ID for version 2.1
// "17" is the 2.1 Kart's mod ID // "17" is the 2.1 Kart's mod ID
#define MODID 17 #define MODID 17
=======
// "18" is the default mod ID for version 2.2
#define MODID 18
>>>>>>> srb2/next
// The Modification Version, starting from 1. Do not follow your version string for this, // The Modification Version, starting from 1. Do not follow your version string for this,
// it's only for detection of the version the player is using so the MS can alert them of an update. // it's only for detection of the version the player is using so the MS can alert them of an update.
// Only set it higher, not lower, obviously. // Only set it higher, not lower, obviously.
<<<<<<< HEAD
// Note that we use this to help keep internal testing in check; this is why v2.1.0 is not version "1". // Note that we use this to help keep internal testing in check; this is why v2.1.0 is not version "1".
#define MODVERSION 6 #define MODVERSION 6
=======
// Note that we use this to help keep internal testing in check; this is why v2.2.0 is not version "1".
#define MODVERSION 44
>>>>>>> srb2/next
// Filter consvars by version // Filter consvars by version
// To version config.cfg, MAJOREXECVERSION is set equal to MODVERSION automatically. // To version config.cfg, MAJOREXECVERSION is set equal to MODVERSION automatically.
@ -266,19 +243,13 @@ extern char logfilename[1024];
#define MAXSKINS 128 #define MAXSKINS 128
#define PLAYERSMASK (MAXPLAYERS-1) #define PLAYERSMASK (MAXPLAYERS-1)
#define MAXPLAYERNAME 21 #define MAXPLAYERNAME 21
// Master Server compatibility ONLY
#define MSCOMPAT_MAXPLAYERS (32)
=======
#define MAXPLAYERS 32
#define MAXSKINS 32
#define PLAYERSMASK (MAXPLAYERS-1)
#define MAXPLAYERNAME 21
#define COLORRAMPSIZE 16 #define COLORRAMPSIZE 16
#define MAXCOLORNAME 32 #define MAXCOLORNAME 32
#define NUMCOLORFREESLOTS 1024 #define NUMCOLORFREESLOTS 1024
// Master Server compatibility ONLY
#define MSCOMPAT_MAXPLAYERS (32)
typedef struct skincolor_s typedef struct skincolor_s
{ {
char name[MAXCOLORNAME+1]; // Skincolor name char name[MAXCOLORNAME+1]; // Skincolor name