diff --git a/src/menu-fn/Makefile b/src/menu-fn/Makefile index a9d58eba..627019ab 100644 --- a/src/menu-fn/Makefile +++ b/src/menu-fn/Makefile @@ -1,5 +1,4 @@ CC=fteqcc all: - mkdir -p ../../platform/data.pk3dir $(CC) progs.src diff --git a/src/menu-fn/defs.h b/src/menu-fn/defs.h index d51baddb..45ae3ccc 100644 --- a/src/menu-fn/defs.h +++ b/src/menu-fn/defs.h @@ -74,6 +74,7 @@ typedef struct string type; string hlversion; string pkgname; + string pkgfile; int pkgid; int nomodels; int nosprays; @@ -84,6 +85,7 @@ typedef struct string trainingmap; string fallback_dir; string chatroom; + string introvideo; } gameinfo_t; var int gameinfo_current = -1; diff --git a/src/menu-fn/entry.qc b/src/menu-fn/entry.qc index fc8b2c3f..5446142c 100644 --- a/src/menu-fn/entry.qc +++ b/src/menu-fn/entry.qc @@ -112,12 +112,13 @@ m_init(void) Strings_Init(); g_initialized = TRUE; - if (cvar_string("gameinfo_gamedir") != "valve") { + if (games[gameinfo_current].gamedir != "valve") { m_intro_skip(); Music_MenuStart(); } - if (!whichpack(cvar_string("gameinfo_pkgfile")) || autocvar_menu_updating) { + if (games[gameinfo_current].pkgfile != "") + if (!whichpack(games[gameinfo_current].pkgfile) || autocvar_menu_updating) { /* reload in case of video restarts? */ shaderforname("logo_avi", "{\n{\nvideomap av:media/logo.avi\n}\n}"); g_menupage = PAGE_UPDATES; @@ -127,7 +128,7 @@ m_init(void) Menu_GammaHack(); if (g_intro_stage == 0) { - string videofile = cvar_string("gameinfo_introvideo"); + string videofile = games[gameinfo_current].introvideo; if (videofile) { localcmd(strcat("playvideo ", videofile, "\n")); diff --git a/src/menu-fn/m_customgame.qc b/src/menu-fn/m_customgame.qc index 5b5797e5..a446bfaa 100644 --- a/src/menu-fn/m_customgame.qc +++ b/src/menu-fn/m_customgame.qc @@ -319,12 +319,18 @@ games_init(void) games[id].pkgname = argv(i+1); games[id].pkgid = game_getpackageid(games[id].pkgname); break; + case "gameinfo_pkgfile": + games[id].pkgfile = argv(i+1); + break; case "gameinfo_chatroom": games[id].chatroom = argv(i+1); break; case "gameinfo_readme": games[id].readme = argv(i+1); break; + case "gameinfo_introvideo": + games[id].introvideo = argv(i+1); + break; default: break; } diff --git a/src/menu-fn/progs.src b/src/menu-fn/progs.src index bafb95e5..06294631 100644 --- a/src/menu-fn/progs.src +++ b/src/menu-fn/progs.src @@ -1,5 +1,5 @@ #pragma target fte -#pragma progs_dat "../../platform/data.pk3dir/menu.dat" +#pragma progs_dat "../../platform/menu.dat" #define MENU #includelist