[iortcw] 217/497: All: A little whitespace cleanup

[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 d9f6cd5a14818d04c214cdb862cc1e49ee1290be
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Sun Sep 14 13:06:39 2014 +0000

    All: A little whitespace cleanup
---
 MP/code/cgame/cg_weapons.c   | 7 ++-----
 SP/code/cgame/cg_weapons.c   | 7 ++-----
 SP/code/renderer/tr_shader.c | 2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/MP/code/cgame/cg_weapons.c b/MP/code/cgame/cg_weapons.c
index 5c4ca66..9f52f3c 100644
--- a/MP/code/cgame/cg_weapons.c
+++ b/MP/code/cgame/cg_weapons.c
@@ -1158,14 +1158,11 @@ void CG_RegisterWeapon( int weaponNum ) {
 
 	if ( item->world_model[W_FP_MODEL] ) {
 		strcpy( comppath, item->world_model[W_FP_MODEL] );  // first try the fp view weap
-	} else if ( item->world_model[W_TP_MODEL] )                                                                {
+	} else if ( item->world_model[W_TP_MODEL] ) {
 		strcpy( comppath, item->world_model[W_TP_MODEL] );  // not there, use the standard view hand
-
 	}
-	if ( ( !cg_drawFPGun.integer ) &&     // then if it didn't find the 1st person one or you are set to not use one
-		 item->world_model[W_TP_MODEL] ) {
+	if ( !cg_drawFPGun.integer && item->world_model[W_TP_MODEL] ) { // then if it didn't find the 1st person one or you are set to not use one
 		strcpy( comppath, item->world_model[W_TP_MODEL] );  // use the standard view hand
-
 	}
 	for ( i = W_TP_MODEL; i < W_NUM_TYPES; i++ )
 	{
diff --git a/SP/code/cgame/cg_weapons.c b/SP/code/cgame/cg_weapons.c
index 5096b4d..1ed511a 100644
--- a/SP/code/cgame/cg_weapons.c
+++ b/SP/code/cgame/cg_weapons.c
@@ -1113,14 +1113,11 @@ void CG_RegisterWeapon( int weaponNum ) {
 
 	if ( item->world_model[W_FP_MODEL] ) {
 		strcpy( comppath, item->world_model[W_FP_MODEL] );  // first try the fp view weap
-	} else if ( item->world_model[W_TP_MODEL] )                                                                {
+	} else if ( item->world_model[W_TP_MODEL] ) {
 		strcpy( comppath, item->world_model[W_TP_MODEL] );  // not there, use the standard view hand
-
 	}
-	if ( ( !cg_drawFPGun.integer ) &&     // then if it didn't find the 1st person one or you are set to not use one
-		 item->world_model[W_TP_MODEL] ) {
+	if ( !cg_drawFPGun.integer && item->world_model[W_TP_MODEL] ) { // then if it didn't find the 1st person one or you are set to not use one
 		strcpy( comppath, item->world_model[W_TP_MODEL] );  // use the standard view hand
-
 	}
 	for ( i = W_TP_MODEL; i < W_NUM_TYPES; i++ )
 	{
diff --git a/SP/code/renderer/tr_shader.c b/SP/code/renderer/tr_shader.c
index 0b79426..9073d23 100644
--- a/SP/code/renderer/tr_shader.c
+++ b/SP/code/renderer/tr_shader.c
@@ -3076,7 +3076,7 @@ a single large text block that can be scanned for shader names
 #define MAX_SHADER_FILES    4096
 static void ScanAndLoadShaderFiles( void ) {
 	char **shaderFiles;
-	char *buffers[MAX_SHADER_FILES] = {0};
+	char *buffers[MAX_SHADER_FILES] = {NULL};
 	char *p;
 	int numShaderFiles;
 	int i;

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