marrub
/
spingle
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace version numbers with strings

master
an 2019-11-25 01:55:47 -05:00
parent 8452118b9c
commit 3bbba8adce
8 changed files with 37 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/console.c
View File

@ -1227,7 +1227,7 @@ void Con_DrawConsole (int lines, qboolean drawinput)
//draw version number in bottom right
y += 8;
q_snprintf (ver, sizeof(ver), "QuakeSpasm " QUAKESPASM_VER_STRING);
q_snprintf (ver, sizeof(ver), "QuakeSpasm " QUAKESPASM_VERSION);
for (x = 0; x < (int)strlen(ver); x++)
Draw_Character ((con_linewidth - strlen(ver) + x + 2)<<3, y, ver[x] /*+ 128*/);
}

2
source/gl_vidsdl.c
View File

@ -505,7 +505,7 @@ static qboolean VID_SetMode (int width, int height, int refreshrate, int bpp, qb
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, fsaa > 0 ? 1 : 0);
SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, fsaa);
q_snprintf(caption, sizeof(caption), "QuakeSpasm " QUAKESPASM_VER_STRING);
q_snprintf(caption, sizeof(caption), "QuakeSpasm " QUAKESPASM_VERSION);
/* Create the window if needed, hidden */
if (!draw_context)

4
source/host.c
View File

@ -230,8 +230,8 @@ void Host_FindMaxClients (void)
void Host_Version_f (void)
{
Con_Printf ("Quake Version %1.2f\n", VERSION);
Con_Printf ("QuakeSpasm Version " QUAKESPASM_VER_STRING "\n");
Con_Printf ("Quake Version %s\n", VERSION);
Con_Printf ("QuakeSpasm Version " QUAKESPASM_VERSION "\n");
Con_Printf ("Exe: " __TIME__ " " __DATE__ "\n");
}

2
source/host_cmd.c
View File

@ -442,7 +442,7 @@ void Host_Status_f (void)
print_fn = SV_ClientPrintf;
print_fn ("host: %s\n", Cvar_VariableString ("hostname"));
print_fn ("version: %4.2f\n", VERSION);
print_fn ("version: " VERSION "\n");
if (tcpipAvailable)
print_fn ("tcp/ip: %s\n", my_tcpip_address);
if (ipxAvailable)

6
source/main_sdl.c
View File

@ -105,10 +105,10 @@ int main(int argc, char *argv[])
if (!parms.membase)
Sys_Error ("Not enough memory free; check disk space\n");
Sys_Printf("Quake %1.2f (c) id Software\n", VERSION);
Sys_Printf("FitzQuake %1.2f (c) John Fitzgibbons\n", FITZQUAKE_VERSION);
Sys_Printf("Quake " VERSION " (c) id Software\n");
Sys_Printf("FitzQuake " FITZQUAKE_VERSION " (c) John Fitzgibbons\n");
Sys_Printf("FitzQuake SDL port (c) SleepwalkR, Baker\n");
Sys_Printf("QuakeSpasm " QUAKESPASM_VER_STRING " (c) Ozkan Sezer, Eric Wasylishen & others\n");
Sys_Printf("QuakeSpasm " QUAKESPASM_VERSION " (c) Ozkan Sezer, Eric Wasylishen & others\n");
Sys_Printf("Host_Init\n");
Host_Init();

2
source/menu.c
View File

@ -1696,7 +1696,7 @@ void M_Quit_Draw (void) //johnfitz -- modified for new quit message
m_state = m_quit;
}
sprintf(msg1, "QuakeSpasm " QUAKESPASM_VER_STRING);
sprintf(msg1, "QuakeSpasm " QUAKESPASM_VERSION);
//okay, this is kind of fucked up. M_DrawTextBox will always act as if
//width is even. Also, the width and lines values are for the interior of the box,

17
source/quakedef.h
View File

@ -26,20 +26,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// quakedef.h -- primary header for client
#define VERSION 1.09
#define FITZQUAKE_VERSION 0.85 //johnfitz
#define QUAKESPASM_VERSION 0.93
#define QUAKESPASM_VER_PATCH 1 // helper to print a string like 0.93.1
#ifndef QUAKESPASM_VER_SUFFIX
#define QUAKESPASM_VER_SUFFIX // optional version suffix string literal like "-beta1"
#endif
#define QS_STRINGIFY_(x) #x
#define QS_STRINGIFY(x) QS_STRINGIFY_(x)
// combined version string like "0.92.1-beta1"
#define QUAKESPASM_VER_STRING QS_STRINGIFY(QUAKESPASM_VERSION) "." QS_STRINGIFY(QUAKESPASM_VER_PATCH) QUAKESPASM_VER_SUFFIX
#define VERSION "1.09"
#define FITZQUAKE_VERSION "0.85" //johnfitz
#define QUAKESPASM_VERSION "0.93.1"
//define PARANOID // speed sapping error checking

2
source/sv_main.c
View File

@ -289,7 +289,7 @@ void SV_SendServerinfo (client_t *client)
int i; //johnfitz
MSG_WriteByte (&client->message, svc_print);
sprintf (message, "%c\nFITZQUAKE %1.2f SERVER (%i CRC)\n", 2, FITZQUAKE_VERSION, pr_crc); //johnfitz -- include fitzquake version
sprintf (message, "%c\nFITZQUAKE " FITZQUAKE_VERSION " SERVER (%i CRC)\n", 2, pr_crc); //johnfitz -- include fitzquake version
MSG_WriteString (&client->message,message);
MSG_WriteByte (&client->message, svc_serverinfo);