# HG changeset patch # User sheepluva # Date 1461868133 -7200 # Node ID 54a1ac4123cd206cddbc7046a79650c6b509e437 # Parent 660599c04bd8219c8c1157f9cd7fbb09e54bb48f# Parent 59e979b1408f9a387f22c4d4d87b00d3641d7ec0 merging Wuzzy's empty weaponset for "new" button in weaponset editor diff -r 660599c04bd8 -r 54a1ac4123cd QTfrontend/hwconsts.cpp.in --- a/QTfrontend/hwconsts.cpp.in Thu Apr 28 20:07:10 2016 +0200 +++ b/QTfrontend/hwconsts.cpp.in Thu Apr 28 20:28:53 2016 +0200 @@ -41,6 +41,8 @@ QString * cDefaultAmmoStore = new QString( AMMOLINE_DEFAULT_QT AMMOLINE_DEFAULT_PROB AMMOLINE_DEFAULT_DELAY AMMOLINE_DEFAULT_CRATE ); +QString * cEmptyAmmoStore = new QString( AMMOLINE_EMPTY_QT AMMOLINE_EMPTY_PROB + AMMOLINE_EMPTY_DELAY AMMOLINE_EMPTY_CRATE ); int cAmmoNumber = cDefaultAmmoStore->size() / 4; QList< QPair > cDefaultAmmos = diff -r 660599c04bd8 -r 54a1ac4123cd QTfrontend/hwconsts.h --- a/QTfrontend/hwconsts.h Thu Apr 28 20:07:10 2016 +0200 +++ b/QTfrontend/hwconsts.h Thu Apr 28 20:28:53 2016 +0200 @@ -42,6 +42,7 @@ class QStandardItemModel; extern QString * cDefaultAmmoStore; +extern QString * cEmptyAmmoStore; extern int cAmmoNumber; extern QList< QPair > cDefaultAmmos; diff -r 660599c04bd8 -r 54a1ac4123cd QTfrontend/ui/widget/selectWeapon.cpp --- a/QTfrontend/ui/widget/selectWeapon.cpp Thu Apr 28 20:07:10 2016 +0200 +++ b/QTfrontend/ui/widget/selectWeapon.cpp Thu Apr 28 20:28:53 2016 +0200 @@ -308,7 +308,7 @@ } else { - setWeapons(*cDefaultAmmoStore); + setWeapons(*cEmptyAmmoStore); } } diff -r 660599c04bd8 -r 54a1ac4123cd QTfrontend/weapons.h --- a/QTfrontend/weapons.h Thu Apr 28 20:07:10 2016 +0200 +++ b/QTfrontend/weapons.h Thu Apr 28 20:28:53 2016 +0200 @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#define AMMOLINE_EMPTY_QT "000000900000000000000000000000000000000000000000000000000" +#define AMMOLINE_EMPTY_PROB "000000000000000000000000000000000000000000000000000000000" +#define AMMOLINE_EMPTY_DELAY "000000000000000000000000000000000000000000000000000000000" +#define AMMOLINE_EMPTY_CRATE "131111031211111112311411111111111111121111111111111111111" /* AmmoType lookup table (use monospace font / cursor movements)