team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix silly lightmap bug. also fix related glitches 

Be more obnoxious about updates and stuff.
make the restart etc command more responsive in single player.


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4825 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2015-01-08 13:09:20 +00:00
parent 8c553a5aa7
commit b7a4b8845a
15 changed files with 178 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/client/cl_parse.c
View File

@ -1227,7 +1227,9 @@ int CL_LoadModels(int stage, qboolean dontactuallyload)
{
SCR_SetLoadingFile("wads");
if (cl.worldmodel && cl.worldmodel->loadstate == MLS_LOADING)
return stage;
return -1;
if (cl.worldmodel && cl.worldmodel->loadstate == MLS_LOADING)
COM_WorkerPartialSync(cl.worldmodel, &cl.worldmodel->loadstate, MLS_LOADING);
Mod_ParseInfoFromEntityLump(cl.worldmodel);
Wad_NextDownload();
@ -4060,12 +4062,10 @@ void CL_ParseStatic (int version)
VectorInverse(ent->axis[1]);
if (!cl.worldmodel || cl.worldmodel->loadstate != MLS_LOADED)
{
Con_TPrintf ("Warning: Parsestatic and no map loaded yet\n");
return;
}
if (ent->model)
{
//FIXME: wait for model to load so we know the correct size?
/*FIXME: compensate for angle*/
VectorAdd(es.origin, ent->model->mins, mins);
VectorAdd(es.origin, ent->model->maxs, maxs);

10
engine/client/r_surf.c
View File

@ -2635,6 +2635,9 @@ void Surf_BuildModelLightmaps (model_t *m)
int ptype;
int newfirst;
if (m->loadstate != MLS_LOADED)
return;
if (!lightmap_bytes)
return;
@ -2649,8 +2652,6 @@ void Surf_BuildModelLightmaps (model_t *m)
if (!m->lightmaps.count)
return;
if (m->loadstate != MLS_LOADED)
return;
currentmodel = m;
shift = Surf_LightmapShift(currentmodel);
@ -2790,6 +2791,11 @@ void Surf_BuildModelLightmaps (model_t *m)
surf->lightmaptexturenums[j] = -1;
continue;
}
if (surf->lightmaptexturenums[j] >= m->lightmaps.first+m->lightmaps.count)
{
surf->lightmaptexturenums[j] = -1;
continue;
}
surf->lightmaptexturenums[j] = surf->lightmaptexturenums[0] - m->lightmaps.first + newfirst;
lm = lightmap[surf->lightmaptexturenums[j]];

2
engine/client/snd_dma.c
View File

@ -2645,7 +2645,7 @@ void S_UpdateAmbientSounds (soundcardinfo_t *sc)
// calc ambient sound levels
if (!cl.worldmodel || cl.worldmodel->type != mod_brush || cl.worldmodel->fromgame != fg_quake)
if (!cl.worldmodel || cl.worldmodel->type != mod_brush || cl.worldmodel->fromgame != fg_quake || cl.worldmodel->loadstate != MLS_LOADED)
return;
l = Q1BSP_LeafForPoint(cl.worldmodel, listener_origin);

9
engine/client/sys_plugfte.c
View File

@ -345,7 +345,7 @@ dblbreak:
return true;
}
char *COM_ParseOut (const char *data, char *out, int outlen)
char *COM_ParseType (const char *data, char *out, int outlen, com_tokentype_t *toktype)
{
int c;
int len;
@ -355,6 +355,8 @@ char *COM_ParseOut (const char *data, char *out, int outlen)
len = 0;
out[0] = 0;
if (toktype)
*toktype = TTP_EOF;
if (!data)
return NULL;
@ -398,6 +400,9 @@ skipwhite:
// handle quoted strings specially
if (c == '\"')
{
if (toktype)
*toktype = TTP_STRING;
data++;
while (1)
{
@ -419,6 +424,8 @@ skipwhite:
}
// parse a regular word
if (toktype)
*toktype = TTP_RAWTOKEN;
do
{
if (len >= outlen-1)

19
engine/client/sys_win.c
View File

@ -2649,6 +2649,10 @@ static void Update_CreatePath (char *path)
}
}
void Update_UserAcked(void *ctx, int foo)
{
}
#include "fs.h"
void Update_Version_Updated(struct dl_download *dl)
{
@ -2677,12 +2681,17 @@ void Update_Version_Updated(struct dl_download *dl)
size += VFS_WRITE(pending, buf, chunk);
}
VFS_CLOSE(pending);
if (VFS_GETLEN(dl->file) == size)
if (VFS_GETLEN(dl->file) != size)
Con_Printf("Download was the wrong size / corrupt\n");
else
{
MyRegSetValue(HKEY_CURRENT_USER, "Software\\"FULLENGINENAME, "pending" UPD_BUILDTYPE EXETYPE, REG_SZ, pendingname, strlen(pendingname)+1);
M_Menu_Prompt(Update_UserAcked, NULL, "An update was downloaded", "Restart to activate.", "", "", "", "Okay");
}
}
}
else
Con_Printf("Update download failed\n");
}
}
void Update_Versioninfo_Available(struct dl_download *dl)
@ -2706,6 +2715,9 @@ void Update_Versioninfo_Available(struct dl_download *dl)
DL_CreateThread(dl, NULL, NULL);
#endif
}
else
Con_Printf("autoupdate: already at latest version\n");
return;
}
}
}
@ -2760,6 +2772,11 @@ qboolean Sys_CheckUpdated(void)
DeleteFile(updatedpath);
if (MoveFile(pendingpath, updatedpath))
MyRegSetValue(HKEY_CURRENT_USER, "Software\\"FULLENGINENAME, UPD_BUILDTYPE EXETYPE, REG_SZ, updatedpath, strlen(updatedpath)+1);
else
{
MessageBox(NULL, va("Unable to rename %s to %s", pendingpath, updatedpath), FULLENGINENAME" autoupdate", 0);
DeleteFile(pendingpath);
}
}
MyRegGetStringValue(HKEY_CURRENT_USER, "Software\\"FULLENGINENAME, UPD_BUILDTYPE EXETYPE, updatedpath, sizeof(updatedpath));

6
engine/common/net_chan.c
View File

@ -788,7 +788,8 @@ int Netchan_Transmit (netchan_t *chan, int length, qbyte *data, int rate)
#endif
if (showpackets.value)
Con_Printf ("%s --> s=%i(%i) a=%i(%i) %i\n"
Con_Printf ("%f %s --> s=%i(%i) a=%i(%i) %i\n"
, Sys_DoubleTime()
, chan->sock == NS_SERVER?"s2c":"c2s"
, chan->outgoing_sequence
, send_reliable
@ -846,7 +847,8 @@ qboolean Netchan_Process (netchan_t *chan)
sequence_ack &= ~(1<<31);
if (showpackets.value)
Con_Printf ("%s <-- s=%i(%i) a=%i(%i) %i%s\n"
Con_Printf ("%f %s <-- s=%i(%i) a=%i(%i) %i%s\n"
, Sys_DoubleTime()
, chan->sock == NS_SERVER?"c2s":"s2c"
, sequence
, reliable_message

9
engine/gl/gl_heightmap.c
View File

@ -4825,7 +4825,8 @@ void Terr_Brush_Draw(heightmap_t *hm, batch_t **batches, entity_t *e)
if (!strcmp(bt->shadername, "clip"))
bt->shader = R_RegisterShader(bt->shadername, SUF_LIGHTMAP, "{\nsurfaceparm nodraw\n}");
else
bt->shader = R_RegisterShader_Lightmap(bt->shadername);
bt->shader = R_RegisterCustom (bt->shadername, SUF_LIGHTMAP, Shader_DefaultBSPQ1, NULL);
// bt->shader = R_RegisterShader_Lightmap(bt->shadername);
R_BuildDefaultTexnums(NULL, bt->shader);
}
@ -5110,6 +5111,8 @@ void Terr_ReformEntitiesLump(model_t *mod, heightmap_t *hm, char *entities)
else
brushcontents = FTECONTENTS_WATER;
}
else if (!strcmp(token, "clip"))
brushcontents = FTECONTENTS_PLAYERCLIP;
else
brushcontents = FTECONTENTS_SOLID;
@ -5196,8 +5199,8 @@ void Terr_ReformEntitiesLump(model_t *mod, heightmap_t *hm, char *entities)
if (!scale[1]) scale[1] = 1;
VectorScale(texplane[0], 1.0/scale[0], faces[numplanes].sdir);
VectorScale(texplane[1], 1.0/scale[1], faces[numplanes].tdir);
faces[numplanes].sdir[3] = -texplane[0][3];
faces[numplanes].tdir[3] = -texplane[1][3];
faces[numplanes].sdir[3] = texplane[0][3];
faces[numplanes].tdir[3] = texplane[1][3];
numplanes++;
continue;

16
engine/gl/gl_model.c
View File

@ -867,6 +867,8 @@ void Mod_ModelLoaded(void *ctx, void *data, size_t a, size_t b)
P_LoadedModel(mod);
#endif
mod->loadstate = a;
#ifdef TERRAIN
if (mod->terrain)
Terr_FinishTerrain(mod);
@ -907,8 +909,6 @@ void Mod_ModelLoaded(void *ctx, void *data, size_t a, size_t b)
}
#endif
mod->loadstate = a;
switch(verbose)
{
default:
@ -2944,15 +2944,20 @@ typedef struct
int lmnum;
qboolean deluxe;
} lmalloc_t;
#define LM_FIRST 0x4000
static void Mod_LightmapAllocInit(lmalloc_t *lmallocator, qboolean hasdeluxe)
{
memset(lmallocator, 0, sizeof(*lmallocator));
lmallocator->deluxe = hasdeluxe;
lmallocator->lmnum = LM_FIRST;
}
static void Mod_LightmapAllocDone(lmalloc_t *lmallocator, model_t *mod)
{
mod->lightmaps.first = 1;
mod->lightmaps.count = lmallocator->lmnum;
mod->lightmaps.first = LM_FIRST;
mod->lightmaps.count = (lmallocator->lmnum - LM_FIRST);
if (lmallocator->allocated[0])
mod->lightmaps.count++;
if (lmallocator->deluxe)
{
mod->lightmaps.first*=2;
@ -2967,9 +2972,6 @@ static void Mod_LightmapAllocBlock(lmalloc_t *lmallocator, int w, int h, unsigne
int best, best2;
int i, j;
if (!lmallocator->lmnum)
lmallocator->lmnum = 1;
for(;;)
{
best = LMBLOCK_HEIGHT;

2
engine/gl/gl_shader.c
View File

@ -3962,7 +3962,7 @@ void QDECL R_BuildDefaultTexnums(texnums_t *tn, shader_t *shader)
/*dlights/realtime lighting needs some stuff*/
if (!TEXVALID(tn->base))
{
tn->base = R_LoadHiResTexture(imagename, subpath, IF_NOALPHA);
tn->base = R_LoadHiResTexture(imagename, subpath, (*imagename=='{')?0:IF_NOALPHA);
}
TEXASSIGN(shader->defaulttextures.base, tn->base);

5
engine/qclib/initlib.c
View File

@ -1,11 +1,6 @@
#define PROGSUSED
#include "progsint.h"
#include <stdlib.h>
#define STRING_SPECMASK 0xc0000000 //
#define STRING_TEMP 0x80000000 //temp string, will be collected.
#define STRING_STATIC 0xc0000000 //pointer to non-qcvm string.
#define STRING_NORMAL_ 0x00000000 //stringtable/mutable. should always be a fallthrough
#define STRING_NORMAL2_ 0x40000000 //stringtable/mutable. should always be a fallthrough
typedef struct prmemb_s {
struct prmemb_s *prev;

16
engine/qclib/pr_edict.c
View File

@ -525,7 +525,10 @@ char *PR_ValueString (progfuncs_t *progfuncs, etype_t type, eval_t *val, pbool v
QC_snprintfz (line, sizeof(line), "union");
break;
case ev_string:
QC_snprintfz (line, sizeof(line), "%s", PR_StringToNative(&progfuncs->funcs, val->string));
if (((unsigned int)val->string & STRING_SPECMASK) == STRING_TEMP)
return "<Stale Temporary String>";
else
QC_snprintfz (line, sizeof(line), "%s", PR_StringToNative(&progfuncs->funcs, val->string));
break;
case ev_entity:
fielddef = ED_FindField(progfuncs, "classname");
@ -642,7 +645,11 @@ char *PDECL PR_UglyValueString (pubprogfuncs_t *ppf, etype_t type, eval_t *val)
{
char *outs = line;
int outb = sizeof(line)-2;
const char *ins = PR_StringToNative(&progfuncs->funcs, val->string);
const char *ins;
if (((unsigned int)val->string & STRING_SPECMASK) == STRING_TEMP)
return "<Stale Temporary String>";
else
ins = PR_StringToNative(&progfuncs->funcs, val->string);
//markup the output string.
while(*ins && outb > 0)
{
@ -933,7 +940,6 @@ char *PR_GlobalStringNoContents (progfuncs_t *progfuncs, int ofs)
return line;
}
/*
=============
ED_Print
@ -989,7 +995,7 @@ void PDECL ED_Print (pubprogfuncs_t *ppf, struct edict_s *ed)
printf ("%s\n", PR_ValueString(progfuncs, d->type, (eval_t *)v, false));
}
}
#if 0
void ED_PrintNum (progfuncs_t *progfuncs, int ent)
{
ED_Print (&progfuncs->funcs, EDICT_NUM(progfuncs, ent));
@ -1046,7 +1052,7 @@ void ED_Count (progfuncs_t *progfuncs)
// Con_Printf ("step :%3i\n", step);
}
#endif
//============================================================================

6
engine/qclib/progsint.h
View File

@ -173,6 +173,12 @@ typedef struct progfuncs_s
#include "qcd.h"
#define STRING_SPECMASK 0xc0000000 //
#define STRING_TEMP 0x80000000 //temp string, will be collected.
#define STRING_STATIC 0xc0000000 //pointer to non-qcvm string.
#define STRING_NORMAL_ 0x00000000 //stringtable/mutable. should always be a fallthrough
#define STRING_NORMAL2_ 0x40000000 //stringtable/mutable. should always be a fallthrough
typedef struct
{
int targetflags; //weather we need to mark the progs as a newer version

130
engine/server/savegame.c
View File

@ -448,6 +448,14 @@ void SV_LegacySavegame_f (void)
s = PR_SaveEnts(svprogfuncs, NULL, &len, 0, 1);
VFS_PUTS(f, s);
VFS_PUTS(f, "\n");
/*
// DarkPlaces extended savegame
sv.lightstyles %i %s
sv.model_precache %i %s
sv.sound_precache %i %s
sv.buffer %i %i "string"
sv.bufstr %i %i "%s"
*/
svprogfuncs->parms->memfree(s);
VFS_CLOSE(f);
@ -456,7 +464,8 @@ void SV_LegacySavegame_f (void)
#define CACHEGAME_VERSION 513
#define CACHEGAME_VERSION_OLD 513
#define CACHEGAME_VERSION_VERBOSE 514
@ -616,10 +625,10 @@ qboolean SV_LoadLevelCache(char *savename, char *level, char *startspot, qboolea
VFS_GETS(f, str, sizeof(str));
version = atoi(str);
if (version != CACHEGAME_VERSION)
if (version != CACHEGAME_VERSION_OLD)
{
VFS_CLOSE (f);
Con_TPrintf ("Savegame is version %i, not %i\n", version, CACHEGAME_VERSION);
Con_TPrintf ("Savegame is version %i, not %i\n", version, CACHEGAME_VERSION_OLD);
return false;
}
VFS_GETS(f, str, sizeof(str)); //comment
@ -834,6 +843,7 @@ void SV_SaveLevelCache(char *savedir, qboolean dontharmgame)
int i;
char comment[SAVEGAME_COMMENT_LENGTH+1];
levelcache_t *cache;
int version = CACHEGAME_VERSION_OLD;
if (!sv.state)
return;
@ -899,11 +909,15 @@ void SV_SaveLevelCache(char *savedir, qboolean dontharmgame)
return;
}
VFS_PRINTF (f, "%i\n", CACHEGAME_VERSION);
VFS_PRINTF (f, "%i\n", version);
SV_SavegameComment (comment);
VFS_PRINTF (f, "%s\n", comment);
if (!dontharmgame)
{
//map-change caches require the players to have been de-spawned
//saved games require players to retain their fields.
//probably this should happen elsewhere.
for (cl = svs.clients, clnum=0; clnum < sv.allocated_client_slots; cl++,clnum++)//fake dropping
{
if (cl->state < cs_spawned && !cl->istobeloaded) //don't drop if they are still connecting
@ -928,39 +942,91 @@ void SV_SaveLevelCache(char *savedir, qboolean dontharmgame)
}
}
}
VFS_PRINTF (f, "%d\n", progstype);
VFS_PRINTF (f, "%f\n", skill.value);
VFS_PRINTF (f, "%f\n", deathmatch.value);
VFS_PRINTF (f, "%f\n", coop.value);
VFS_PRINTF (f, "%f\n", teamplay.value);
VFS_PRINTF (f, "%s\n", sv.name);
VFS_PRINTF (f, "%f\n",sv.time);
if (version == CACHEGAME_VERSION_VERBOSE)
{
char buf[8192];
char *mode = "?";
switch(progstype)
{
case PROG_NONE: break;
case PROG_QW: mode = "QW"; break;
case PROG_NQ: mode = "NQ"; break;
case PROG_H2: mode = "H2"; break;
case PROG_PREREL: mode = "PREREL"; break;
case PROG_UNKNOWN: mode = "UNKNOWN"; break;
}
VFS_PRINTF (f, "vmmode %s\n", COM_QuotedString(mode, buf, sizeof(buf), false));
VFS_PRINTF (f, "skill %s\n", COM_QuotedString(skill.string, buf, sizeof(buf), false));
VFS_PRINTF (f, "deathmatch %s\n", COM_QuotedString(deathmatch.string, buf, sizeof(buf), false));
VFS_PRINTF (f, "coop %s\n", COM_QuotedString(coop.string, buf, sizeof(buf), false));
VFS_PRINTF (f, "teamplay %s\n", COM_QuotedString(teamplay.string, buf, sizeof(buf), false));
VFS_PRINTF (f, "map %s\n", COM_QuotedString(sv.name, buf, sizeof(buf), false));
VFS_PRINTF (f, "time %f\n", sv.time);
for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
if (sv.strings.lightstyles[i])
VFS_PRINTF (f, "lstyle %i %s %f %f %f\n", COM_QuotedString(sv.strings.lightstyles[i], buf, sizeof(buf), false), sv.strings.lightstylecolours[i][0], sv.strings.lightstylecolours[i][1], sv.strings.lightstylecolours[i][2]);
for (i=1 ; i<MAX_PRECACHE_MODELS ; i++)
if (sv.strings.model_precache[i] && *sv.strings.model_precache[i])
VFS_PRINTF (f, "model %i %s\n", i, COM_QuotedString(sv.strings.model_precache[i], buf, sizeof(buf), false));
for (i=1 ; i<MAX_PRECACHE_SOUNDS ; i++)
if (*sv.strings.sound_precache[i])
VFS_PRINTF (f, "sound %i %s\n", i, COM_QuotedString(sv.strings.sound_precache[i], buf, sizeof(buf), false));
for (i=1 ; i<MAX_SSPARTICLESPRE ; i++)
if (*sv.strings.particle_precache[i])
VFS_PRINTF (f, "particles %i %s\n", i, sv.strings.particle_precache[i]);
for (i = 0; i < sizeof(sv.strings.vw_model_precache)/sizeof(sv.strings.vw_model_precache[0]); i++)
VFS_PRINTF (f, "vwep %i %s\n", i, COM_QuotedString(sv.strings.vw_model_precache[i], buf, sizeof(buf), false));
//FIXME: string buffers
//FIXME: hash tables
//FIXME: skeletal objects?
//FIXME: static entities
//FIXME: midi track
//FIXME: custom temp-ents?
//FIXME: pending uri_gets? (if only just to report fails)
//FIXME: sql queries?
//FIXME: frik files?
//FIXME: threads?
VFS_PRINTF (f, "entities\n");
}
else
{
VFS_PRINTF (f, "%d\n", progstype);
VFS_PRINTF (f, "%f\n", skill.value);
VFS_PRINTF (f, "%f\n", deathmatch.value);
VFS_PRINTF (f, "%f\n", coop.value);
VFS_PRINTF (f, "%f\n", teamplay.value);
VFS_PRINTF (f, "%s\n", sv.name);
VFS_PRINTF (f, "%f\n",sv.time);
// write the light styles
VFS_PRINTF (f, "%i\n",MAX_LIGHTSTYLES);
for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
{
VFS_PRINTF (f, "%s\n", sv.strings.lightstyles[i]?sv.strings.lightstyles[i]:"");
}
VFS_PRINTF (f, "%i\n",MAX_LIGHTSTYLES);
for (i=0 ; i<MAX_LIGHTSTYLES ; i++)
{
VFS_PRINTF (f, "%s\n", sv.strings.lightstyles[i]?sv.strings.lightstyles[i]:"");
for (i=1 ; i<MAX_PRECACHE_MODELS ; i++)
{
if (sv.strings.model_precache[i] && *sv.strings.model_precache[i])
VFS_PRINTF (f, "%s\n", sv.strings.model_precache[i]);
else
break;
}
VFS_PRINTF (f,"\n");
for (i=1 ; i<MAX_PRECACHE_SOUNDS ; i++)
{
if (*sv.strings.sound_precache[i])
VFS_PRINTF (f, "%s\n", sv.strings.sound_precache[i]);
else
break;
}
VFS_PRINTF (f,"\n");
}
for (i=1 ; i<MAX_PRECACHE_MODELS ; i++)
{
if (sv.strings.model_precache[i] && *sv.strings.model_precache[i])
VFS_PRINTF (f, "%s\n", sv.strings.model_precache[i]);
else
break;
}
VFS_PRINTF (f,"\n");
for (i=1 ; i<MAX_PRECACHE_SOUNDS ; i++)
{
if (*sv.strings.sound_precache[i])
VFS_PRINTF (f, "%s\n", sv.strings.sound_precache[i]);
else
break;
}
VFS_PRINTF (f,"\n");
s = PR_SaveEnts(svprogfuncs, NULL, &len, 0, 1);
VFS_PUTS(f, s);
VFS_PUTS(f, "\n");

3
engine/server/sv_init.c
View File

@ -1558,7 +1558,6 @@ void SV_SpawnServer (char *server, char *startspot, qboolean noents, qboolean us
realtime += 0.1;
// sv.world.physicstime = 1.1;
sv.time += 0.1;
sv.starttime -= 0.1;
SV_Physics ();
sv.time += 0.1;
@ -1711,6 +1710,8 @@ void SV_SpawnServer (char *server, char *startspot, qboolean noents, qboolean us
//some mods stuffcmd these, and it would be a shame if they didn't work. we still need the earlier call in case the mod does extra stuff.
SV_SetMoveVars();
sv.starttime = Sys_DoubleTime() - sv.time;
}
#endif

4
engine/server/sv_main.c
View File

@ -4125,8 +4125,8 @@ float SV_Frame (void)
#ifndef SERVERONLY
isidle = !isDedicated && sv.allocated_client_slots == 1 && Key_Dest_Has(~kdm_game) && cls.state == ca_active;
/*server is effectively paused if there are no clients*/
if (sv.spawned_client_slots == 0 && sv.spawned_observer_slots == 0 && (cls.state != ca_connected))
isidle = true;
// if (sv.spawned_client_slots == 0 && sv.spawned_observer_slots == 0 && (cls.state != ca_connected))
// isidle = true;
if ((sv.paused & 4) != (isidle?4:0))
sv.paused ^= 4;
#endif