blendo/thirtyflightsofloving
0
0
Fork 0
mirror of https://github.com/blendogames/thirtyflightsofloving.git synced 2024-11-14 16:40:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed maps.lst inside pak file overridding the external version of this file in baseq2.

Browse source 
Blacklisted maps.lst from loading from pak files.
Cleaned up unneeded va() string expansion in cl_main.c->CL_Connect_f().
This commit is contained in:
Knightmare66 2019-05-05 13:07:41 -04:00
parent 5dcda933a3
commit 9c5fca4da2
5 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/cl_effects.c
View file

@ -286,8 +286,8 @@ void CL_Explosion_Particle (vec3_t org, float size, qboolean rocket)
0, 0, 0,
1, (rocket)? -2 : -1.5,
GL_SRC_ALPHA, GL_ONE,
//GL_ONE, GL_ONE,
(size!=0)?size:(150-((!rocket)?75:0)), 0,
// GL_ONE, GL_ONE,
(size != 0) ? size : (150 - ( (!rocket) ? 75 : 0)), 0,
particle_rexplosion1,
PART_DEPTHHACK_SHORT,
CL_ExplosionThink, true);

3
client/cl_main.c
View file

@ -615,7 +615,8 @@ void CL_Connect_f (void)
if (Com_ServerState ())
{ // if running a local server, kill it and reissue
SV_Shutdown (va("Server quit\n", msg), false);
// SV_Shutdown (va("Server quit\n", msg), false);
SV_Shutdown ("Server quit.\n", false);
}
else
{

2
qcommon/files.c
View file

@ -1471,8 +1471,10 @@ char *pakfile_ignore_names[] =
{
"save/",
"scrnshot/",
"screenshots/",
"autoexec.cfg",
"kmq2config.cfg",
"maps.lst",
0
};

2
renderer/r_image.c
View file

@ -2088,7 +2088,7 @@ nonscrap:
// store the names of last images that failed to load
#define NUM_FAIL_IMAGES 1024
#define NUM_FAIL_IMAGES 512
char lastFailedImage[NUM_FAIL_IMAGES][MAX_OSPATH];
long lastFailedImageHash[NUM_FAIL_IMAGES];
static unsigned failedImgListIndex;

4
renderer/r_model.c
View file

@ -480,7 +480,7 @@ void Mod_LoadEdges (lump_t *l)
//=======================================================
// store the names of last textures that failed to load
#define NUM_FAIL_TEXTURES 1024
#define NUM_FAIL_TEXTURES 512
char lastFailedTexture[NUM_FAIL_TEXTURES][MAX_OSPATH];
long lastFailedTextureHash[NUM_FAIL_TEXTURES];
static unsigned failedTexListIndex;
@ -576,7 +576,7 @@ typedef struct walsize_s
int height;
} walsize_t;
#define NUM_WALSIZES 1024
#define NUM_WALSIZES 512
walsize_t walSizeList[NUM_WALSIZES];
static unsigned walSizeListIndex;