summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2006-01-18 19:43:35 +0000
committerTim Angus <tim@ngus.net>2006-01-18 19:43:35 +0000
commit18c97ea6537f96dbb12562d7aa80d2d74f52ddbc (patch)
tree2e8450ef4e8e2d344e99c65cc1ab782c4e988b14
parentb5a24aab3dbb3d65950843c19ab2fa9934064281 (diff)
* Changed order of build errors
-rw-r--r--src/game/g_buildable.c8
1 files changed, 4 insertions, 4 deletions
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;
}