[PATCH] Consistent naming and versions Try to be consistent with: * the applications name - TyrQuake * the version number - TYR_VERSION diff -urN a/NQ/host_cmd.c head/NQ/host_cmd.c --- a/NQ/host_cmd.c 2006-03-11 23:24:21.000000000 +1030 +++ head/NQ/host_cmd.c 2006-03-12 00:41:23.000000000 +1030 @@ -86,7 +86,7 @@ print = SV_ClientPrintf; print("host: %s\n", Cvar_VariableString("hostname")); - print("version: %s\n", stringify(TYR_VERSION)); + print("version: TyrQuake-%s\n", stringify(TYR_VERSION)); if (tcpipAvailable) print("tcp/ip: %s\n", my_tcpip_address); if (ipxAvailable) @@ -716,7 +716,7 @@ void Host_Version_f(void) { - Con_Printf("Version %s\n", stringify(TYR_VERSION)); + Con_Printf("Version TyrQuake-%s\n", stringify(TYR_VERSION)); Con_Printf("Exe: " __TIME__ " " __DATE__ "\n"); } diff -urN a/NQ/sv_main.c head/NQ/sv_main.c --- a/NQ/sv_main.c 2006-03-11 23:24:21.000000000 +1030 +++ head/NQ/sv_main.c 2006-03-12 00:42:05.000000000 +1030 @@ -204,7 +204,7 @@ char message[2048]; MSG_WriteByte(&client->message, svc_print); - sprintf(message, "%c\nVERSION %s SERVER (%i CRC)", 2, + sprintf(message, "%c\nVERSION TyrQuake-%s SERVER (%i CRC)", 2, stringify(TYR_VERSION), pr_crc); MSG_WriteString(&client->message, message); diff -urN a/NQ/sys_linux.c head/NQ/sys_linux.c --- a/NQ/sys_linux.c 2006-02-12 09:27:56.000000000 +1030 +++ head/NQ/sys_linux.c 2006-03-12 00:42:29.000000000 +1030 @@ -380,7 +380,7 @@ fcntl(STDIN_FILENO, F_SETFL, fcntl(STDIN_FILENO, F_GETFL, 0) | O_NONBLOCK); if (!nostdout) - printf("Tyr-Quake -- Version %s\n", stringify(TYR_VERSION)); + printf("TyrQuake -- Version %s\n", stringify(TYR_VERSION)); oldtime = Sys_DoubleTime() - 0.1; while (1) { diff -urN a/NQ/sys_win.c head/NQ/sys_win.c --- a/NQ/sys_win.c 2006-02-12 09:29:09.000000000 +1030 +++ head/NQ/sys_win.c 2006-03-12 00:46:45.000000000 +1030 @@ -363,7 +363,7 @@ if ((vinfo.dwMajorVersion < 4) || (vinfo.dwPlatformId == VER_PLATFORM_WIN32s)) { - Sys_Error("Tyr-Quake requires at least Win95 or NT 4.0"); + Sys_Error("TyrQuake requires at least Win95 or NT 4.0"); } if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT) diff -urN a/NQ/vid_win.c head/NQ/vid_win.c --- a/NQ/vid_win.c 2004-08-29 20:06:37.000000000 +0930 +++ head/NQ/vid_win.c 2006-03-12 00:47:05.000000000 +1030 @@ -639,7 +639,7 @@ wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = NULL; wc.lpszMenuName = 0; - wc.lpszClassName = "Tyr-Quake"; + wc.lpszClassName = "TyrQuake"; if (!RegisterClass(&wc)) Sys_Error("Couldn't register window class"); @@ -1275,8 +1275,8 @@ // for the rest of the session if (!vid_mode_set) { mainwindow = CreateWindowEx(ExWindowStyle, - "Tyr-Quake", - "Tyr-Quake", + "TyrQuake", + "TyrQuake", WindowStyle, 0, 0, WindowRect.right - WindowRect.left, diff -urN a/QW/client/bothdefs.h head/QW/client/bothdefs.h --- a/QW/client/bothdefs.h 2006-03-12 00:01:36.000000000 +1030 +++ head/QW/client/bothdefs.h 2006-03-12 00:09:44.000000000 +1030 @@ -23,11 +23,6 @@ // defs common to client and server -#define GLQUAKE_VERSION 1.00 -#define VERSION 2.40 -#define LINUX_VERSION 0.98 - - #if defined(__i386__) && !defined(id386) #define id386 1 #else diff -urN a/QW/client/cl_main.c head/QW/client/cl_main.c --- a/QW/client/cl_main.c 2006-02-18 13:21:44.000000000 +1030 +++ head/QW/client/cl_main.c 2006-03-12 00:43:21.000000000 +1030 @@ -200,7 +200,7 @@ void CL_Version_f(void) { - Con_Printf("Version %4.2f\n", VERSION); + Con_Printf("Version TyrQuake-%s\n", stringify(TYR_VERSION)); Con_Printf("Exe: " __TIME__ " " __DATE__ "\n"); } @@ -1080,7 +1080,7 @@ Info_SetValueForKey(cls.userinfo, "bottomcolor", "0", MAX_INFO_STRING); Info_SetValueForKey(cls.userinfo, "rate", "2500", MAX_INFO_STRING); Info_SetValueForKey(cls.userinfo, "msg", "1", MAX_INFO_STRING); - sprintf(st, "%4.2f-%04d", VERSION, build_number()); + sprintf(st, "TyrQuake-%s", stringify(TYR_VERSION)); Info_SetValueForStarKey(cls.userinfo, "*ver", st, MAX_INFO_STRING); CL_InitInput(); @@ -1531,9 +1531,7 @@ host_initialized = true; - Con_Printf("\nClient Version %4.2f (Build %04d)\n\n", VERSION, - build_number()); - + Con_Printf("\nClient Version TyrQuake-%s\n\n", stringify(TYR_VERSION)); Con_Printf("€ QuakeWorld Initialized ‚\n"); } diff -urN a/QW/client/sys_linux.c head/QW/client/sys_linux.c --- a/QW/client/sys_linux.c 2006-02-12 09:29:43.000000000 +1030 +++ head/QW/client/sys_linux.c 2006-03-12 00:43:58.000000000 +1030 @@ -345,7 +345,8 @@ fcntl(STDIN_FILENO, F_SETFL, fcntl(STDIN_FILENO, F_GETFL, 0) | O_NONBLOCK); if (!nostdout) - printf("Linux QuakeWorld -- Version %0.3f\n", LINUX_VERSION); + printf("Linux QuakeWorld -- Version TyrQuake-%s\n", + stringify(TYR_VERSION)); Sys_Init(); diff -urN a/QW/client/vid_win.c head/QW/client/vid_win.c --- a/QW/client/vid_win.c 2004-08-29 20:06:37.000000000 +0930 +++ head/QW/client/vid_win.c 2006-03-12 00:47:54.000000000 +1030 @@ -638,7 +638,7 @@ wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = NULL; wc.lpszMenuName = 0; - wc.lpszClassName = "Tyr-QWClient"; + wc.lpszClassName = "TyrQuake"; if (!RegisterClass(&wc)) Sys_Error("Couldn't register window class"); @@ -1274,8 +1274,8 @@ // for the rest of the session if (!vid_mode_set) { mainwindow = CreateWindowEx(ExWindowStyle, - "Tyr-QWClient", - "Tyr-QWClient", + "TyrQuake", + "TyrQuake", WindowStyle, 0, 0, WindowRect.right - WindowRect.left, diff -urN a/QW/server/sv_main.c head/QW/server/sv_main.c --- a/QW/server/sv_main.c 2004-08-11 22:35:12.000000000 +0930 +++ head/QW/server/sv_main.c 2006-03-12 00:44:57.000000000 +1030 @@ -527,8 +527,8 @@ version = atoi(Cmd_Argv(1)); if (version != PROTOCOL_VERSION) { - Netchan_OutOfBandPrint(net_from, "%c\nServer is version %4.2f.\n", - A2C_PRINT, VERSION); + Netchan_OutOfBandPrint(net_from, "%c\nServer is protocol version %i\n", + A2C_PRINT, PROTOCOL_VERSION); Con_Printf("* rejected connect from version %i\n", version); return; } @@ -1331,7 +1331,8 @@ for (i = 0; i < MAX_MODELS; i++) sprintf(localmodels[i], "*%i", i); - Info_SetValueForStarKey(svs.info, "*version", va("%4.2f", VERSION), + Info_SetValueForStarKey(svs.info, "*version", + va("TyrQuake-%s", stringify(TYR_VERSION)), MAX_SERVERINFO_STRING); // init fraglog stuff @@ -1611,10 +1612,7 @@ Con_Printf("Exe: " __TIME__ " " __DATE__ "\n"); Con_Printf("%4.1f megabyte heap\n", parms->memsize / (1024 * 1024.0)); - - Con_Printf("\nServer Version %4.2f (Build %04d)\n\n", VERSION, - build_number()); - + Con_Printf("\nServer Version TyrQuake-%s\n\n", stringify(TYR_VERSION)); Con_Printf("======== QuakeWorld Initialized ========\n"); // process command line arguments diff -urN a/common/gl_vidnt.c head/common/gl_vidnt.c --- a/common/gl_vidnt.c 2005-12-31 21:26:01.000000000 +1030 +++ head/common/gl_vidnt.c 2006-03-12 05:56:17.000000000 +1030 @@ -276,8 +276,8 @@ // Create the DIB window dibwindow = CreateWindowEx(ExWindowStyle, - "Tyr-GLQuake", - "Tyr-GLQuake", + "TyrQuake", + "TyrQuake", WindowStyle, rect.left, rect.top, width, @@ -363,8 +363,8 @@ // Create the DIB window dibwindow = CreateWindowEx(ExWindowStyle, - "Tyr-GLQuake", - "Tyr-GLQuake", + "TyrQuake", + "TyrQuake", WindowStyle, rect.left, rect.top, width, @@ -1377,7 +1377,7 @@ wc.hCursor = LoadCursor(NULL, IDC_ARROW); wc.hbrBackground = NULL; wc.lpszMenuName = 0; - wc.lpszClassName = "Tyr-GLQuake"; + wc.lpszClassName = "TyrQuake"; if (!RegisterClass(&wc)) Sys_Error("Couldn't register window class");