Skip to content

Commit 79bf1bb

Browse files
committed
Add update functionality for trinity-engine
1 parent db39150 commit 79bf1bb

8 files changed

Lines changed: 1582 additions & 0 deletions

File tree

Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,14 @@ endif
313313

314314
TRINITY_ENGINE_VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo "unknown")
315315

316+
UPDATE_GITHUB_OWNER ?= ernie
317+
UPDATE_GITHUB_REPO ?= trinity-engine
318+
UPDATE_ASSET_PREFIX ?= trinity
319+
316320
BASE_CFLAGS = -DTRINITY_ENGINE_VERSION=\\\"$(TRINITY_ENGINE_VERSION)\\\"
321+
BASE_CFLAGS += -DUPDATE_GITHUB_OWNER=\\\"$(UPDATE_GITHUB_OWNER)\\\"
322+
BASE_CFLAGS += -DUPDATE_GITHUB_REPO=\\\"$(UPDATE_GITHUB_REPO)\\\"
323+
BASE_CFLAGS += -DUPDATE_ASSET_PREFIX=\\\"$(UPDATE_ASSET_PREFIX)\\\"
317324

318325
ifeq ($(USE_SYSTEM_JPEG),1)
319326
BASE_CFLAGS += -DUSE_SYSTEM_JPEG
@@ -1214,6 +1221,7 @@ endif
12141221

12151222
ifeq ($(USE_CURL),1)
12161223
Q3OBJ += $(B)/client/cl_curl.o
1224+
Q3OBJ += $(B)/client/autoupdate.o
12171225
endif
12181226

12191227
ifdef MINGW

code/client/cl_main.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2323

2424
#include "client.h"
2525
#include "cl_trinity.h"
26+
#include "../qcommon/autoupdate.h"
2627
#include <limits.h>
2728

2829
cvar_t *cl_noprint;
@@ -3121,6 +3122,7 @@ void CL_Frame( int msec, int realMsec ) {
31213122
if ( tvDownload.cURL ) {
31223123
CL_TV_PerformDownload();
31233124
}
3125+
Update_Frame();
31243126
// initiate TV demo download once the client has entered the game
31253127
if ( cls.state == CA_ACTIVE && clc.tvDemoFile[0]
31263128
&& !Com_DL_InProgress( &tvDownload ) && cl_tvDownload->integer ) {
@@ -4230,6 +4232,7 @@ void CL_Init( void ) {
42304232
Cmd_AddCommand( "dlmap", CL_Download_f );
42314233
Cmd_AddCommand( "tvdyes", CL_TVDYes_f );
42324234
Cmd_AddCommand( "tvdno", CL_TVDNo_f );
4235+
Update_Init();
42334236
#endif
42344237
Cmd_AddCommand( "modelist", CL_ModeList_f );
42354238

@@ -4310,6 +4313,7 @@ void CL_Shutdown( const char *finalmsg, qboolean quit ) {
43104313

43114314
#ifdef USE_CURL
43124315
Com_DL_Cleanup( &download );
4316+
Update_Shutdown();
43134317

43144318
Cmd_RemoveCommand( "download" );
43154319
Cmd_RemoveCommand( "dlmap" );

code/client/client.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,8 @@ extern qboolean cl_oldGameSet;
435435

436436
extern download_t download;
437437
extern download_t tvDownload;
438+
qboolean Com_DL_Init( download_t *dl );
439+
void Com_DL_Done( download_t *dl );
438440
qboolean Com_DL_Perform( download_t *dl );
439441
void Com_DL_Cleanup( download_t *dl );
440442
qboolean Com_DL_Begin( download_t *dl, const char *localName, const char *remoteURL, qboolean autoDownload );

0 commit comments

Comments
 (0)