stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 04:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

No more modulo bullshit in VERSION

Browse source 
VERSION is the first number, SUBVERSION is the second number, and the third number burns in hell; we really don't need that precision

# Conflicts:
#	src/doomdef.h
This commit is contained in:
Sally Cochenour 2020-04-12 23:51:00 -04:00 committed by Wolfy
parent 0a50317e49
commit 1fac0505a4
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/d_clisrv.c
View file

@ -1915,7 +1915,7 @@ void CL_UpdateServerList(boolean internetsearch, INT32 room)
{ {
char version[8] = ""; char version[8] = "";
#if VERSION > 0 || SUBVERSION > 0 #if VERSION > 0 || SUBVERSION > 0
snprintf(version, sizeof (version), "%d.%d.%d", VERSION/100, VERSION%100, SUBVERSION); snprintf(version, sizeof (version), "%d.%d", VERSION, SUBVERSION);
#else #else
strcpy(version, GetRevisionString()); strcpy(version, GetRevisionString());
#endif #endif
@ -2457,8 +2457,8 @@ static void CL_ConnectToServer(boolean viams)
gametypestr = Gametype_Names[num]; gametypestr = Gametype_Names[num];
if (gametypestr) if (gametypestr)
CONS_Printf(M_GetText("Gametype: %s\n"), gametypestr); CONS_Printf(M_GetText("Gametype: %s\n"), gametypestr);
CONS_Printf(M_GetText("Version: %d.%d.%u\n"), serverlist[i].info.version/100, CONS_Printf(M_GetText("Version: %d.%d\n"),
serverlist[i].info.version%100, serverlist[i].info.subversion); serverlist[i].info.version, serverlist[i].info.subversion);
} }
SL_ClearServerList(servernode); SL_ClearServerList(servernode);
#endif #endif
@ -3375,8 +3375,8 @@ static void Got_RemovePlayer(UINT8 **p, INT32 playernum);
// called one time at init // called one time at init
void D_ClientServerInit(void) void D_ClientServerInit(void)
{ {
DEBFILE(va("- - -== SRB2Kart v%d.%.2d.%d "VERSIONSTRING" debugfile ==- - -\n", DEBFILE(va("- - -== SRB2Kart v%d.%d "VERSIONSTRING" debugfile ==- - -\n",
VERSION/100, VERSION%100, SUBVERSION)); VERSION, SUBVERSION));
#ifndef NONET #ifndef NONET
COM_AddCommand("getplayernum", Command_GetPlayerNum); COM_AddCommand("getplayernum", Command_GetPlayerNum);
@ -3872,7 +3872,7 @@ static void HandleConnect(SINT8 node)
SV_SendRefuse(node, M_GetText("You have been banned\nfrom the server")); SV_SendRefuse(node, M_GetText("You have been banned\nfrom the server"));
else if (netbuffer->u.clientcfg.version != VERSION else if (netbuffer->u.clientcfg.version != VERSION
|| netbuffer->u.clientcfg.subversion != SUBVERSION) || netbuffer->u.clientcfg.subversion != SUBVERSION)
SV_SendRefuse(node, va(M_GetText("Different SRB2Kart versions cannot\nplay a netgame!\n(server version %d.%d.%d)"), VERSION/100, VERSION%100, SUBVERSION)); SV_SendRefuse(node, va(M_GetText("Different SRB2Kart versions cannot\nplay a netgame!\n(server version %d.%d)"), VERSION, SUBVERSION));
else if (!cv_allownewplayer.value && node) else if (!cv_allownewplayer.value && node)
SV_SendRefuse(node, M_GetText("The server is not accepting\njoins for the moment")); SV_SendRefuse(node, M_GetText("The server is not accepting\njoins for the moment"));
else if (D_NumPlayers() >= maxplayers) else if (D_NumPlayers() >= maxplayers)

4
src/doomdef.h
View file

@ -149,8 +149,8 @@ extern FILE *logstream;
// 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
#define VERSION 102 // Game version #define VERSION 1 // Game version
#define SUBVERSION 0 // more precise version number #define SUBVERSION 2 // more precise version number
#define VERSIONSTRING "v1.2" #define VERSIONSTRING "v1.2"
#define VERSIONSTRINGW L"v1.2" #define VERSIONSTRINGW L"v1.2"
// 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!

4
src/mserv.c
View file

@ -751,7 +751,7 @@ static INT32 AddToMasterServer(boolean firstadd)
strcpy(info->name, cv_servername.string); strcpy(info->name, cv_servername.string);
M_Memcpy(&info->room, & room, sizeof (INT32)); M_Memcpy(&info->room, & room, sizeof (INT32));
#if VERSION > 0 || SUBVERSION > 0 #if VERSION > 0 || SUBVERSION > 0
sprintf(info->version, "%d.%d.%d", VERSION/100, VERSION%100, SUBVERSION); sprintf(info->version, "%d.%d", VERSION, SUBVERSION);
#else // Trunk build, send revision info #else // Trunk build, send revision info
strcpy(info->version, GetRevisionString()); strcpy(info->version, GetRevisionString());
#endif #endif
@ -789,7 +789,7 @@ static INT32 RemoveFromMasterSever(void)
strcpy(info->ip, ""); strcpy(info->ip, "");
strcpy(info->port, int2str(current_port)); strcpy(info->port, int2str(current_port));
strcpy(info->name, registered_server.name); strcpy(info->name, registered_server.name);
sprintf(info->version, "%d.%d.%d", VERSION/100, VERSION%100, SUBVERSION); sprintf(info->version, "%d.%d", VERSION, SUBVERSION);
msg.type = REMOVE_SERVER_MSG; msg.type = REMOVE_SERVER_MSG;
msg.length = (UINT32)sizeof (msg_server_t); msg.length = (UINT32)sizeof (msg_server_t);