diff --git a/engine/client/pr_csqc.c b/engine/client/pr_csqc.c index 2d650d8b4..b14cadb31 100644 --- a/engine/client/pr_csqc.c +++ b/engine/client/pr_csqc.c @@ -2199,11 +2199,11 @@ nogameaccess: r[1] = r_refdef.fov_y; break; - case VF_FOVX: + case VF_FOV_X: *r = r_refdef.fov_x; break; - case VF_FOVY: + case VF_FOV_Y: *r = r_refdef.fov_y; break; @@ -2461,14 +2461,14 @@ void QCBUILTIN PF_R_SetViewFlag(pubprogfuncs_t *prinst, struct globalvars_s *pr_ r_refdef.dirty |= RDFD_FOV; break; - case VF_FOVX: + case VF_FOV_X: r_refdef.afov = 0; r_refdef.fov_x = *p; r_refdef.fovv_x = r_refdef.fovv_y = 0; r_refdef.dirty |= RDFD_FOV; break; - case VF_FOVY: + case VF_FOV_Y: r_refdef.afov = 0; r_refdef.fov_y = *p; r_refdef.fovv_x = r_refdef.fovv_y = 0; diff --git a/engine/common/pr_common.h b/engine/common/pr_common.h index f80b48b3b..1d86f9f88 100644 --- a/engine/common/pr_common.h +++ b/engine/common/pr_common.h @@ -740,8 +740,8 @@ typedef enum VF_SIZE_Y = 6, VF_VIEWPORT = 7, VF_FOV = 8, - VF_FOVX = 9, - VF_FOVY = 10, + VF_FOV_X = 9, + VF_FOV_Y = 10, VF_ORIGIN = 11, VF_ORIGIN_X = 12, VF_ORIGIN_Y = 13, diff --git a/engine/server/pr_cmds.c b/engine/server/pr_cmds.c index 6d0c268c8..139cb1c9f 100644 --- a/engine/server/pr_cmds.c +++ b/engine/server/pr_cmds.c @@ -12390,7 +12390,9 @@ static void PR_DumpPlatform_LoadSymbolTables(vfsfile_t *outfile, struct symtable continue; if (!symtabs->warning) 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) { i = f; @@ -12413,6 +12415,8 @@ static void PR_DumpPlatform_LoadSymbolTables(vfsfile_t *outfile, struct symtable if (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) @@ -13316,8 +13320,8 @@ void PR_DumpPlatform_f(void) {"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_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_FOVY", "const float", CS|MENU, D("vertical field of view. does not consider aspect at all."), VF_FOVY}, + {"VF_FOV_X", "const float", CS|MENU, D("horizontal field of view. does not consider aspect at all."), VF_FOV_X}, + {"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_X", "const float", CS|MENU, NULL, VF_ORIGIN_X}, {"VF_ORIGIN_Y", "const float", CS|MENU, NULL, VF_ORIGIN_Y},