[iortcw] 62/497: All: Parse q3map_sunExt in OpenGL1 renderer

[Simon McVittie]

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 7c90b7db47afabe71764bddf85e089bbbac6eefb
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Tue Mar 11 18:50:03 2014 +0000

    All: Parse q3map_sunExt in OpenGL1 renderer
---
 MP/code/renderer/tr_shader.c | 5 ++++-
 SP/code/renderer/tr_shader.c | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/MP/code/renderer/tr_shader.c b/MP/code/renderer/tr_shader.c
index 6722200..7e7515a 100644
--- a/MP/code/renderer/tr_shader.c
+++ b/MP/code/renderer/tr_shader.c
@@ -1442,7 +1442,7 @@ static qboolean ParseShader( char **text ) {
 			continue;
 		}
 		// sun parms
-		else if ( !Q_stricmp( token, "q3map_sun" ) ) {
+		else if ( !Q_stricmp( token, "q3map_sun" ) || !Q_stricmp( token, "q3map_sunExt" ) ) {
 			float a, b;
 
 			token = COM_ParseExt( text, qfalse );
@@ -1469,6 +1469,9 @@ static qboolean ParseShader( char **text ) {
 			tr.sunDirection[0] = cos( a ) * cos( b );
 			tr.sunDirection[1] = sin( a ) * cos( b );
 			tr.sunDirection[2] = sin( b );
+
+			SkipRestOfLine( text );
+			continue;
 		} else if ( !Q_stricmp( token, "deformVertexes" ) )    {
 			ParseDeform( text );
 			continue;
diff --git a/SP/code/renderer/tr_shader.c b/SP/code/renderer/tr_shader.c
index 9ee80fb..baffcdc 100644
--- a/SP/code/renderer/tr_shader.c
+++ b/SP/code/renderer/tr_shader.c
@@ -1442,7 +1442,7 @@ static qboolean ParseShader( char **text ) {
 			continue;
 		}
 		// sun parms
-		else if ( !Q_stricmp( token, "q3map_sun" ) ) {
+		else if ( !Q_stricmp( token, "q3map_sun" ) || !Q_stricmp( token, "q3map_sunExt" ) ) {
 			float a, b;
 
 			token = COM_ParseExt( text, qfalse );
@@ -1469,6 +1469,9 @@ static qboolean ParseShader( char **text ) {
 			tr.sunDirection[0] = cos( a ) * cos( b );
 			tr.sunDirection[1] = sin( a ) * cos( b );
 			tr.sunDirection[2] = sin( b );
+
+			SkipRestOfLine( text );
+			continue;
 		} else if ( !Q_stricmp( token, "deformVertexes" ) )    {
 			ParseDeform( text );
 			continue;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git