@@ -42,7 +42,7 @@
  * @param craft ID of the selected craft.
  * @param weapon ID of the selected weapon.
  */
-CraftWeaponsState::CraftWeaponsState(Game *game, Base *base, unsigned int craft, unsigned int weapon) : State(game), _base(base), _craft(craft), _weapon(weapon)
+CraftWeaponsState::CraftWeaponsState(Game *game, Base *base, unsigned int craft, unsigned int weapon) : State(game), _base(base), _craft(craft), _weapon(weapon), _weapons()
 {
 	_screen = false;
 
@@ -109,14 +109,15 @@ CraftWeaponsState::CraftWeaponsState(Game *game, Base *base, unsigned int craft,
 
 	for (std::vector<RuleCraftWeapon*>::iterator i = _weapons.begin(); i != _weapons.end(); i++)
 	{
-		RuleCraftWeapon *w = _game->getRuleset()->getCraftWeapon((*i)->getType());
-		if ((*_base->getItems())[w->getLauncherItem()]->getQuantity() > 0)
+		if (*i == 0)
+			continue;
+
+		if ((*_base->getItems())[(*i)->getLauncherItem()]->getQuantity() > 0)
 		{
 			std::stringstream ss, ss2;
-			ss << (*_base->getItems())[w->getLauncherItem()]->getQuantity();
-			ss2 << (*_base->getItems())[w->getClipItem()]->getQuantity();
+			ss << (*_base->getItems())[(*i)->getLauncherItem()]->getQuantity();
+			ss2 << (*_base->getItems())[(*i)->getClipItem()]->getQuantity();
 			_lstWeapons->addRow(3, _game->getResourcePack()->getLanguage()->getString((*i)->getType()).c_str(), ss.str().c_str(), ss2.str().c_str());
-			_weapons.push_back(w);
 		}
 	}
 	_lstWeapons->onMouseClick((ActionHandler)&CraftWeaponsState::lstWeaponsClick);
 
@@ -95,8 +95,6 @@ XcomResourcePack::XcomResourcePack(const std::string &folder) : ResourcePack(fol
 		_languages[lang[i]]->loadLng(insensitive(s.str()));
 	}
 
-	_currentLang = _languages["ENGLISH.LNG"];
-
 	// Load surfaces
 	std::string dats[] = {"LANG1.DAT",
 					 "LANG2.DAT"};
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`* @param craft ID of the selected craft.`
`43`	`43`	`* @param weapon ID of the selected weapon.`
`44`	`44`	`*/`
`45`		`-CraftWeaponsState::CraftWeaponsState(Game game, Base base, unsigned int craft, unsigned int weapon) : State(game), _base(base), _craft(craft), _weapon(weapon)`
	`45`	`+CraftWeaponsState::CraftWeaponsState(Game game, Base base, unsigned int craft, unsigned int weapon) : State(game), _base(base), _craft(craft), _weapon(weapon), _weapons()`
`46`	`46`	`{`
`47`	`47`	`_screen = false;`
`48`	`48`
`@@ -109,14 +109,15 @@ CraftWeaponsState::CraftWeaponsState(Game game, Base base, unsigned int craft,`
`109`	`109`
`110`	`110`	`for (std::vector<RuleCraftWeapon*>::iterator i = _weapons.begin(); i != _weapons.end(); i++)`
`111`	`111`	`{`
`112`		`- RuleCraftWeapon w = _game->getRuleset()->getCraftWeapon((i)->getType());`
`113`		`- if ((*_base->getItems())[w->getLauncherItem()]->getQuantity() > 0)`
	`112`	`+ if (*i == 0)`
	`113`	`+ continue;`
	`114`	`+`
	`115`	`+ if ((_base->getItems())[(i)->getLauncherItem()]->getQuantity() > 0)`
`114`	`116`	`{`
`115`	`117`	`std::stringstream ss, ss2;`
`116`		`- ss << (*_base->getItems())[w->getLauncherItem()]->getQuantity();`
`117`		`- ss2 << (*_base->getItems())[w->getClipItem()]->getQuantity();`
	`118`	`+ ss << (_base->getItems())[(i)->getLauncherItem()]->getQuantity();`
	`119`	`+ ss2 << (_base->getItems())[(i)->getClipItem()]->getQuantity();`
`118`	`120`	`_lstWeapons->addRow(3, _game->getResourcePack()->getLanguage()->getString((*i)->getType()).c_str(), ss.str().c_str(), ss2.str().c_str());`
`119`		`- _weapons.push_back(w);`
`120`	`121`	`}`
`121`	`122`	`}`
`122`	`123`	`_lstWeapons->onMouseClick((ActionHandler)&CraftWeaponsState::lstWeaponsClick);`
Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,6 @@ XcomResourcePack::XcomResourcePack(const std::string &folder) : ResourcePack(fol`
`95`	`95`	`_languages[lang[i]]->loadLng(insensitive(s.str()));`
`96`	`96`	`}`
`97`	`97`
`98`		`- _currentLang = _languages["ENGLISH.LNG"];`
`99`		`-`
`100`	`98`	`// Load surfaces`
`101`	`99`	`std::string dats[] = {"LANG1.DAT",`
`102`	`100`	`"LANG2.DAT"};`