[openjk] 05/23: SP: Fix symbol error caused by UI functions in cgame
Simon McVittie
smcv at debian.org
Thu Jan 11 17:28:58 UTC 2018
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository openjk.
commit eba428e64e314ddb822d52f3bf10c12c8f631cfe
Author: Ensiform <ensiform at gmail.com>
Date: Fri Dec 8 09:42:55 2017 -0600
SP: Fix symbol error caused by UI functions in cgame
These two functions existin SP's exe which is where UI resides there.
I am leaving references to the proper syscalls but since they do not get used when hud is normally loaded in SP (commented out), I think it is best to not call them as it is a global state affecting menus as well.
---
code/cgame/cg_consolecmds.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/code/cgame/cg_consolecmds.cpp b/code/cgame/cg_consolecmds.cpp
index d400ab3..eb4b79a 100644
--- a/code/cgame/cg_consolecmds.cpp
+++ b/code/cgame/cg_consolecmds.cpp
@@ -27,7 +27,6 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "cg_headers.h"
#include "cg_media.h" //just for cgs....
-#include "ui/ui_shared.h"
void CG_TargetCommand_f( void );
extern qboolean player_locked;
@@ -203,8 +202,8 @@ void CG_LoadHud_f( void ) {
hudSet = "ui/jahud.txt";
}
- String_Init();
- Menu_Reset();
+ //cgi_UI_String_Init();
+ //cgi_UI_Menu_Reset();
CG_LoadMenus( hudSet );
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git
More information about the Pkg-games-commits
mailing list