From 18c97ea6537f96dbb12562d7aa80d2d74f52ddbc Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Wed, 18 Jan 2006 19:43:35 +0000
Subject: * Changed order of build errors

---
 src/game/g_buildable.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/game')

diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c
index 5c0df82b..20b84f5e 100644
--- a/src/game/g_buildable.c
+++ b/src/game/g_buildable.c
@@ -2455,10 +2455,6 @@ itemBuildError_t G_itemFits( gentity_t *ent, buildable_t buildable, int distance
 
   VectorCopy( entity_origin, origin );
 
-  //this item does not fit here
-  if( tr2.fraction < 1.0 || tr3.fraction < 1.0 )
-    return IBE_NOROOM; //NO other reason is allowed to override this
-
   VectorCopy( tr1.plane.normal, normal );
   minNormal = BG_FindMinNormalForBuildable( buildable );
   invert = BG_FindInvertNormalForBuildable( buildable );
@@ -2625,6 +2621,10 @@ itemBuildError_t G_itemFits( gentity_t *ent, buildable_t buildable, int distance
       reason = IBE_NOPOWER;
   }
 
+  //this item does not fit here
+  if( reason == IBE_NONE && ( tr2.fraction < 1.0 || tr3.fraction < 1.0 ) )
+    return IBE_NOROOM;
+
   return reason;
 }
 
-- 
cgit