fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

bugfix patch:

Browse source 
prevent shift+alt from triggering the menu while in demo playback. hopefully solve toggleconsole issues on german keymaps.
gl_texturemode2d is now in presets, using nearest in vanilla preset.
waterwarp edge textures now force linear sampling. no weird blocky edges.
fix serverflags reset issue on saved games.
fix $currentrender to not glitch on fbos too much.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4720 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2014-08-16 05:33:50 +00:00
parent 362d8f820f
commit 583d8aa46c
6 changed files with 44 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
engine/server/savegame.c
View file

@ -717,7 +717,6 @@ qboolean SV_LoadLevelCache(char *savename, char *level, char *startspot, qboolea
PR_LoadGlabalStruct();
pr_global_struct->serverflags = svs.serverflags;
pr_global_struct->time = sv.time = sv.world.physicstime = time;
sv.starttime = Sys_DoubleTime() - sv.time;
@ -1094,6 +1093,8 @@ void SV_Savegame (char *savename)
VFS_PRINTF (f, "%s\n", sv.name);
VFS_PRINTF (f, "%g\n", (float)svs.serverflags);
VFS_CLOSE(f);
#ifdef Q2SERVER
@ -1225,9 +1226,9 @@ void SV_Loadgame_f (void)
for (trim = str+strlen(str)-1; trim>=str && *trim <= ' '; trim--)
*trim='\0';
for (trim = str; *trim <= ' ' && *trim; trim++)
if (*str == '(')
cl->spawn_parms[len] = atof(str);
;
if (*trim == '(')
cl->spawn_parms[len] = atof(trim+1);
else
{
version = atoi(str);
@ -1320,6 +1321,10 @@ void SV_Loadgame_f (void)
for (trim = str; *trim <= ' ' && *trim; trim++)
;
//serverflags is reset on restart, so we need to read the value as it was at the start of the current map.
VFS_GETS(f, filename, sizeof(filename)-1);
svs.serverflags = atof(filename);
VFS_CLOSE(f);
#ifdef Q2SERVER