Fixed jDoom: "Using diffrent weapon ammo bug" (see here http://source…

…forge.net/tracker/index.php?func=detail&aid=1657409&group_id=74815&atid=542099).
skyjake · May 5, 2009 · d513bc6 · d513bc6
1 parent 2431524
commit d513bc6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 21 deletions.
diff --git a/doomsday/plugins/jdoom/src/d_items.c b/doomsday/plugins/jdoom/src/d_items.c
@@ -189,7 +189,6 @@ void P_InitWeaponInfo(void)
 
     int                 i;
     int                 pclass = PCLASS_PLAYER;
-    ammotype_t          k;
     char                buf[80];
     char*               data;
 
@@ -199,17 +198,15 @@ void P_InitWeaponInfo(void)
         sprintf(buf, WPINF "%i|Type", i);
         if(Def_Get(DD_DEF_VALUE, buf, &data))
         {
-            // Set the right types of ammo.
-            if(!stricmp(data, "noammo"))
-            {
-                for(k = 0; k < NUM_AMMO_TYPES; ++k)
-                {
-                    weaponInfo[i][pclass].mode[0].ammoType[k] = false;
-                    weaponInfo[i][pclass].mode[0].perShot[k] = 0;
-                }
-            }
-            else
+            memset(weaponInfo[i][pclass].mode[0].ammoType, 0,
+                   sizeof(int) * NUM_AMMO_TYPES);
+            memset(weaponInfo[i][pclass].mode[0].perShot, 0,
+                   sizeof(int) * NUM_AMMO_TYPES);
+
+            if(stricmp(data, "noammo"))
             {
+                ammotype_t          k;
+
                 for(k = 0; k < NUM_AMMO_TYPES; ++k)
                 {
                     if(!stricmp(data, ammoTypeNames[k]))

diff --git a/doomsday/plugins/jdoom64/src/d_items.c b/doomsday/plugins/jdoom64/src/d_items.c
@@ -213,17 +213,15 @@ void P_InitWeaponInfo(void)
         sprintf(buf, WPINF "%i|Type", i);
         if(Def_Get(DD_DEF_VALUE, buf, &data))
         {
-            // Set the right types of ammo.
-            if(!stricmp(data, "noammo"))
-            {
-                for(k = 0; k < NUM_AMMO_TYPES; ++k)
-                {
-                    weaponInfo[i][pclass].mode[0].ammoType[k] = false;
-                    weaponInfo[i][pclass].mode[0].perShot[k] = 0;
-                }
-            }
-            else
+            memset(weaponInfo[i][pclass].mode[0].ammoType, 0,
+                   sizeof(int) * NUM_AMMO_TYPES);
+            memset(weaponInfo[i][pclass].mode[0].perShot, 0,
+                   sizeof(int) * NUM_AMMO_TYPES);
+
+            if(stricmp(data, "noammo"))
             {
+                ammotype_t          k;
+
                 for(k = 0; k < NUM_AMMO_TYPES; ++k)
                 {
                     if(!stricmp(data, ammoTypeNames[k]))