mirror of
https://git.code.sf.net/p/quake/newtree
synced 2024-11-29 07:12:30 +00:00
Um. Fixed the server so it won't bomb loading Half-Life maps.
This commit is contained in:
parent
957873f3bb
commit
1501c63997
3 changed files with 5 additions and 3 deletions
|
@ -81,6 +81,7 @@
|
||||||
#include <strings.h>
|
#include <strings.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
int isServer = 0;
|
||||||
|
|
||||||
// we need to declare some mouse variables here, because the menu system
|
// we need to declare some mouse variables here, because the menu system
|
||||||
// references them even when on a unix system.
|
// references them even when on a unix system.
|
||||||
|
|
|
@ -60,7 +60,7 @@ byte mod_novis[MAX_MAP_LEAFS/8];
|
||||||
#define MAX_MOD_KNOWN 512
|
#define MAX_MOD_KNOWN 512
|
||||||
model_t mod_known[MAX_MOD_KNOWN];
|
model_t mod_known[MAX_MOD_KNOWN];
|
||||||
int mod_numknown;
|
int mod_numknown;
|
||||||
|
extern int isServer;
|
||||||
unsigned *model_checksum;
|
unsigned *model_checksum;
|
||||||
texture_t *r_notexture_mip;
|
texture_t *r_notexture_mip;
|
||||||
cvar_t *gl_subdivide_size;
|
cvar_t *gl_subdivide_size;
|
||||||
|
@ -356,7 +356,8 @@ void Mod_LoadTextures (lump_t *l)
|
||||||
for (j=0 ; j<MIPLEVELS ; j++)
|
for (j=0 ; j<MIPLEVELS ; j++)
|
||||||
tx->offsets[j] = mt->offsets[j] + sizeof(texture_t) - sizeof(miptex_t);
|
tx->offsets[j] = mt->offsets[j] + sizeof(texture_t) - sizeof(miptex_t);
|
||||||
// the pixels immediately follow the structures
|
// the pixels immediately follow the structures
|
||||||
memcpy ( tx+1, mt+1, pixels);
|
if (!isServer)
|
||||||
|
memcpy ( tx+1, mt+1, pixels);
|
||||||
|
|
||||||
if (!strncmp(mt->name,"sky",3))
|
if (!strncmp(mt->name,"sky",3))
|
||||||
R_InitSky (tx);
|
R_InitSky (tx);
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
#ifdef HAVE_STRINGS_H
|
#ifdef HAVE_STRINGS_H
|
||||||
#include <strings.h>
|
#include <strings.h>
|
||||||
#endif
|
#endif
|
||||||
|
int isServer = 1;
|
||||||
quakeparms_t host_parms;
|
quakeparms_t host_parms;
|
||||||
|
|
||||||
qboolean host_initialized; // true if into command execution (compatability)
|
qboolean host_initialized; // true if into command execution (compatability)
|
||||||
|
|
Loading…
Reference in a new issue