Flamer gun model #455

build/macosx/install-sdl2.sh

@@ -57,7 +57,7 @@ if [[ -d "$OSX_SDL2_PATH_FULL"  ]]; then
   then
     echo "SDL2 exists. Skip building..."
   else
-    echo "SDL2 dir exists buit it is empty..."
+    echo "SDL2 dir exists but it is empty..."
     getSdl2
   fi
 else

data/guns.json

@@ -81,7 +81,7 @@
     },
     {
       "Index": 3,
-      "Pic": "rifle",
+      "Pic": "flamer",
       "Grips": 2,
       "Name": "Flamer",
       "Icon": "flamer",

dogfights/temple_of_carnage.cdogscpn/guns.json

@@ -39,6 +39,8 @@
       "Ammo": "Dynamite"
     },
     {
+      "Pic": "flamer",
+      "Grips": 2,
       "Name": "BBQ Incinerator",
       "Icon": "flamer",
       "Bullet": "bbq1",
@@ -54,6 +56,7 @@
       "Ammo": "Cells"
     },
     {
+      "Pic": "chaingun",
       "Name": "Flesh Mower",
       "Icon": "machine_gun",
       "Bullet": "gmg",

graphics/flamer.txt

@@ -1,4 +1,4 @@
-Adapted from 141 Military Icons Set by AngryMeteor.com
-http://opengameart.org/content/141-military-icons-set
+Adapted from 140 Military Icons Set (fixed) by AngryMeteor.com
+https://opengameart.org/content/140-military-icons-set-fixed
 
 http://creativecommons.org/licenses/by/3.0/

src/menu_utils.c

@@ -73,7 +73,7 @@ void MenuDisplayPlayer(
 		strcpy(s, pData->name);
 	}
 	const WeaponClass *gun = NULL;
-	if (d->GunIdx >= 0)
+	if (d->GunIdx >= 0 && d->GunIdx < MAX_WEAPONS)
 	{
 		gun = pData->guns[d->GunIdx];
 	}