From 3f6e1a87de21862e9da930d6978a891bfe283454 Mon Sep 17 00:00:00 2001 From: Night Owl Date: Fri, 13 Jan 2017 01:34:38 +0500 Subject: [PATCH] Update constants. --- dlls/bubblemod/BMOD_constants.h | 26 +++++++++++++++++++++++--- dlls/bubblemod/BMOD_messaging.cpp | 3 ++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/bubblemod/BMOD_constants.h b/dlls/bubblemod/BMOD_constants.h index 349fe968..ea8224cb 100644 --- a/dlls/bubblemod/BMOD_constants.h +++ b/dlls/bubblemod/BMOD_constants.h @@ -42,7 +42,7 @@ #define BMOD_BRANCH_NAME "Custom Bubblemod" // The version of your branch -#define BMOD_BRANCH_VERSION "1.0.0" +#define BMOD_BRANCH_VERSION "2.2.3" // The URL of the website describing your branch #define BMOD_BRANCH_URL "http://www.bubblemod.org" @@ -52,10 +52,30 @@ #define BMOD_VERSION "2.2.3a" -#ifdef _WIN32 +#if defined(_WIN32) && defined(_MSC_VER) #define BMOD_PLATFORM "WIN32" +#elif defined(_WIN32) && defined(__MINGW32_) +#define BMOD_PLATFORM "WIN32-MinGW" +#elif defined(__ANDROID__) +#define BMOD_PLATFORM "Android" +#elif defined(__APPLE__) +#define BMOD_PLATFORM "Apple" +#elif defined(__FreeBSD__) +#define BMOD_PLATFORM "FreeBSD" +#elif defined(__NetBSD__) +#define BMOD_PLATFORM "NetBSD" +#elif defined(__OpenBSD__) +#define BMOD_PLATFORM "OpenBSD" #else #define BMOD_PLATFORM "Linux" #endif -#endif \ No newline at end of file +#if defined(__amd64__) || defined(_M_X64) +#define BMOD_ARCH "amd64" +#elif defined(__i386__) || defined(_X86_) || defined(_M_IX86) +#define BMOD_ARCH "i386" +#elif defined(__arm__) || defined(_M_ARM) +#define BMOD_ARCH "arm" +#endif + +#endif diff --git a/dlls/bubblemod/BMOD_messaging.cpp b/dlls/bubblemod/BMOD_messaging.cpp index a60409e6..29d421a9 100644 --- a/dlls/bubblemod/BMOD_messaging.cpp +++ b/dlls/bubblemod/BMOD_messaging.cpp @@ -59,10 +59,11 @@ void PrintMessage( CBaseEntity *pEnt, int iChannel, Vector vecColor, Vector vecT // BMOD_PreChangeLevel(); - sprintf(szText, "BUBBLE MOD - http://www.bubblemod.org\n%s Version %s - %s\n\nCurrent Map: %s\nNext Map: %s\nTime Left: %s\nFrags Left: %i/%i", + sprintf(szText, "BUBBLE MOD - http://www.bubblemod.org\n%s Version %s - %s-%s\n\nCurrent Map: %s\nNext Map: %s\nTime Left: %s\nFrags Left: %i/%i", BMOD_BRANCH_NAME, BMOD_BRANCH_VERSION, BMOD_PLATFORM, + BMOD_ARCH, CVAR_GET_STRING("bm_map"), CVAR_GET_STRING("bm_nextmap"), szTime,