From 74f2de1044632348fbb40a759e00d06f28c262a6 Mon Sep 17 00:00:00 2001 From: MaeJong Date: Tue, 23 May 2017 09:32:15 +0200 Subject: Fix bug that disallows buying Ckit Inverted ckit and ackit entries in bg_weapons enum --- src/game/bg_misc.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c index 3faef8f..0bfc188 100644 --- a/src/game/bg_misc.c +++ b/src/game/bg_misc.c @@ -2545,18 +2545,18 @@ weaponAttributes_t bg_weapons[ ] = WUT_ALIENS //WUTeam_t team; }, { - WP_HBUILD, //int weaponNum; - HBUILD_PRICE, //int price; - ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages + WP_HBUILD2, //int weaponNum; + HBUILD2_PRICE, //int price; + ( 1 << S2 )|( 1 << S3 ), //int stages SLOT_WEAPON, //int slots; - "ckit", //char *weaponName; - "Construction Kit", //char *weaponHumanName; + "ackit", //char *weaponName; + "Adv Construction Kit",//char *weaponHumanName; 0, //int maxAmmo; 0, //int maxClips; qtrue, //int infiniteAmmo; qfalse, //int usesEnergy; - HBUILD_REPEAT, //int repeatRate1; - HBUILD_REPEAT, //int repeatRate2; + HBUILD2_REPEAT, //int repeatRate1; + HBUILD2_REPEAT, //int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; 0.0f, //float knockbackScale; @@ -2566,22 +2566,22 @@ weaponAttributes_t bg_weapons[ ] = 90.0f, //float zoomFov; qtrue, //qboolean purchasable; qfalse, //qboolean longRanged; - HBUILD_DELAY, //int buildDelay; + HBUILD2_DELAY, //int buildDelay; WUT_HUMANS //WUTeam_t team; }, { - WP_HBUILD2, //int weaponNum; - HBUILD2_PRICE, //int price; - ( 1 << S2 )|( 1 << S3 ), //int stages + WP_HBUILD, //int weaponNum; + HBUILD_PRICE, //int price; + ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages SLOT_WEAPON, //int slots; - "ackit", //char *weaponName; - "Adv Construction Kit",//char *weaponHumanName; + "ckit", //char *weaponName; + "Construction Kit", //char *weaponHumanName; 0, //int maxAmmo; 0, //int maxClips; qtrue, //int infiniteAmmo; qfalse, //int usesEnergy; - HBUILD2_REPEAT, //int repeatRate1; - HBUILD2_REPEAT, //int repeatRate2; + HBUILD_REPEAT, //int repeatRate1; + HBUILD_REPEAT, //int repeatRate2; 0, //int repeatRate3; 0, //int reloadTime; 0.0f, //float knockbackScale; @@ -2591,7 +2591,7 @@ weaponAttributes_t bg_weapons[ ] = 90.0f, //float zoomFov; qtrue, //qboolean purchasable; qfalse, //qboolean longRanged; - HBUILD2_DELAY, //int buildDelay; + HBUILD_DELAY, //int buildDelay; WUT_HUMANS //WUTeam_t team; } }; -- cgit