From 25c786294107d95d278936e5b262c09e910359c5 Mon Sep 17 00:00:00 2001
From: Ben Millwood <thebenmachine@gmail.com>
Date: Sat, 3 Oct 2009 11:49:31 +0000
Subject:  * Adjust the error text for no BP based on markdeconstruct  *
 Re-order some buy messages to be more useful

---
 src/game/g_cmds.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/game')

diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 61f39b76..5c1d1356 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -2095,20 +2095,6 @@ void Cmd_Buy_f( gentity_t *ent )
       return;
     }
 
-    //can afford this?
-    if( BG_Weapon( weapon )->price > (short)ent->client->ps.persistant[ PERS_CREDIT ] )
-    {
-      G_TriggerMenu( ent->client->ps.clientNum, MN_H_NOFUNDS );
-      return;
-    }
-
-    //have space to carry this?
-    if( BG_Weapon( weapon )->slots & ent->client->ps.stats[ STAT_SLOTS ] )
-    {
-      G_TriggerMenu( ent->client->ps.clientNum, MN_H_NOSLOTS );
-      return;
-    }
-
     // Only humans can buy stuff
     if( BG_Weapon( weapon )->team != TEAM_HUMANS )
     {
@@ -2129,7 +2115,21 @@ void Cmd_Buy_f( gentity_t *ent )
       trap_SendServerCommand( ent-g_entities, "print \"You can't buy this item\n\"" );
       return;
     }
-    
+
+    //can afford this?
+    if( BG_Weapon( weapon )->price > (short)ent->client->ps.persistant[ PERS_CREDIT ] )
+    {
+      G_TriggerMenu( ent->client->ps.clientNum, MN_H_NOFUNDS );
+      return;
+    }
+
+    //have space to carry this?
+    if( BG_Weapon( weapon )->slots & ent->client->ps.stats[ STAT_SLOTS ] )
+    {
+      G_TriggerMenu( ent->client->ps.clientNum, MN_H_NOSLOTS );
+      return;
+    }
+
     // In some instances, weapons can't be changed
     if( !BG_PlayerCanChangeWeapon( &ent->client->ps ) )
       return;
-- 
cgit