This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit bc697477728ed029dc8ec43f4d24af4b8c9cf56c
Author: m4n4t4...@gmail.com
<m4n4t4...@gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date: Wed Feb 18 11:08:01 2015 +0000
SP: Fix camera loading for all platforms and compilers
---
MP/code/cgame/cg_servercmds.c | 2 +-
SP/code/cgame/cg_servercmds.c | 2 +-
SP/code/game/g_main.c | 5 +----
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/MP/code/cgame/cg_servercmds.c b/MP/code/cgame/cg_servercmds.c
index 4a87cad..15511bc 100644
--- a/MP/code/cgame/cg_servercmds.c
+++ b/MP/code/cgame/cg_servercmds.c
@@ -1581,7 +1581,7 @@ static void CG_ServerCommand( void ) {
}
// if ( !strcmp( cmd, "startCam" ) ) {
-// CG_StartCamera( CG_Argv(1), atoi(CG_Argv(2)) );
+// CG_StartCamera( CG_Argv(1), atoi(CG_Argv(1)) );
// return;
// }
diff --git a/SP/code/cgame/cg_servercmds.c b/SP/code/cgame/cg_servercmds.c
index da4ab41..dd16874 100644
--- a/SP/code/cgame/cg_servercmds.c
+++ b/SP/code/cgame/cg_servercmds.c
@@ -818,7 +818,7 @@ static void CG_ServerCommand( void ) {
}
if ( !strcmp( cmd, "startCam" ) ) {
- CG_StartCamera( CG_Argv( 1 ), atoi( CG_Argv( 2 ) ) );
+ CG_StartCamera( CG_Argv( 1 ), atoi( CG_Argv( 1 ) ) );
return;
}
diff --git a/SP/code/game/g_main.c b/SP/code/game/g_main.c
index 558bafb..823c846 100644
--- a/SP/code/game/g_main.c
+++ b/SP/code/game/g_main.c
@@ -169,11 +169,8 @@ cvarTable_t gameCvarTable[] = {
{ &g_soldierChargeTime, "g_soldierChargeTime", "20000", CVAR_SERVERINFO
| CVAR_LATCH, 0, qfalse },
// jpw
-#ifdef USE_OPENGLES
- { &g_skipcutscenes, "g_skipcutscenes", "1", CVAR_ARCHIVE, 0, qtrue },
-#else
{ &g_skipcutscenes, "g_skipcutscenes", "0", CVAR_ARCHIVE, 0, qtrue },
-#endif
+
{ &g_playerStart, "g_playerStart", "0", CVAR_ROM, 0, qfalse },
{ &g_maxclients, "sv_maxclients", "8", CVAR_SERVERINFO | CVAR_LATCH |
CVAR_ARCHIVE, 0, qfalse },
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
