fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Small defs cleanup.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5897 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2021-06-21 13:45:14 +00:00
parent 19073fe2a5
commit be0c0b1821
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
engine/client/pr_csqc.c
View file

@ -2199,11 +2199,11 @@ nogameaccess:
r[1] = r_refdef.fov_y; r[1] = r_refdef.fov_y;
break; break;
case VF_FOVX: case VF_FOV_X:
*r = r_refdef.fov_x; *r = r_refdef.fov_x;
break; break;
case VF_FOVY: case VF_FOV_Y:
*r = r_refdef.fov_y; *r = r_refdef.fov_y;
break; break;
@ -2461,14 +2461,14 @@ void QCBUILTIN PF_R_SetViewFlag(pubprogfuncs_t *prinst, struct globalvars_s *pr_
r_refdef.dirty |= RDFD_FOV; r_refdef.dirty |= RDFD_FOV;
break; break;
case VF_FOVX: case VF_FOV_X:
r_refdef.afov = 0; r_refdef.afov = 0;
r_refdef.fov_x = *p; r_refdef.fov_x = *p;
r_refdef.fovv_x = r_refdef.fovv_y = 0; r_refdef.fovv_x = r_refdef.fovv_y = 0;
r_refdef.dirty |= RDFD_FOV; r_refdef.dirty |= RDFD_FOV;
break; break;
case VF_FOVY: case VF_FOV_Y:
r_refdef.afov = 0; r_refdef.afov = 0;
r_refdef.fov_y = *p; r_refdef.fov_y = *p;
r_refdef.fovv_x = r_refdef.fovv_y = 0; r_refdef.fovv_x = r_refdef.fovv_y = 0;

4
engine/common/pr_common.h
View file

@ -740,8 +740,8 @@ typedef enum
VF_SIZE_Y = 6, VF_SIZE_Y = 6,
VF_VIEWPORT = 7, VF_VIEWPORT = 7,
VF_FOV = 8, VF_FOV = 8,
VF_FOVX = 9, VF_FOV_X = 9,
VF_FOVY = 10, VF_FOV_Y = 10,
VF_ORIGIN = 11, VF_ORIGIN = 11,
VF_ORIGIN_X = 12, VF_ORIGIN_X = 12,
VF_ORIGIN_Y = 13, VF_ORIGIN_Y = 13,

10
engine/server/pr_cmds.c
View file

@ -12390,7 +12390,9 @@ static void PR_DumpPlatform_LoadSymbolTables(vfsfile_t *outfile, struct symtable
continue; continue;
if (!symtabs->warning) if (!symtabs->warning)
continue; continue;
f = FS_MallocFile(symtabs->fname, FS_GAME, &sz); f = FS_MallocFile(va("src/%s", symtabs->fname), FS_GAME, &sz);
if (!f)
f = FS_MallocFile(symtabs->fname, FS_GAME, &sz);
if (f) if (f)
{ {
i = f; i = f;
@ -12413,6 +12415,8 @@ static void PR_DumpPlatform_LoadSymbolTables(vfsfile_t *outfile, struct symtable
if (symtabs->define) if (symtabs->define)
VFS_PRINTF(outfile, "%s", symtabs->define); VFS_PRINTF(outfile, "%s", symtabs->define);
} }
else
Con_Printf("%s not found, not filtering\n", symtabs->fname);
} }
} }
static void PR_DumpPlatform_SymbolType(vfsfile_t *f, const struct symtable_s *symtabs, const char *symtype, const char *symbol) static void PR_DumpPlatform_SymbolType(vfsfile_t *f, const struct symtable_s *symtabs, const char *symtype, const char *symbol)
@ -13316,8 +13320,8 @@ void PR_DumpPlatform_f(void)
{"VF_SIZE_Y", "const float", CS|MENU, NULL, VF_SIZE_Y}, {"VF_SIZE_Y", "const float", CS|MENU, NULL, VF_SIZE_Y},
{"VF_VIEWPORT", "const float", CS|MENU, D("vector+vector. Two argument shortcut for VF_MIN and VF_SIZE"), VF_VIEWPORT}, {"VF_VIEWPORT", "const float", CS|MENU, D("vector+vector. Two argument shortcut for VF_MIN and VF_SIZE"), VF_VIEWPORT},
{"VF_FOV", "const float", CS|MENU, D("sets both fovx and fovy. consider using afov instead."), VF_FOV}, {"VF_FOV", "const float", CS|MENU, D("sets both fovx and fovy. consider using afov instead."), VF_FOV},
{"VF_FOVX", "const float", CS|MENU, D("horizontal field of view. does not consider aspect at all."), VF_FOVX}, {"VF_FOV_X", "const float", CS|MENU, D("horizontal field of view. does not consider aspect at all."), VF_FOV_X},
{"VF_FOVY", "const float", CS|MENU, D("vertical field of view. does not consider aspect at all."), VF_FOVY}, {"VF_FOV_Y", "const float", CS|MENU, D("vertical field of view. does not consider aspect at all."), VF_FOV_Y},
{"VF_ORIGIN", "const float", CS|MENU, D("The origin of the view. Not of the player."), VF_ORIGIN}, {"VF_ORIGIN", "const float", CS|MENU, D("The origin of the view. Not of the player."), VF_ORIGIN},
{"VF_ORIGIN_X", "const float", CS|MENU, NULL, VF_ORIGIN_X}, {"VF_ORIGIN_X", "const float", CS|MENU, NULL, VF_ORIGIN_X},
{"VF_ORIGIN_Y", "const float", CS|MENU, NULL, VF_ORIGIN_Y}, {"VF_ORIGIN_Y", "const float", CS|MENU, NULL, VF_ORIGIN_Y},