Merge pull request OpenXcom#1 from SupSuper/master

sync

Author: GixG

bin/data/Language/en-GB.yml

@@ -1113,6 +1113,7 @@ en-GB:
   STR_CENTER_ON_ENEMY_10: "Centre on Enemy 10"
   STR_CREATE_INVENTORY_TEMPLATE: "Create inventory template"
   STR_APPLY_INVENTORY_TEMPLATE: "Apply inventory template"
+  STR_CLEAR_INVENTORY: "Clear inventory"
   STR_GROUNDED: "GROUND"
   STR_LIVING_QUARTERS_PLURAL: "Living Quarters"
   STR_LIST_ITEM: "ITEM"

bin/data/Language/en-US.yml

@@ -1113,6 +1113,7 @@ en-US:
   STR_CENTER_ON_ENEMY_10: "Center on Enemy 10"
   STR_CREATE_INVENTORY_TEMPLATE: "Create inventory template"
   STR_APPLY_INVENTORY_TEMPLATE: "Apply inventory template"
+  STR_CLEAR_INVENTORY: "Clear inventory"
   STR_GROUNDED: "GROUND"
   STR_LIVING_QUARTERS_PLURAL: "Living Quarters"
   STR_LIST_ITEM: "ITEM"

bin/data/Resources/UI/invcopy.png

@@ -208,10 +208,16 @@ void ManufactureState::fillProductionList()
 		else if ((*iter)->getAssignedEngineers() > 0)
 		{
 			int timeLeft = (*iter)->getAmountTotal() * (*iter)->getRules()->getManufactureTime() - (*iter)->getTimeSpent();
-			timeLeft /= (*iter)->getAssignedEngineers();
-			float dayLeft = timeLeft / 24.0f;
-			int hours = (dayLeft - static_cast<int>(dayLeft)) * 24;
-			s4 << static_cast<int>(dayLeft) << "/" << hours;
+			int numEffectiveEngineers = (*iter)->getAssignedEngineers();
+			if (!Options::canManufactureMoreItemsPerHour)
+			{
+				numEffectiveEngineers = std::min(numEffectiveEngineers, (*iter)->getRules()->getManufactureTime());
+			}
+			// ensure we round up since it takes an entire hour to manufacture any part of that hour's capacity
+			int hoursLeft = (timeLeft + numEffectiveEngineers - 1) / numEffectiveEngineers;
+			int daysLeft = hoursLeft / 24;
+			int hours = hoursLeft % 24;
+			s4 << daysLeft << "/" << hours;
 		}
 		else
 		{

bin/data/Resources/UI/invcopy_active.png

@@ -78,7 +78,7 @@ void ResearchInfoState::buildUi()
 	_txtMore = new Text(110, 17, 85, 100);
 	_txtLess = new Text(110, 17, 85, 120);
 	_btnCancel = new TextButton(90, 16, 61, 145);
-	_btnOk = new TextButton(83, 16, 169, 145);
+	_btnOk = new TextButton(90, 16, 169, 145);
 
 	_btnMore = new ArrowButton(ARROW_BIG_UP, 13, 14, 195, 100);
 	_btnLess = new ArrowButton(ARROW_BIG_DOWN, 13, 14, 195, 120);

bin/data/Resources/UI/invpaste.png

@@ -473,7 +473,7 @@ void SoldierInfoState::init()
 	_barThrowing->setValue2(std::min(withArmor.throwing, initial->throwing));
 
 	std::wostringstream ss8;
-	ss8 << current->melee;
+	ss8 << withArmor.melee;
 	_numMelee->setText(ss8.str());
 	_barMelee->setMax(current->melee);
 	_barMelee->setValue(withArmor.melee);

bin/data/Resources/UI/invpaste_empty.png

@@ -757,13 +757,15 @@ void Inventory::mouseClick(Action *action, State *state)
 									{
 										_warning->showMessage(_game->getLanguage()->getString("STR_GRENADE_IS_ACTIVATED"));
 										item->setFuseTimer(0);
+										arrangeGround(false);
 									}
 									else _game->pushState(new PrimeGrenadeState(0, true, item));
 								}
 								else
 								{
 									_warning->showMessage(_game->getLanguage()->getString("STR_GRENADE_IS_DEACTIVATED"));
 									item->setFuseTimer(-1);  // Unprime the grenade
+									arrangeGround(false);
 								}
 							}
 						}