yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2025-04-06 10:20:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request from 0lvin/cppcheck

Browse source 
Cppcheck fixes
This commit is contained in:
Yamagi 2018-11-14 19:04:27 +01:00 committed by GitHub
commit ee4135fd0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 322 additions and 163 deletions
src
backends
unix
network.c
windows
network.c
client
menu
menu.c
refresh/soft
sw_image.csw_main.c
game
g_items.c
player
hud.c

18
src/backends/unix/network.c
View file

@ -176,10 +176,6 @@ SockadrToNetadr(struct sockaddr_storage *s, netadr_t *a)
a->scope_id = s6->sin6_scope_id;
}
}
else
{
s = NULL;
}
}
void
@ -273,7 +269,7 @@ NET_CompareBaseAdr(netadr_t a, netadr_t b)
char *
NET_BaseAdrToString(netadr_t a)
{
static char s[64], tmp[64];
static char s[64];
struct sockaddr_storage ss;
struct sockaddr_in6 *s6;
@ -332,6 +328,8 @@ NET_BaseAdrToString(netadr_t a)
IN6_IS_ADDR_LINKLOCAL(&((struct sockaddr_in6 *)&ss)->
sin6_addr))
{
char tmp[64];
/* If the address is multicast (link) or a
link-local, need to carry the scope. The string
format of the IPv6 address is used by the
@ -662,11 +660,13 @@ NET_SendPacket(netsrc_t sock, int length, void *data, netadr_t to)
{
struct addrinfo hints;
struct addrinfo *res;
char tmp[128], mcast_addr[128], mcast_port[10];
int error;
char tmp[128];
if (multicast_interface != NULL)
{
int error;
char mcast_addr[128], mcast_port[10];
/* Do a getnameinfo/getaddrinfo cycle
to calculate the scope_id of the
multicast address. getaddrinfo is
@ -772,10 +772,10 @@ NET_OpenIP(void)
void
NET_Config(qboolean multiplayer)
{
int i;
if (!multiplayer)
{
int i;
/* shut down any existing sockets */
for (i = 0; i < 2; i++)
{

30
src/backends/windows/network.c
View file

@ -144,7 +144,7 @@ NetadrToSockadr(netadr_t *a, struct sockaddr_storage *s)
case NA_LOOPBACK:
case NA_IPX:
case NA_BROADCAST_IPX:
/* no handling of NA_LOOPBACK,
/* no handling of NA_LOOPBACK,
NA_IPX, NA_BROADCAST_IPX */
break;
}
@ -181,10 +181,6 @@ SockadrToNetadr(struct sockaddr_storage *s, netadr_t *a)
a->scope_id = s6->sin6_scope_id;
}
}
else
{
s = NULL;
}
}
qboolean
@ -203,7 +199,7 @@ NET_CompareAdr(netadr_t a, netadr_t b)
if (a.type == NA_IP)
{
if ((a.ip[0] == b.ip[0]) && (a.ip[1] == b.ip[1]) &&
(a.ip[2] == b.ip[2]) && (a.ip[3] == b.ip[3]) &&
(a.ip[2] == b.ip[2]) && (a.ip[3] == b.ip[3]) &&
(a.port == b.port))
{
return true;
@ -284,7 +280,7 @@ NET_CompareBaseAdr(netadr_t a, netadr_t b)
char *
NET_BaseAdrToString(netadr_t a)
{
static char s[64], tmp[64];
static char s[64];
struct sockaddr_storage ss;
struct sockaddr_in6 *s6;
@ -342,6 +338,8 @@ NET_BaseAdrToString(netadr_t a)
already return scoped IPv6 address. */
if (strchr(s, '%') == NULL)
{
char tmp[64];
Com_sprintf(tmp, sizeof(tmp), "%s%%%d", s,
s6->sin6_scope_id);
memcpy(s, tmp, sizeof(s));
@ -698,13 +696,13 @@ NET_SendPacket(netsrc_t sock, int length, void *data, netadr_t to)
{
struct sockaddr_in6 *s6 = (struct sockaddr_in6 *)&addr;
/* If multicast socket, must specify scope.
/* If multicast socket, must specify scope.
So multicast_interface must be specified */
if (IN6_IS_ADDR_MULTICAST(&s6->sin6_addr))
{
struct addrinfo hints;
struct addrinfo *res;
char tmp[128], mcast_addr[128], mcast_port[10];
char tmp[128];
int error;
/* Do a getnameinfo/getaddrinfo cycle
@ -726,6 +724,8 @@ NET_SendPacket(netsrc_t sock, int length, void *data, netadr_t to)
if (multicast_interface != NULL)
{
char mcast_addr[128], mcast_port[10]
Com_sprintf(mcast_addr, sizeof(mcast_addr), "%s", tmp);
Com_sprintf(mcast_port, sizeof(mcast_port), "%d",
ntohs(s6->sin6_port));
@ -1046,10 +1046,11 @@ NET_IPXSocket(int port)
int newsocket;
struct sockaddr_ipx address;
unsigned long t = 1;
int err;
if ((newsocket = socket(PF_IPX, SOCK_DGRAM, NSPROTO_IPX)) == -1)
{
int err;
err = WSAGetLastError();
if (err != WSAEAFNOSUPPORT)
@ -1154,13 +1155,12 @@ NET_OpenIPX(void)
}
/*
* A single player game will
* A single player game will
* only use the loopback code
*/
void
NET_Config(qboolean multiplayer)
{
int i;
static qboolean old_config;
if (old_config == multiplayer)
@ -1171,7 +1171,9 @@ NET_Config(qboolean multiplayer)
old_config = multiplayer;
if (!multiplayer)
{
{
int i;
/* shut down any existing sockets */
for (i = 0; i < 2; i++)
{
@ -1209,7 +1211,7 @@ NET_Config(qboolean multiplayer)
}
}
/*
/*
* sleeps msec or until
* net socket is ready
*/

80
src/client/menu/menu.c
View file

@ -329,11 +329,12 @@ const char *
Default_MenuKey(menuframework_s *m, int key)
{
const char *sound = NULL;
menucommon_s *item;
int menu_key = Key_GetMenuKey(key);
if (m)
{
menucommon_s *item;
if ((item = Menu_ItemAtCursor(m)) != 0)
{
if (item->type == MTYPE_FIELD)
@ -433,13 +434,14 @@ M_Print(int x, int y, char *str)
}
}
/* Unsused, left for backward compability */
void
M_DrawPic(int x, int y, char *pic)
{
float scale = SCR_GetMenuScale();
Draw_PicScaled((x + ((viddef.width - 320) >> 1)) * scale,
(y + ((viddef.height - 240) >> 1)) * scale, pic, scale);
Draw_PicScaled((x + ((viddef.width - 320) >> 1)) * scale,
(y + ((viddef.height - 240) >> 1)) * scale, pic, scale);
}
/*
@ -530,7 +532,7 @@ static int m_popup_endtime;
static void
M_Popup(void)
{
int x, y, width, lines;
int width, lines;
int n;
char *str;
@ -569,6 +571,7 @@ M_Popup(void)
if (width)
{
int x, y;
width += 2;
x = (320 - (width + 2) * 8) / 2;
@ -835,12 +838,12 @@ M_UnbindCommand(char *command)
{
int j;
int l;
char *b;
l = strlen(command);
for (j = 0; j < 256; j++)
{
char *b;
b = keybindings[j];
if (!b)
@ -861,7 +864,6 @@ M_FindKeysForCommand(char *command, int *twokeys)
int count;
int j;
int l;
char *b;
twokeys[0] = twokeys[1] = -1;
l = strlen(command);
@ -869,6 +871,7 @@ M_FindKeysForCommand(char *command, int *twokeys)
for (j = 0; j < 256; j++)
{
char *b;
b = keybindings[j];
if (!b)
@ -1474,9 +1477,10 @@ M_Menu_Video_f(void)
* END GAME MENU
*/
#define CREDITS_SIZE 256
static int credits_start_time;
static const char **credits;
static char *creditsIndex[256];
static char *creditsIndex[CREDITS_SIZE];
static char *creditsBuffer;
static const char *idcredits[] = {
"+QUAKE II BY ID SOFTWARE",
@ -1907,7 +1911,6 @@ M_Credits_Key(int key)
static void
M_Menu_Credits_f(void)
{
int n;
int count;
char *p;
@ -1916,9 +1919,11 @@ M_Menu_Credits_f(void)
if (count != -1)
{
int n;
p = creditsBuffer;
for (n = 0; n < 255; n++)
// CREDITS_SIZE - 1 - last pointer should be NULL
for (n = 0; n < CREDITS_SIZE - 1; n++)
{
creditsIndex[n] = p;
@ -1946,11 +1951,14 @@ M_Menu_Credits_f(void)
if (--count == 0)
{
// no credits any more
// move one step futher for set NULL
n ++;
break;
}
}
creditsIndex[++n] = 0;
creditsIndex[n] = 0;
credits = (const char **)creditsIndex;
}
else
@ -2196,7 +2204,6 @@ static void
LoadSave_AdjustPage(int dir)
{
int i;
char *str;
m_loadsave_page += dir;
@ -2213,6 +2220,7 @@ LoadSave_AdjustPage(int dir)
for (i = 0; i < MAX_SAVEPAGES; i++)
{
char *str;
str = va("%c%d%c",
i == m_loadsave_page ? '[' : ' ',
i + 1,
@ -2817,13 +2825,13 @@ StartServer_MenuInit(void)
char *buffer;
char *s;
int length;
int i;
float scale = SCR_GetMenuScale();
/* initialize list of maps once, reuse it afterwards (=> it isn't freed) */
if (mapnames == NULL)
{
int i, length;
/* load the list of map names */
if ((length = FS_LoadFile("maps.lst", (void **)&buffer)) == -1)
{
@ -3865,7 +3873,6 @@ PlayerConfig_ScanDirectories(void)
for (i = 0; i < npms; i++)
{
int k, s;
char *a, *b, *c;
char **pcxnames;
char **skinnames;
fileHandle_t f;
@ -3926,12 +3933,11 @@ PlayerConfig_ScanDirectories(void)
/* copy the valid skins */
for (s = 0, k = 0; k < npcxfiles - 1; k++)
{
char *a, *b, *c;
if (!strstr(pcxnames[k], "_i.pcx"))
{
if (IconOfSkinExists(pcxnames[k], pcxnames, npcxfiles - 1))
{
char *a, *b, *c;
a = strrchr(pcxnames[k], '/');
b = strrchr(pcxnames[k], '\\');
@ -3962,23 +3968,25 @@ PlayerConfig_ScanDirectories(void)
s_pmi[s_numplayermodels].nskins = nskins;
s_pmi[s_numplayermodels].skindisplaynames = skinnames;
/* make short name for the model */
a = strrchr(dirnames[i], '/');
b = strrchr(dirnames[i], '\\');
if (a > b)
{
c = a;
char *a, *b, *c;
/* make short name for the model */
a = strrchr(dirnames[i], '/');
b = strrchr(dirnames[i], '\\');
if (a > b)
{
c = a;
}
else
{
c = b;
}
Q_strlcpy(s_pmi[s_numplayermodels].displayname, c + 1, sizeof(s_pmi[s_numplayermodels].displayname));
Q_strlcpy(s_pmi[s_numplayermodels].directory, c + 1, sizeof(s_pmi[s_numplayermodels].directory));
}
else
{
c = b;
}
Q_strlcpy(s_pmi[s_numplayermodels].displayname, c + 1, sizeof(s_pmi[s_numplayermodels].displayname));
Q_strlcpy(s_pmi[s_numplayermodels].directory, c + 1, sizeof(s_pmi[s_numplayermodels].directory));
FreeFileList(pcxnames, npcxfiles);
s_numplayermodels++;
@ -4200,8 +4208,7 @@ static void
PlayerConfig_MenuDraw(void)
{
refdef_t refdef;
char scratch[MAX_QPATH];
float scale = SCR_GetMenuScale();
float scale = SCR_GetMenuScale();
memset(&refdef, 0, sizeof(refdef));
@ -4217,6 +4224,7 @@ PlayerConfig_MenuDraw(void)
{
static int yaw;
entity_t entity;
char scratch[MAX_QPATH];
memset(&entity, 0, sizeof(entity));
@ -4269,11 +4277,10 @@ PlayerConfig_MenuDraw(void)
static const char *
PlayerConfig_MenuKey(int key)
{
int i;
if (key == K_ESCAPE)
{
char scratch[1024];
int i;
Cvar_Set("name", s_player_name_field.buffer);
@ -4433,10 +4440,9 @@ M_Draw(void)
void
M_Keydown(int key)
{
const char *s;
if (m_keyfunc)
{
const char *s;
if ((s = m_keyfunc(key)) != 0)
{
S_StartLocalSound((char *)s);

291
src/client/refresh/soft/sw_image.c
View file

@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "header/local.h"
extern cvar_t *sw_retexturing;
#define MAX_RIMAGES 1024
static image_t r_images[MAX_RIMAGES];
@ -96,7 +97,7 @@ R_FindFreeImage (void)
if (i == numr_images)
{
if (numr_images == MAX_RIMAGES)
ri.Sys_Error (ERR_DROP, "MAX_RIMAGES");
ri.Sys_Error(ERR_DROP, "MAX_RIMAGES");
numr_images++;
}
image = &r_images[i];
@ -104,6 +105,25 @@ R_FindFreeImage (void)
return image;
}
static void
R_ImageShrink(const unsigned char* src, unsigned char *dst, int width, int realwidth, int height, int realheight)
{
int x, y;
float xstep, ystep;
xstep = (float)height / realheight;
ystep = (float)width / realwidth;
for (y=0; y<realheight; y++)
{
for (x=0; x<realwidth; x++)
{
// inplace update
dst[x + y * realwidth] = src[(int)(x * xstep) + (int)(y * ystep) * width];
}
}
}
/*
================
R_LoadPic
@ -114,9 +134,9 @@ static image_t *
R_LoadPic (char *name, byte *pic, int width, int height, imagetype_t type)
{
image_t *image;
size_t i, size;
size_t i, size, full_size;
image = R_FindFreeImage ();
image = R_FindFreeImage();
if (strlen(name) >= sizeof(image->name))
ri.Sys_Error(ERR_DROP, "Draw_LoadPic: \"%s\" is too long", name);
strcpy (image->name, name);
@ -126,8 +146,9 @@ R_LoadPic (char *name, byte *pic, int width, int height, imagetype_t type)
image->height = height;
image->type = type;
size = width*height;
image->pixels[0] = malloc (size);
size = width * height;
full_size = size * (256+64+16+4)/256;
image->pixels[0] = malloc(full_size);
image->transparent = false;
for (i=0 ; i<size ; i++)
{
@ -139,22 +160,23 @@ R_LoadPic (char *name, byte *pic, int width, int height, imagetype_t type)
}
memcpy(image->pixels[0], pic, size);
// restore mips
image->pixels[1] = image->pixels[0] + image->width*image->height;
image->pixels[2] = image->pixels[1] + image->width*image->height/4;
image->pixels[3] = image->pixels[2] + image->width*image->height/16;
// restore everything from first image
R_ImageShrink(image->pixels[0], image->pixels[1],
image->height, image->height/2,
image->width, image->width/2);
R_ImageShrink(image->pixels[1], image->pixels[2],
image->height/2, image->height/4,
image->width/2, image->width/4);
R_ImageShrink(image->pixels[2], image->pixels[3],
image->height/4, image->height/8,
image->width/4, image->width/8);
return image;
}
static void
R_Restore_Mip(unsigned char* src, unsigned char *dst, int height, int width)
{
int x, y;
for (y=0; y<height; y++)
{
for (x=0; x<width; x++)
{
dst[x + y * width] = src[(x + y * width)*2];
}
}
}
/*
================
R_LoadWal
@ -178,7 +200,7 @@ R_LoadWal (char *name, imagetype_t type)
if (file_size < sizeof(miptex_t))
{
R_Printf(PRINT_ALL, "R_LoadWal: can't load %s, small header\n", name);
ri.FS_FreeFile ((void *)mt);
ri.FS_FreeFile((void *)mt);
return r_notexture_mip;
}
@ -188,7 +210,7 @@ R_LoadWal (char *name, imagetype_t type)
image->height = LittleLong (mt->height);
image->type = type;
image->registration_sequence = registration_sequence;
ofs = LittleLong (mt->offsets[0]);
ofs = LittleLong(mt->offsets[0]);
size = image->width * image->height * (256+64+16+4)/256;
if ((ofs <= 0) || (image->width <= 0) || (image->height <= 0) ||
@ -206,22 +228,147 @@ R_LoadWal (char *name, imagetype_t type)
if (size > (file_size - ofs))
{
memcpy ( image->pixels[0], (byte *)mt + ofs, file_size - ofs);
// looks to short restore everything from first image
R_Restore_Mip(image->pixels[0], image->pixels[1], image->height/2, image->width/2);
R_Restore_Mip(image->pixels[1], image->pixels[2], image->height/4, image->width/4);
R_Restore_Mip(image->pixels[2], image->pixels[3], image->height/8, image->width/8);
memcpy(image->pixels[0], (byte *)mt + ofs, file_size - ofs);
// looks short, restore everything from first image
R_ImageShrink(image->pixels[0], image->pixels[1],
image->height, image->height/2,
image->width, image->width/2);
R_ImageShrink(image->pixels[1], image->pixels[2],
image->height/2, image->height/4,
image->width/2, image->width/4);
R_ImageShrink(image->pixels[2], image->pixels[3],
image->height/4, image->height/8,
image->width/4, image->width/8);
}
else
{
memcpy ( image->pixels[0], (byte *)mt + ofs, size);
memcpy(image->pixels[0], (byte *)mt + ofs, size);
}
ri.FS_FreeFile ((void *)mt);
ri.FS_FreeFile((void *)mt);
return image;
}
static unsigned char *d_16to8table; // 16 to 8 bit conversion table
static void
R_Convert32To8bit(unsigned char* pic_in, unsigned char* pic_out, size_t size)
{
size_t i;
if (!d_16to8table)
return;
for(i=0; i<size; i++)
{
unsigned int r, g, b, c;
r = ( pic_in[i * 4 + 0] >> 3 ) & 31;
g = ( pic_in[i * 4 + 1] >> 2 ) & 63;
b = ( pic_in[i * 4 + 2] >> 3 ) & 31;
c = r | ( g << 5 ) | ( b << 11 );
pic_out[i] = d_16to8table[c & 0xFFFF];
}
}
static image_t *
R_LoadHiColorImage(char *name, const char* namewe, const char *ext, imagetype_t type)
{
image_t *image = NULL;
byte *pic = NULL;
int realwidth = 0, realheight = 0;
int width = 0, height = 0;
if (strcmp(ext, "pcx") == 0)
{
/* Get size of the original texture */
GetPCXInfo(name, &realwidth, &realheight);
}
else if (strcmp(ext, "wal") == 0)
{
/* Get size of the original texture */
GetWalInfo(name, &realwidth, &realheight);
}
/* try to load a tga, png or jpg (in that order/priority) */
if ( LoadSTB(namewe, "tga", &pic, &width, &height)
|| LoadSTB(namewe, "png", &pic, &width, &height)
|| LoadSTB(namewe, "jpg", &pic, &width, &height) )
{
if (width >= realwidth && height >= realheight)
{
byte* pic8 = NULL;
int size;
if (realheight == 0 || realwidth == 0)
{
realheight = height;
realwidth = width;
}
size = width * height * (256+64+16+4)/256;
pic8 = malloc(size);
R_Convert32To8bit(pic, pic8, width * height);
if (width != realwidth || height != realheight)
{
R_ImageShrink(pic8, pic8, width, realwidth, height, realheight);
}
image = R_LoadPic(name, pic8, realwidth, realheight, type);
free(pic8);
}
}
if (!pic)
{
free(pic);
}
return image;
}
static image_t *
R_LoadImage(char *name, const char* namewe, const char *ext, imagetype_t type)
{
image_t *image = NULL;
// with retexturing and not skin
if (sw_retexturing->value && type != it_skin)
{
image = R_LoadHiColorImage(name, namewe, ext, type);
}
if (!image)
{
if (strcmp(ext, "pcx") == 0)
{
byte *pic = NULL;
byte *palette = NULL;
int width = 0, height = 0;
LoadPCX (name, &pic, &palette, &width, &height);
if (!pic)
return NULL;
image = R_LoadPic(name, pic, width, height, type);
if (palette)
{
free(palette);
}
if (!pic)
{
free(pic);
}
}
else if (strcmp(ext, "wal") == 0)
{
image = R_LoadWal(name, type);
}
}
return image;
}
/*
===============
@ -231,27 +378,42 @@ Finds or loads the given image
===============
*/
image_t *
R_FindImage (char *name, imagetype_t type)
R_FindImage(char *name, imagetype_t type)
{
image_t *image;
int i, len;
byte *pic, *palette;
int width, height;
int i, len;
char *ptr;
char namewe[256];
const char* ext;
if (!name)
return NULL; // ri.Sys_Error (ERR_DROP, "R_FindImage: NULL name");
{
return NULL;
}
ext = COM_FileExtension(name);
if(!ext[0])
{
/* file has no extension */
return NULL;
}
len = strlen(name);
if (len<5)
return NULL; // ri.Sys_Error (ERR_DROP, "R_FindImage: bad name: %s", name);
#ifndef _WIN32
char *ptr;
/* Remove the extension */
memset(namewe, 0, 256);
memcpy(namewe, name, len - (strlen(ext) + 1));
// fix backslashes
while ((ptr=strchr(name,'\\'))) {
if (len < 5)
{
return NULL;
}
/* fix backslashes */
while ((ptr = strchr(name, '\\')))
{
*ptr = '/';
}
#endif
// look for it
for (i=0, image=r_images ; i<numr_images ; i++,image++)
@ -266,30 +428,7 @@ R_FindImage (char *name, imagetype_t type)
//
// load the pic from disk
//
pic = NULL;
palette = NULL;
if (!strcmp(name+len-4, ".pcx"))
{
LoadPCX (name, &pic, &palette, &width, &height);
if (!pic)
return NULL; // ri.Sys_Error (ERR_DROP, "R_FindImage: can't load %s", name);
image = R_LoadPic (name, pic, width, height, type);
}
else if (!strcmp(name+len-4, ".wal"))
{
image = R_LoadWal (name, type);
}
else if (!strcmp(name+len-4, ".tga"))
return NULL; // ri.Sys_Error (ERR_DROP, "R_FindImage: can't load %s in software renderer", name);
else
return NULL; // ri.Sys_Error (ERR_DROP, "R_FindImage: bad extension on: %s", name);
if (pic)
free(pic);
if (palette)
free(palette);
return image;
return R_LoadImage(name, namewe, ext, type);
}
/*
@ -318,12 +457,10 @@ R_FreeUnusedImages (void)
continue; // don't free pics
// free it
free (image->pixels[0]); // the other mip levels just follow
memset (image, 0, sizeof(*image));
memset(image, 0, sizeof(*image));
}
}
/*
===============
R_InitImages
@ -332,7 +469,19 @@ R_InitImages
void
R_InitImages (void)
{
unsigned char * table16to8;
registration_sequence = 1;
d_16to8table = NULL;
ri.FS_LoadFile("pics/16to8.dat", (void **)&table16to8);
if ( !table16to8 )
{
ri.Sys_Error(ERR_FATAL, "Couldn't load pics/16to8.dat");
}
d_16to8table = malloc(0x10000);
memcpy(d_16to8table, table16to8, 0x10000);
ri.FS_FreeFile((void *)table16to8);
}
/*
@ -350,8 +499,14 @@ R_ShutdownImages (void)
{
if (!image->registration_sequence)
continue; // free texture
// free it
free (image->pixels[0]); // the other mip levels just follow
memset (image, 0, sizeof(*image));
if (image->pixels[0])
free(image->pixels[0]); // the other mip levels just follow
memset(image, 0, sizeof(*image));
}
if (d_16to8table)
free(d_16to8table);
}

28
src/client/refresh/soft/sw_main.c
View file

@ -122,17 +122,14 @@ static cvar_t *sw_aliasstats;
cvar_t *sw_clearcolor;
cvar_t *sw_drawflat;
cvar_t *sw_draworder;
static cvar_t *sw_maxedges;
static cvar_t *sw_maxsurfs;
static cvar_t *r_mode;
static cvar_t *sw_reportedgeout;
static cvar_t *sw_reportsurfout;
cvar_t *sw_stipplealpha;
cvar_t *sw_surfcacheoverride;
cvar_t *sw_waterwarp;
static cvar_t *sw_overbrightbits;
cvar_t *sw_custom_particles;
cvar_t *sw_texture_filtering;
cvar_t *sw_retexturing;
cvar_t *r_drawworld;
static cvar_t *r_drawentities;
@ -155,8 +152,6 @@ static cvar_t *vid_gamma;
static cvar_t *r_lockpvs;
//PGM
#define STRINGER(x) "x"
// sw_vars.c
// all global and static refresh variables are collected in a contiguous block
@ -265,24 +260,21 @@ void R_ImageList_f(void);
static void R_ScreenShot_f(void);
static void
R_Register (void)
R_RegisterVariables (void)
{
sw_aliasstats = ri.Cvar_Get ("sw_polymodelstats", "0", 0);
sw_clearcolor = ri.Cvar_Get ("sw_clearcolor", "2", 0);
sw_drawflat = ri.Cvar_Get ("sw_drawflat", "0", 0);
sw_draworder = ri.Cvar_Get ("sw_draworder", "0", 0);
sw_maxedges = ri.Cvar_Get ("sw_maxedges", STRINGER(MAXSTACKSURFACES), 0);
sw_maxsurfs = ri.Cvar_Get ("sw_maxsurfs", "0", 0);
sw_mipcap = ri.Cvar_Get ("sw_mipcap", "0", 0);
sw_mipscale = ri.Cvar_Get ("sw_mipscale", "1", 0);
sw_reportedgeout = ri.Cvar_Get ("sw_reportedgeout", "0", 0);
sw_reportsurfout = ri.Cvar_Get ("sw_reportsurfout", "0", 0);
sw_stipplealpha = ri.Cvar_Get( "sw_stipplealpha", "0", CVAR_ARCHIVE );
sw_surfcacheoverride = ri.Cvar_Get ("sw_surfcacheoverride", "0", 0);
sw_waterwarp = ri.Cvar_Get ("sw_waterwarp", "1", 0);
sw_overbrightbits = ri.Cvar_Get("sw_overbrightbits", "1.0", CVAR_ARCHIVE);
sw_custom_particles = ri.Cvar_Get("sw_custom_particles", "0", CVAR_ARCHIVE);
sw_texture_filtering = ri.Cvar_Get("sw_texture_filtering", "0", CVAR_ARCHIVE);
sw_retexturing = ri.Cvar_Get("sw_retexturing", "0", CVAR_ARCHIVE);
r_mode = ri.Cvar_Get( "r_mode", "0", CVAR_ARCHIVE );
r_lefthand = ri.Cvar_Get( "hand", "0", CVAR_USERINFO | CVAR_ARCHIVE );
@ -336,6 +328,7 @@ R_Init
static qboolean
RE_Init(void)
{
R_RegisterVariables ();
R_InitImages ();
Mod_Init ();
Draw_InitLocal ();
@ -353,7 +346,6 @@ RE_Init(void)
r_aliasuvscale = 1.0;
R_Register ();
Draw_GetPalette ();
// create the window
@ -437,9 +429,6 @@ R_ReallocateMapBuffers (void)
if (r_cnumsurfs < NUMSTACKSURFACES)
r_cnumsurfs = NUMSTACKSURFACES;
if (r_cnumsurfs < sw_maxsurfs->value)
r_cnumsurfs = sw_maxsurfs->value;
lsurfs = malloc (r_cnumsurfs * sizeof(surf_t));
if (!lsurfs)
{
@ -476,9 +465,6 @@ R_ReallocateMapBuffers (void)
if (r_numallocatededges < NUMSTACKEDGES)
r_numallocatededges = NUMSTACKEDGES;
if (r_numallocatededges < sw_maxedges->value)
r_numallocatededges = sw_maxedges->value;
r_edges = malloc (r_numallocatededges * sizeof(edge_t));
if (!r_edges)
{
@ -1176,12 +1162,6 @@ RE_RenderFrame (refdef_t *fd)
if (r_dspeeds->value)
R_PrintDSpeeds ();
if (sw_reportsurfout->value && r_outofsurfaces)
R_Printf(PRINT_ALL,"Short %d surfaces\n", r_outofsurfaces);
if (sw_reportedgeout->value && r_outofedges)
R_Printf(PRINT_ALL,"Short roughly %d edges\n", r_outofedges * 2 / 3);
R_ReallocateMapBuffers();
}

8
src/game/g_items.c
View file

@ -1655,7 +1655,7 @@ SpawnItem(edict_t *ent, gitem_t *item)
/* ====================================================================== */
gitem_t itemlist[] = {
static const gitem_t gameitemlist[] = {
{
NULL
}, /* leave index 0 alone */
@ -2576,6 +2576,8 @@ gitem_t itemlist[] = {
{NULL}
};
gitem_t itemlist[MAX_ITEMS];
/*
* QUAKED item_health (.3 .3 1) (-16 -16 -16) (16 16 16)
*/
@ -2673,7 +2675,9 @@ SP_item_health_mega(edict_t *self)
void
InitItems(void)
{
game.num_items = sizeof(itemlist) / sizeof(itemlist[0]) - 1;
memset(itemlist, 0, sizeof(itemlist));
memcpy(itemlist, gameitemlist, sizeof(gameitemlist));
game.num_items = sizeof(gameitemlist) / sizeof(gameitemlist[0]) - 1;
}
/*

30
src/game/player/hud.c
View file

@ -79,8 +79,8 @@ MoveClientToIntermission(edict_t *ent)
void
BeginIntermission(edict_t *targ)
{
int i, n;
edict_t *ent, *client;
int i;
edict_t *ent;
if (!targ)
{
@ -97,6 +97,8 @@ BeginIntermission(edict_t *targ)
/* respawn any dead clients */
for (i = 0; i < maxclients->value; i++)
{
edict_t *client;
client = g_edicts + 1 + i;
if (!client->inuse)
@ -119,6 +121,9 @@ BeginIntermission(edict_t *targ)
{
for (i = 0; i < maxclients->value; i++)
{
int n;
edict_t *client;
client = g_edicts + 1 + i;
if (!client->inuse)
@ -193,6 +198,8 @@ BeginIntermission(edict_t *targ)
/* move all clients to the intermission point */
for (i = 0; i < maxclients->value; i++)
{
edict_t *client;
client = g_edicts + 1 + i;
if (!client->inuse)
@ -210,14 +217,10 @@ DeathmatchScoreboardMessage(edict_t *ent, edict_t *killer)
char entry[1024];
char string[1400];
int stringlength;
int i, j, k;
int i;
int sorted[MAX_CLIENTS];
int sortedscores[MAX_CLIENTS];
int score, total;
int x, y;
gclient_t *cl;
edict_t *cl_ent;
char *tag;
int total;
if (!ent) /* killer can be NULL */
{
@ -229,6 +232,9 @@ DeathmatchScoreboardMessage(edict_t *ent, edict_t *killer)
for (i = 0; i < game.maxclients; i++)
{
int k, j, score;
edict_t *cl_ent;
cl_ent = g_edicts + 1 + i;
if (!cl_ent->inuse || game.clients[i].resp.spectator)
@ -270,6 +276,11 @@ DeathmatchScoreboardMessage(edict_t *ent, edict_t *killer)
for (i = 0; i < total; i++)
{
char *tag;
int x, y, j;
gclient_t *cl;
edict_t *cl_ent;
cl = &game.clients[sorted[i]];
cl_ent = g_edicts + 1 + sorted[i];
@ -580,7 +591,6 @@ void
G_CheckChaseStats(edict_t *ent)
{
int i;
gclient_t *cl;
if (!ent)
{
@ -589,6 +599,8 @@ G_CheckChaseStats(edict_t *ent)
for (i = 1; i <= maxclients->value; i++)
{
gclient_t *cl;
cl = g_edicts[i].client;
if (!g_edicts[i].inuse || (cl->chase_target != ent))