mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-02-16 17:11:33 +00:00
basic fixup of warnings
This commit is contained in:
parent
52d46a4b20
commit
4b5dd2ac1b
7 changed files with 13 additions and 8 deletions
|
@ -166,8 +166,10 @@ static int StartsWith(const char *a, const char *b) // this is wolfs being lazy
|
||||||
|
|
||||||
|
|
||||||
static int io_open (lua_State *L) {
|
static int io_open (lua_State *L) {
|
||||||
const char *filename = luaL_checkstring(L, 1);
|
const char *Cfilename = luaL_checkstring(L, 1);
|
||||||
int pass = 0; int i;
|
char *filename = strdup(Cfilename);
|
||||||
|
int pass = 0;
|
||||||
|
size_t i;
|
||||||
int length = strlen(filename) - 1;
|
int length = strlen(filename) - 1;
|
||||||
for (i = 0; i < (sizeof (whitelist) / sizeof(const char *)); i++)
|
for (i = 0; i < (sizeof (whitelist) / sizeof(const char *)); i++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -2294,11 +2294,13 @@ static void Command_connect(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (gametype == INT32_MAX)
|
#if 0 // gametype will never equal INT32_MAX
|
||||||
|
if (gametype == INT32_MAX)
|
||||||
{
|
{
|
||||||
CONS_Alert(CONS_ERROR, M_GetText("Invalid gametype %s\n"), COM_Argv(3));
|
CONS_Alert(CONS_ERROR, M_GetText("Invalid gametype %s\n"), COM_Argv(3));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// Goodbye, we're off to host a server
|
// Goodbye, we're off to host a server
|
||||||
CV_SetValue(&cv_nextmap, newmapnum);
|
CV_SetValue(&cv_nextmap, newmapnum);
|
||||||
|
|
|
@ -457,5 +457,5 @@ extern INT32 numstarposts;
|
||||||
|
|
||||||
boolean camera_motionblur;
|
boolean camera_motionblur;
|
||||||
INT32 forward_postimgparam;
|
INT32 forward_postimgparam;
|
||||||
boolean P_CheckMotionBlur();
|
boolean P_CheckMotionBlur(void);
|
||||||
void P_SetActiveMotionBlur(boolean active, INT32 param);
|
void P_SetActiveMotionBlur(boolean active, INT32 param);
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#ifdef CMAKECONFIG
|
#ifdef CMAKECONFIG
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#else
|
#else
|
||||||
#include "config.h.in"
|
#include "../config.h.in"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef _WIN32_WCE
|
#ifndef _WIN32_WCE
|
||||||
|
|
|
@ -472,6 +472,8 @@ static void mixmusic_callback(void *udata, Uint8 *stream, int len)
|
||||||
music_pos += len/4;
|
music_pos += len/4;
|
||||||
music_pos_time = SDL_GetTicks();
|
music_pos_time = SDL_GetTicks();
|
||||||
}
|
}
|
||||||
|
(void)udata;
|
||||||
|
(void)stream;
|
||||||
//I_OutputMsg("MusicPos: %.3f", music_pos);
|
//I_OutputMsg("MusicPos: %.3f", music_pos);
|
||||||
//HU_DoCEcho(va("MusicPos: %.3f\\Stream: %d\\Length: %i", music_pos,stream,len));
|
//HU_DoCEcho(va("MusicPos: %.3f\\Stream: %d\\Length: %i", music_pos,stream,len));
|
||||||
}
|
}
|
||||||
|
|
|
@ -478,7 +478,6 @@ void S_InitRuntimeSounds (void)
|
||||||
sfxenum_t i;
|
sfxenum_t i;
|
||||||
INT32 value;
|
INT32 value;
|
||||||
char soundname[7];
|
char soundname[7];
|
||||||
char musicname[7];
|
|
||||||
|
|
||||||
for (i = sfx_freeslot0; i <= sfx_lastskinsoundslot; i++)
|
for (i = sfx_freeslot0; i <= sfx_lastskinsoundslot; i++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -2037,8 +2037,8 @@ Unoptimized version
|
||||||
|
|
||||||
float cosma = cos(f_angle);
|
float cosma = cos(f_angle);
|
||||||
|
|
||||||
float xst = (INT32)round((cosma * -hwidth - sinma * -hheight) + hwidth);
|
float xst = round((cosma * -hwidth - sinma * -hheight) + hwidth);
|
||||||
float yst = (INT32)round((sinma * -hwidth + cosma * -hheight) + hheight);
|
float yst = round((sinma * -hwidth + cosma * -hheight) + hheight);
|
||||||
|
|
||||||
// Fills the empty space with a solid color from palette index
|
// Fills the empty space with a solid color from palette index
|
||||||
memset(screens[4], (UINT8)(31), vid.width*vid.height*vid.bpp);
|
memset(screens[4], (UINT8)(31), vid.width*vid.height*vid.bpp);
|
||||||
|
|
Loading…
Reference in a new issue