@@ -703,15 +703,15 @@ void ProjectileFlyBState::performMeleeAttack()
 	_unit->setCache(0);
 	_parent->getMap()->cacheUnit(_unit);
 	// and we have a lift-off
-	if (_ammo->getRules()->getMeleeAttackSound() != -1)
+	if (_ammo && _ammo->getRules()->getMeleeAttackSound() != -1)
 	{
 		_parent->getResourcePack()->getSound("BATTLE.CAT", _ammo->getRules()->getMeleeAttackSound())->play();
 	}
 	else if (_action.weapon->getRules()->getMeleeAttackSound() != -1)
 	{
 		_parent->getResourcePack()->getSound("BATTLE.CAT", _action.weapon->getRules()->getMeleeAttackSound())->play();
 	}
-	if (!_parent->getSave()->getDebugMode() && _action.type != BA_LAUNCH && _ammo->spendBullet() == false)
+	if (!_parent->getSave()->getDebugMode() && _action.weapon->getRules()->getBattleType() == BT_MELEE && _ammo && _ammo->spendBullet() == false)
 	{
 		_parent->getSave()->removeItem(_ammo);
 		_action.weapon->setAmmoItem(0);
 
@@ -541,6 +541,7 @@ std::vector<std::string> getFolderContents(const std::string &path, const std::s
 		files.push_back(file);
 	}
 	closedir(dp);
+	std::sort(files.begin(), files.end());
 	return files;
 }
Original file line number	Diff line number	Diff line change
`@@ -703,15 +703,15 @@ void ProjectileFlyBState::performMeleeAttack()`
`703`	`703`	`_unit->setCache(0);`
`704`	`704`	`_parent->getMap()->cacheUnit(_unit);`
`705`	`705`	`// and we have a lift-off`
`706`		`- if (_ammo->getRules()->getMeleeAttackSound() != -1)`
	`706`	`+ if (_ammo && _ammo->getRules()->getMeleeAttackSound() != -1)`
`707`	`707`	`{`
`708`	`708`	`_parent->getResourcePack()->getSound("BATTLE.CAT", _ammo->getRules()->getMeleeAttackSound())->play();`
`709`	`709`	`}`
`710`	`710`	`else if (_action.weapon->getRules()->getMeleeAttackSound() != -1)`
`711`	`711`	`{`
`712`	`712`	`_parent->getResourcePack()->getSound("BATTLE.CAT", _action.weapon->getRules()->getMeleeAttackSound())->play();`
`713`	`713`	`}`
`714`		`- if (!_parent->getSave()->getDebugMode() && _action.type != BA_LAUNCH && _ammo->spendBullet() == false)`
	`714`	`+ if (!_parent->getSave()->getDebugMode() && _action.weapon->getRules()->getBattleType() == BT_MELEE && _ammo && _ammo->spendBullet() == false)`
`715`	`715`	`{`
`716`	`716`	`_parent->getSave()->removeItem(_ammo);`
`717`	`717`	`_action.weapon->setAmmoItem(0);`
Original file line number	Diff line number	Diff line change
`@@ -541,6 +541,7 @@ std::vector<std::string> getFolderContents(const std::string &path, const std::s`
`541`	`541`	`files.push_back(file);`
`542`	`542`	`}`
`543`	`543`	`closedir(dp);`
	`544`	`+ std::sort(files.begin(), files.end());`
`544`	`545`	`return files;`
`545`	`546`	`}`
`546`	`547`