[iortcw] 304/497: All: Set bsp_trace_t::surface.flags to surfaceFlags in server and game

[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 f2ed666b7d9ca35b12049c6cf82ec54962943953
Author: M4N4T4RMS at gmail.com <M4N4T4RMS at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Wed Feb 18 22:53:26 2015 +0000

    All: Set bsp_trace_t::surface.flags to surfaceFlags in server and game
---
 MP/code/botlib/be_aas_reach.c | 2 +-
 MP/code/game/ai_main.c        | 3 ++-
 MP/code/server/sv_bot.c       | 7 ++++---
 SP/code/botlib/be_aas_reach.c | 2 +-
 SP/code/game/ai_main.c        | 3 ++-
 SP/code/server/sv_bot.c       | 6 ++++--
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/MP/code/botlib/be_aas_reach.c b/MP/code/botlib/be_aas_reach.c
index d3731a7..0f209c5 100644
--- a/MP/code/botlib/be_aas_reach.c
+++ b/MP/code/botlib/be_aas_reach.c
@@ -3756,7 +3756,7 @@ int AAS_Reachability_Grapple( int area1num, int area2num ) {
 		//
 		bsptrace = AAS_Trace( start, NULL, NULL, end, 0, CONTENTS_SOLID );
 		//the grapple won't stick to the sky and the grapple point should be near the AAS wall
-		if ( ( bsptrace.surface.value & SURF_SKY ) || ( bsptrace.fraction * 500 > 32 ) ) {
+		if ( ( bsptrace.surface.flags & SURF_SKY ) || ( bsptrace.fraction * 500 > 32 ) ) {
 			continue;
 		}
 		//trace a full bounding box from the area center on the ground to
diff --git a/MP/code/game/ai_main.c b/MP/code/game/ai_main.c
index 433a03b..3e17a5a 100644
--- a/MP/code/game/ai_main.c
+++ b/MP/code/game/ai_main.c
@@ -132,7 +132,8 @@ void BotAI_Trace( bsp_trace_t *bsptrace, vec3_t start, vec3_t mins, vec3_t maxs,
 	VectorCopy( trace.plane.normal, bsptrace->plane.normal );
 	bsptrace->plane.signbits = trace.plane.signbits;
 	bsptrace->plane.type = trace.plane.type;
-	bsptrace->surface.value = trace.surfaceFlags;
+	bsptrace->surface.value = 0;
+	bsptrace->surface.flags = trace.surfaceFlags;
 	bsptrace->ent = trace.entityNum;
 	bsptrace->exp_dist = 0;
 	bsptrace->sidenum = 0;
diff --git a/MP/code/server/sv_bot.c b/MP/code/server/sv_bot.c
index d6933e5..0748ed0 100644
--- a/MP/code/server/sv_bot.c
+++ b/MP/code/server/sv_bot.c
@@ -226,8 +226,8 @@ static void BotImport_Trace(bsp_trace_t *bsptrace, vec3_t start, vec3_t mins, ve
 	VectorCopy( trace.plane.normal, bsptrace->plane.normal );
 	bsptrace->plane.signbits = trace.plane.signbits;
 	bsptrace->plane.type = trace.plane.type;
-	bsptrace->surface.value = trace.surfaceFlags;
-	bsptrace->ent = trace.entityNum;
+	bsptrace->surface.value = 0;
+	bsptrace->surface.flags = trace.surfaceFlags;
 	bsptrace->exp_dist = 0;
 	bsptrace->sidenum = 0;
 	bsptrace->contents = 0;
@@ -252,7 +252,8 @@ static void BotImport_EntityTrace(bsp_trace_t *bsptrace, vec3_t start, vec3_t mi
 	VectorCopy( trace.plane.normal, bsptrace->plane.normal );
 	bsptrace->plane.signbits = trace.plane.signbits;
 	bsptrace->plane.type = trace.plane.type;
-	bsptrace->surface.value = trace.surfaceFlags;
+	bsptrace->surface.value = 0;
+	bsptrace->surface.flags = trace.surfaceFlags;
 	bsptrace->ent = trace.entityNum;
 	bsptrace->exp_dist = 0;
 	bsptrace->sidenum = 0;
diff --git a/SP/code/botlib/be_aas_reach.c b/SP/code/botlib/be_aas_reach.c
index 8bbf131..00dab5b 100644
--- a/SP/code/botlib/be_aas_reach.c
+++ b/SP/code/botlib/be_aas_reach.c
@@ -3761,7 +3761,7 @@ int AAS_Reachability_Grapple( int area1num, int area2num ) {
 		//
 		bsptrace = AAS_Trace( start, NULL, NULL, end, 0, CONTENTS_SOLID );
 		//the grapple won't stick to the sky and the grapple point should be near the AAS wall
-		if ( ( bsptrace.surface.value & SURF_SKY ) || ( bsptrace.fraction * 500 > 32 ) ) {
+		if ( ( bsptrace.surface.flags & SURF_SKY ) || ( bsptrace.fraction * 500 > 32 ) ) {
 			continue;
 		}
 		//trace a full bounding box from the area center on the ground to
diff --git a/SP/code/game/ai_main.c b/SP/code/game/ai_main.c
index 4a54d03..0299bdd 100644
--- a/SP/code/game/ai_main.c
+++ b/SP/code/game/ai_main.c
@@ -132,7 +132,8 @@ void BotAI_Trace( bsp_trace_t *bsptrace, vec3_t start, vec3_t mins, vec3_t maxs,
 	VectorCopy( trace.plane.normal, bsptrace->plane.normal );
 	bsptrace->plane.signbits = trace.plane.signbits;
 	bsptrace->plane.type = trace.plane.type;
-	bsptrace->surface.value = trace.surfaceFlags;
+	bsptrace->surface.value = 0;
+	bsptrace->surface.flags = trace.surfaceFlags;
 	bsptrace->ent = trace.entityNum;
 	bsptrace->exp_dist = 0;
 	bsptrace->sidenum = 0;
diff --git a/SP/code/server/sv_bot.c b/SP/code/server/sv_bot.c
index e2b138c..a552b7a 100644
--- a/SP/code/server/sv_bot.c
+++ b/SP/code/server/sv_bot.c
@@ -228,7 +228,8 @@ static void BotImport_Trace(bsp_trace_t *bsptrace, vec3_t start, vec3_t mins, ve
 	VectorCopy( trace.plane.normal, bsptrace->plane.normal );
 	bsptrace->plane.signbits = trace.plane.signbits;
 	bsptrace->plane.type = trace.plane.type;
-	bsptrace->surface.value = trace.surfaceFlags;
+	bsptrace->surface.value = 0;
+	bsptrace->surface.flags = trace.surfaceFlags;
 	bsptrace->ent = trace.entityNum;
 	bsptrace->exp_dist = 0;
 	bsptrace->sidenum = 0;
@@ -254,7 +255,8 @@ static void BotImport_EntityTrace(bsp_trace_t *bsptrace, vec3_t start, vec3_t mi
 	VectorCopy( trace.plane.normal, bsptrace->plane.normal );
 	bsptrace->plane.signbits = trace.plane.signbits;
 	bsptrace->plane.type = trace.plane.type;
-	bsptrace->surface.value = trace.surfaceFlags;
+	bsptrace->surface.value = 0;
+	bsptrace->surface.flags = trace.surfaceFlags;
 	bsptrace->ent = trace.entityNum;
 	bsptrace->exp_dist = 0;
 	bsptrace->sidenum = 0;

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