Put the teargas canister's check in the right place.

XanderV · Nov 27, 2013 · 3be4349 · 3be4349
1 parent 5cf5422
commit 3be4349
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/iuse.cpp b/src/iuse.cpp
@@ -3840,9 +3840,6 @@ int iuse::gasbomb_act(player *p, item *it, bool t)
  if (t) {
   if (it->charges > 15) {
    g->sound(pos.x, pos.y, 0, _("Tick.")); // Vol 0 = only heard if you hold it
-  } else if(it->charges > 0) {
-   g->add_msg(_("You've already pulled the %s's pin, try throwing it instead."), it->name.c_str());
-   return 0;
   } else {
    int junk;
    for (int i = -2; i <= 2; i++) {
@@ -3853,6 +3850,9 @@ int iuse::gasbomb_act(player *p, item *it, bool t)
     }
    }
   }
+ } else if(it->charges > 0) {
+  g->add_msg(_("You've already pulled the %s's pin, try throwing it instead."), it->name.c_str());
+  return 0;
  } else {
   it->make(itypes["canister_empty"]);
  }