vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

GameLibrary: adjusted support for scanning mod packages for new packaging standard

Browse source
This commit is contained in:
Marco Cawthorne 2025-02-02 23:02:30 -08:00
parent 85488eeccf
commit d15a8d3333
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -623,6 +623,7 @@ dist: dist-pak dist-engine
dist-engine: engine-lin32 engine-lin64 engine-win32 engine-win64 dedicated-lin32 dedicated-lin64 dedicated-win32 dedicated-win64
dist-pak:
if [ -d $(GAME)/src ];then $(MAKE) game GAME=$(GAME) NAME="$(NAME)";fi
mkdir -p "$(BUILD_DIR)/$(NAME)-content/$(GAME)"
./Tools/make_dist.sh "$(GAME)" $(BUILD_DIR)/$(NAME)-content/$(GAME) > $(BUILD_DIR)/$(NAME)-content.log
-$(GAME)/post-dist.sh "$(GAME)" "$(BUILD_DIR)/$(NAME)-content"

4
src/menu-vgui/ui_customgame.qc
View file

@ -24,7 +24,7 @@ void UI_CustomGame_Show ( void )
static vguiButton btnLoad;
static void CustomGame_Play ( void ) {
GameLibrary_Activate(lsbGames.GetSelected());
GameLibrary_Activate(lsbGames.GetSelected() + 1);
}
static void CustomGame_ScrollUpdate ( void ) {
@ -50,7 +50,7 @@ void UI_CustomGame_Show ( void )
lsbGames.SetItemCount( GameLibrary_GetGameCount() );
lsbGames.CallOnScroll( CustomGame_ScrollUpdate );
for ( int i = 0; i < GameLibrary_GetGameCount(); i++ ) {
for ( int i = 1; i < GameLibrary_GetGameCount(); i++ ) {
lsbGames.AddItem( GameLibrary_GetGameInfo(i, GAMEINFO_NAME) );
}

26
src/platform/gamelibrary.qc
View file

@ -459,32 +459,34 @@ GameLibrary_InitCustom(void)
int old_count = gameinfo_count;
int packageinfo_count = 0i;
int c = 0i;
string modPrefix = strcat(GAME_DIR, "-mod");
gameinfo_count = 0i;
/* first count let's all manually installed mods */
for (targetID = 0; (gamedirname = getgamedirinfo(targetID, 0)); targetID++) {
gameinfo_count++;
//printf("MANUAL: %S\n", gamedirname);
}
/* count the package installed mods after */
if (checkextension("getpackagemanagerinfo"))
for (int i = 0; (getpackagemanagerinfo(i, GPMI_NAME)); i++) {
string packageName = getpackagemanagerinfo(i, GPMI_NAME);
string installStatus = getpackagemanagerinfo(i, GPMI_INSTALLED);
string prefix = substring(packageName, 0, 3);
string prefix = substring(packageName, 0, strlen(modPrefix));
/* only care about installed mods (custom games) */
if (prefix == "cg_" && installStatus == "enabled") {
string gameDir = substring(packageName, 3, -1);
tokenizebyseparator(gameDir, "=");
gameDir = argv(0);
if (prefix == modPrefix && installStatus == "enabled") {
tokenizebyseparator(packageName, "-");
string gameDir = argv(2);
/* check if this mod was installed manually already */
if (GameLibrary_CheckLocalPresence(gameDir) == true) {
continue;
}
//printf("REMOTE: %S %S\n", packageName, prefix);
packageinfo_count++;
}
}
@ -521,15 +523,15 @@ GameLibrary_InitCustom(void)
}
/* iterate through all packages again */
if (checkextension("getpackagemanagerinfo"))
for (int i = 0i; (getpackagemanagerinfo(i, GPMI_NAME)); i++) {
string packageName = getpackagemanagerinfo(i, GPMI_NAME);
string installStatus = getpackagemanagerinfo(i, GPMI_INSTALLED);
string prefix = substring(packageName, 0, 3);
string prefix = substring(packageName, 0, strlen(modPrefix));
/* same check as above in the counter */
if (prefix == "cg_" && installStatus == "enabled") {
string gameDir = substring(packageName, 3, -1);
if (prefix == modPrefix && installStatus == "enabled") {
tokenizebyseparator(packageName, "-");
string gameDir = argv(2);
tokenizebyseparator(gameDir, "=");
gameDir = argv(0);
@ -546,13 +548,13 @@ GameLibrary_InitCustom(void)
//print(sprintf("Adding packaged game %S\n", gameDir));
GameLibrary_SetDefaults(c, gameDir);
games[c].game = substring(titleString, 5, -1); /* strip 'Mod: '*/
games[c].game = titleString;
games[c].url_info = websiteString;
games[c].version = versionString;
games[c].size = (int)stof(sizeString);
games[c].type = "Both";
games[c].info_type = GAMEINFO_PACKAGE;
games[c].pkgname = strcat("cg_", gameDir, ";game_", gameDir, ";");
games[c].pkgname = argv(0);
c++;
}
}