From 8fc803fee3a8ea76d89dd0ddeaee67fbf683e654 Mon Sep 17 00:00:00 2001 From: terminx Date: Mon, 11 Jan 2016 05:05:25 +0000 Subject: [PATCH] Negligible change to OS string printed at startup. git-svn-id: https://svn.eduke32.com/eduke32@5539 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/winbits.c | 2 +- polymer/eduke32/source/jaudiolib/src/multivoc.c | 6 +++--- polymer/eduke32/source/osdcmds.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/polymer/eduke32/build/src/winbits.c b/polymer/eduke32/build/src/winbits.c index dd000f2e6..56400d8c7 100644 --- a/polymer/eduke32/build/src/winbits.c +++ b/polymer/eduke32/build/src/winbits.c @@ -107,7 +107,7 @@ static void win_printversion(void) Bstrcat(&str[l], osv.szCSDVersion); } - initprintf("%s (build %lu.%lu.%lu)\n", str, osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber); + initprintf("Running on %s (build %lu.%lu.%lu)\n", str, osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber); Bfree(str); } diff --git a/polymer/eduke32/source/jaudiolib/src/multivoc.c b/polymer/eduke32/source/jaudiolib/src/multivoc.c index 8af140a39..b4323e59a 100644 --- a/polymer/eduke32/source/jaudiolib/src/multivoc.c +++ b/polymer/eduke32/source/jaudiolib/src/multivoc.c @@ -54,7 +54,7 @@ static const int16_t *MV_GetVolumeTable(int32_t vol); static void MV_CalcPanTable(void); -#define IS_QUIET(ptr) ((void *)(ptr) == (void *)&MV_VolumeTable[0]) +#define IS_QUIET(ptr) ((void const *)(ptr) == (void *)&MV_VolumeTable[0]) static int32_t MV_ReverbLevel; static int32_t MV_ReverbDelay; @@ -83,8 +83,8 @@ char *MV_MixBuffer[MV_NUMBEROFBUFFERS + 1]; static VoiceNode *MV_Voices = NULL; -static volatile VoiceNode VoiceList; -static volatile VoiceNode VoicePool; +static VoiceNode VoiceList; +static VoiceNode VoicePool; static int32_t MV_MixPage = 0; diff --git a/polymer/eduke32/source/osdcmds.c b/polymer/eduke32/source/osdcmds.c index d63f79142..de304fc13 100644 --- a/polymer/eduke32/source/osdcmds.c +++ b/polymer/eduke32/source/osdcmds.c @@ -882,7 +882,7 @@ static int32_t osdcmd_name(const osdfuncparm_t *parm) static int32_t osdcmd_button(const osdfuncparm_t *parm) { - char *p = (char *)parm->name+9; // skip "gamefunc_" + char const *p = parm->name+9; // skip "gamefunc_" // if (g_player[myconnectindex].ps->gm == MODE_GAME) // only trigger these if in game CONTROL_OSDInput[CONFIG_FunctionNameToNum(p)] = 1; // FIXME return OSDCMD_OK; @@ -1290,7 +1290,7 @@ static int32_t osdcmd_password(const osdfuncparm_t *parm) Bmemset(g_netPassword, 0, sizeof(g_netPassword)); return OSDCMD_OK; } - Bstrncpy(g_netPassword, (char *)(parm->raw) + 9, sizeof(g_netPassword)-1); + Bstrncpy(g_netPassword, (parm->raw) + 9, sizeof(g_netPassword)-1); return OSDCMD_OK; }