Fix prox mine not dropped at feet (fixes #812)

cxong · Aug 7, 2023 · 92cbaa2 · 92cbaa2
1 parent c5c4a94
commit 92cbaa2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/cdogs/draw/draw_buffer.c b/src/cdogs/draw/draw_buffer.c
@@ -150,7 +150,7 @@ static int CompareY(const void *v1, const void *v2)
 	{
 		return -1;
 	}
-	else if ((*t1)->Pos.y >(*t2)->Pos.y)
+	else if ((*t1)->Pos.y > (*t2)->Pos.y)
 	{
 		return 1;
 	}

diff --git a/src/cdogs/weapon_class.c b/src/cdogs/weapon_class.c
@@ -296,11 +296,10 @@ static void LoadWeaponClass(WeaponClass *wc, json_t *node, const int version)
 		LoadFloat(&wc->u.Normal.Spread.Width, node, "SpreadWidth");
 		LoadFloat(&wc->u.Normal.AngleOffset, node, "AngleOffset");
 
-		int muzzleHeight = 0;
-		LoadInt(&muzzleHeight, node, "MuzzleHeight");
-		if (muzzleHeight)
+		if (json_find_first_label(node, "MuzzleHeight"))
 		{
-			wc->u.Normal.MuzzleHeight = muzzleHeight * Z_FACTOR;
+			LoadInt(&wc->u.Normal.MuzzleHeight, node, "MuzzleHeight");
+			wc->u.Normal.MuzzleHeight *= Z_FACTOR;
 		}
 		if (json_find_first_label(node, "Elevation"))
 		{