[ioquake3] 08/11: Add patch so the UI can see whether we're playing the demo
Simon McVittie
smcv at debian.org
Fri Jan 23 01:15:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian-experimental
in repository ioquake3.
commit b2e94bb5b4811b12ca76ff376ae9f0011bc0b017
Author: Simon McVittie <smcv at debian.org>
Date: Thu Jan 22 22:04:24 2015 +0000
Add patch so the UI can see whether we're playing the demo
---
debian/changelog | 1 +
...start-which-can-be-set-by-game-code-to-re.patch | 2 +-
...rash-if-more-than-128-modes-are-available.patch | 2 +-
...-a-window-by-default-on-new-installations.patch | 4 +--
debian/patches/series | 1 +
...e-minimal-code-to-determine-whether-this-.patch | 29 ++++++++++++++++++++++
6 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ab58d54..5b23e40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ioquake3 (1.36+u20150114+dfsg1-1) UNRELEASED; urgency=medium
on its own (unapplies patches iff they were initially applied)
* Standards-Version: 3.9.6 (no changes)
* Mangle upstream version correctly in watch file
+ * Add patch so the UI can see whether we're playing the demo
-- Simon McVittie <smcv at debian.org> Wed, 31 Dec 2014 11:36:48 +0000
diff --git a/debian/patches/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch b/debian/patches/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
index 31ad2d3..cc50b39 100644
--- a/debian/patches/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
+++ b/debian/patches/Add-sv_dorestart-which-can-be-set-by-game-code-to-re.patch
@@ -62,7 +62,7 @@ index 7332180..453e1b1 100644
sv_mapname = Cvar_Get ("mapname", "nomap", CVAR_SERVERINFO | CVAR_ROM);
sv_privateClients = Cvar_Get ("sv_privateClients", "0", CVAR_SERVERINFO);
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
-index ed50707..b85b818 100644
+index 4169fd2..1f410d2 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -54,6 +54,7 @@ cvar_t *sv_dlRate;
diff --git a/debian/patches/Don-t-crash-if-more-than-128-modes-are-available.patch b/debian/patches/Don-t-crash-if-more-than-128-modes-are-available.patch
index 6d8d3bd..8ce0c0d 100644
--- a/debian/patches/Don-t-crash-if-more-than-128-modes-are-available.patch
+++ b/debian/patches/Don-t-crash-if-more-than-128-modes-are-available.patch
@@ -8,7 +8,7 @@ Forwarded: https://github.com/ioquake/ioq3/pull/105
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c
-index 1f12fb7..1cf9d07 100644
+index df20168..a9a1247 100644
--- a/code/sdl/sdl_glimp.c
+++ b/code/sdl/sdl_glimp.c
@@ -130,7 +130,8 @@ static void GLimp_DetectAvailableModes(void)
diff --git a/debian/patches/Run-in-a-window-by-default-on-new-installations.patch b/debian/patches/Run-in-a-window-by-default-on-new-installations.patch
index 85ba318..72806ac 100644
--- a/debian/patches/Run-in-a-window-by-default-on-new-installations.patch
+++ b/debian/patches/Run-in-a-window-by-default-on-new-installations.patch
@@ -33,10 +33,10 @@ index 15e7972..701c182 100644
r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE | CVAR_LATCH );
r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE | CVAR_LATCH );
diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
-index 8cff86e..3deb3a8 100644
+index 525dfba..8b8fe2a 100644
--- a/code/renderergl2/tr_init.c
+++ b/code/renderergl2/tr_init.c
-@@ -1154,8 +1154,8 @@ void R_Register( void )
+@@ -1167,8 +1167,8 @@ void R_Register( void )
ri.Cvar_CheckRange( r_ext_multisample, 0, 4, qtrue );
r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "1", CVAR_ARCHIVE | CVAR_LATCH );
r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH);
diff --git a/debian/patches/series b/debian/patches/series
index d9072df..eda843e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ Let-servers-set-sv_fps-too.patch
Run-in-a-window-by-default-on-new-installations.patch
Add-support-for-the-GNU-Hurd-architecture.patch
Don-t-crash-if-more-than-128-modes-are-available.patch
+ui-reinstate-minimal-code-to-determine-whether-this-.patch
diff --git a/debian/patches/ui-reinstate-minimal-code-to-determine-whether-this-.patch b/debian/patches/ui-reinstate-minimal-code-to-determine-whether-this-.patch
new file mode 100644
index 0000000..ceb6f9c
--- /dev/null
+++ b/debian/patches/ui-reinstate-minimal-code-to-determine-whether-this-.patch
@@ -0,0 +1,29 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Tue, 20 Jan 2015 09:23:49 +0000
+Subject: ui: reinstate minimal code to determine whether this is the demo
+
+---
+ code/q3_ui/ui_gameinfo.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/code/q3_ui/ui_gameinfo.c b/code/q3_ui/ui_gameinfo.c
+index d839723..ea84651 100644
+--- a/code/q3_ui/ui_gameinfo.c
++++ b/code/q3_ui/ui_gameinfo.c
+@@ -806,10 +806,16 @@ UI_InitGameinfo
+ ===============
+ */
+ void UI_InitGameinfo( void ) {
++ char basegame[MAX_INFO_STRING];
+
+ UI_InitMemory();
+ UI_LoadArenas();
+ UI_LoadBots();
+
+ uis.demoversion = qfalse;
++
++ trap_Cvar_VariableStringBuffer("com_basegame", basegame, sizeof(basegame));
++ if (!strcmp (basegame, "demoq3")) {
++ uis.demoversion = qtrue;
++ }
+ }
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git
More information about the Pkg-games-commits
mailing list