Merge pull request Atlantis-PBEM#25 from snowgoon88/fix_edit_g

Fix edit region terrain and then g key
hdclearman · Jun 27, 2016 · 22af9a9 · 22af9a9
2 parents 5317f86 21cae84
commit 22af9a9
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/economy.cpp b/economy.cpp
@@ -280,6  280,12 @@ void ARegion::SetIncome()
 	int maxwages = (int) ((float) (pp * (Wages() - 10 * Globals->MAINTENANCE_COST) /50));
 	if (maxwages < 0) maxwages = 0;
 	Production * w = products.GetProd(I_SILVER,-1);
 	// In some cases (ie. after products.DeleteAll() in EditGameRegionTerrain)
 	// I_SILVER is not in ProductionList
 	if( !w ) {
 	  w = new Production;
 	  products.Add(w);
 	}
 	w->itemtype = I_SILVER;
 	w->amount = maxwages / Globals->WORK_FRACTION;
 	w->baseamount = maxwages / Globals->WORK_FRACTION;
@@ -296,6  302,12 @@ void ARegion::SetIncome()
 	int maxent = (int) ((float) (ep * ((Wages() - 10 * Globals->MAINTENANCE_COST)   10) /50));
 	if (maxent < 0) maxent = 0;
 	Production * e = products.GetProd(I_SILVER,S_ENTERTAINMENT);
 	// In some cases (ie. after products.DeleteAll() in EditGameRegionTerrain)
 	// I_SILVER is not in ProductionList
 	if( !e ) {
 	  e = new Production;
 	  products.Add(e);
 	}
 	e->itemtype = I_SILVER;
 	e->amount = maxent / Globals->ENTERTAIN_FRACTION;
 	e->baseamount = maxent / Globals->ENTERTAIN_FRACTION;