Skip to content

Use full URL string for fs_cdn #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justinl1996 merged 1 commit into from
Jan 19, 2026
Merged

Use full URL string for fs_cdn #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/qcommon/files.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3587,9 +3587,9 @@ static void FS_Startup(const char *gameName, cb_context_t *after )
fs_debug = Cvar_Get("fs_debug", "0", 0);

#if EMSCRIPTEN
//fs_cdn = Cvar_Get("fs_cdn", "127.0.0.1", CVAR_INIT | CVAR_SERVERINFO); //Auriga: Use 127.0.0.1, nodejs does not like localhost in some cases
//fs_cdn = Cvar_Get("fs_cdn", "cdn.tremulo.us", CVAR_INIT | CVAR_SERVERINFO);
fs_cdn = Cvar_Get("fs_cdn", "content.tremulous.online:9000", CVAR_INIT | CVAR_SERVERINFO);
//fs_cdn = Cvar_Get("fs_cdn", "http://127.0.0.1/assets", CVAR_INIT | CVAR_SERVERINFO); //Auriga: Use 127.0.0.1, nodejs does not like localhost in some cases
//fs_cdn = Cvar_Get("fs_cdn", "https://cdn.tremulo.us/base-assets", CVAR_INIT | CVAR_SERVERINFO);
fs_cdn = Cvar_Get("fs_cdn", "https://content.tremulous.online/assets", CVAR_INIT | CVAR_SERVERINFO);
fs_manifest = Cvar_Get("fs_manifest", "", CVAR_ROM | CVAR_SERVERINFO);
fs_completeManifest = Cvar_Get("fs_completeManifest", "", CVAR_ROM);
Com_Printf("Using content server: %s\n", fs_cdn->string);
Expand Down
4 changes: 2 additions & 2 deletions src/sys/sys_common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ var LibrarySysCommon = {
DownloadAsset: function (asset, onprogress, onload) {
var root = SYSC.GetCDN();
var name = asset.name.replace(/(.+\/|)(.+?)$/, '$1' + asset.checksum + '-$2');
var url = 'https://' + root + '/assets/' + name;
var url = root + '/' + name;

SYS.DoXHR(url, {
dataType: 'arraybuffer',
Expand Down Expand Up @@ -268,7 +268,7 @@ var LibrarySysCommon = {
var fs_game = Module.UTF8ToString(_Cvar_VariableString(Module.allocate(intArrayFromString('fs_game'), ALLOC_STACK)));
var com_basegame = Module.UTF8ToString(_Cvar_VariableString(Module.allocate(intArrayFromString('com_basegame'), ALLOC_STACK)));
var mapname = Module.UTF8ToString(_Cvar_VariableString(Module.allocate(intArrayFromString('mapname'), ALLOC_STACK)));
var url = "https://" + fs_cdn + '/assets/manifest.json';
var url = fs_cdn + '/manifest.json';
console.log("URL:", url);
/*function isInstaller(name) {
return SYSC.installers.some(function (installer) {
Expand Down
2 changes: 1 addition & 1 deletion src/sys/sys_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ void Sys_SigHandler( int signal )

#ifndef DEFAULT_BASEDIR
# if EMSCRIPTEN
# define DEFAULT_BASEDIR "/tremulous"
# define DEFAULT_BASEDIR "/tremulous_base"
# elif __APPLE__
# define DEFAULT_BASEDIR Sys_StripAppBundle(Sys_BinaryPath())
# else
Expand Down
Loading