Merge lp:~greg1989/s25rttr/very-low-ressources into lp:~flosoft/s25rttr/trunk

[Greg]

[FloSoft (flosoft)]

Hi,

please clean up your files (you killed all german "umlauts" because of stupid eclipse utf-8 file handling)

I'm back in a few days, then I will merge your changes. I hope you can cleanup the patch until then

review: Needs Fixing

[FloSoft (flosoft)]

merged in rev6958 into nightly/trunk

review: Approve

=== added file '.project'
--- .project	1970-01-01 00:00:00 +0000
+++ .project	2010-12-31 12:24:58 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>s25rttr</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
 
=== modified file 'src/GlobalGameSettings.h'
--- src/GlobalGameSettings.h	2010-07-16 22:00:53 +0000
+++ src/GlobalGameSettings.h	2010-12-31 12:24:58 +0000
@@ -35,7 +35,7 @@
 public:
 	enum GameSpeed { GS_VERYSLOW = 0,GS_SLOW , GS_NORMAL, GS_FAST, GS_VERYFAST } game_speed;
 	enum GameObjective { GO_NONE = 0, GO_TOTALDOMINATION, GO_CONQUER3_4 } game_objective;
-	enum StartWares { SWR_LOW = 0, SWR_NORMAL, SWR_ALOT } start_wares;
+	enum StartWares {SWR_VLOW = 0, SWR_LOW, SWR_NORMAL, SWR_ALOT} start_wares;
 	bool lock_teams;
 	enum Exploration { EXP_DISABLED = 0, EXP_CLASSIC, EXP_FOGOFWAR, EXP_FOGOFWARE_EXPLORED } exploration;
 	bool team_view;
 
=== modified file 'src/dskHostGame.cpp'
--- src/dskHostGame.cpp	2010-07-16 22:00:53 +0000
+++ src/dskHostGame.cpp	2010-12-31 12:24:58 +0000
@@ -76,13 +76,13 @@
 
 	// Chatfenster
 	AddChatCtrl(1, 20, 310, 360, 218, TC_GREY, NormalFont);
-	// Edit für Chatfenster
+	// Edit f�r Chatfenster
 	AddEdit(4, 20, 530, 360, 22, TC_GREY, NormalFont);
 
 	// "Spiel starten"
 	AddTextButton(2, 600, 560, 180, 22, TC_GREEN2, (GAMECLIENT.IsHost() ? _("Start game") : _("Ready")), NormalFont);
 
-	// "Zurück"
+	// "Zur�ck"
 	AddTextButton(3, 400, 560, 180, 22, TC_RED1, _("Return"), NormalFont);
 
 	// "Teams sperren"
@@ -98,7 +98,7 @@
 
 	// umgedrehte Reihenfolge, damit die Listen nicht dahinter sind
 
-	// "Aufklärung"
+	// "Aufkl�rung"
 	AddText(30, 400, 405, _("Exploration:"), COLOR_YELLOW, 0, NormalFont);
 	combo = AddComboBox(40, 600, 400, 180, 20, TC_GREY, NormalFont, 100, !GAMECLIENT.IsHost()||GAMECLIENT.IsSavegame());
 	combo->AddString(_("Off (all visible)"));
@@ -109,10 +109,12 @@
 	// "Waren zu Beginn"
 	AddText(31, 400, 375, _("Goods at start:"), COLOR_YELLOW, 0, NormalFont);
 	combo = AddComboBox(41, 600, 370, 180, 20, TC_GREY, NormalFont, 100, !GAMECLIENT.IsHost()||GAMECLIENT.IsSavegame());
+	combo->AddString(_("Very Low"));
 	combo->AddString(_("Low"));
 	combo->AddString(_("Normal"));
 	combo->AddString(_("A lot"));
 
+
 	// "Spielziel"
 	AddText(32, 400, 345, _("Goals:"), COLOR_YELLOW, 0, NormalFont);
 	combo = AddComboBox(42, 600, 340, 180, 20, TC_GREY, NormalFont, 100, !GAMECLIENT.IsHost()||GAMECLIENT.IsSavegame());
@@ -140,7 +142,7 @@
 			glArchivItem_Map *map = static_cast<glArchivItem_Map*>(ai.get(0));
 			ctrlPreviewMinimap * preview = AddPreviewMinimap(70,560,40,220,220,map);
 
-			// Titel der Karte, Y-Position relativ je nach Höhe der Minimap festlegen, daher nochmals danach
+			// Titel der Karte, Y-Position relativ je nach H�he der Minimap festlegen, daher nochmals danach
 			// verschieben, da diese Position sonst skaliert wird!
 			ctrlText * text = AddText(71,670,0,_("Map: ") +  GameClient::inst().GetMapTitle(),COLOR_YELLOW,glArchivItem_Font::DF_CENTER,NormalFont);
 			text->Move(text->GetX(false),preview->GetY(false)+preview->GetBottom()+10);
@@ -165,14 +167,14 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 /**
- *  Größe ändern-Reaktionen die nicht vom Skaling-Mechanismus erfasst werden.
+ *  Gr��e �ndern-Reaktionen die nicht vom Skaling-Mechanismus erfasst werden.
  *
  *  @author Divan
  */
 void dskHostGame::Resize_(unsigned short width, unsigned short height)
 {
-	// Text unter der PreviewMinimap verschieben, dessen Höhe von der Höhe der 
-	// PreviewMinimap abhängt, welche sich gerade geändert hat.
+	// Text unter der PreviewMinimap verschieben, dessen H�he von der H�he der 
+	// PreviewMinimap abh�ngt, welche sich gerade ge�ndert hat.
 	ctrlPreviewMinimap *preview = GetCtrl<ctrlPreviewMinimap>(70);
 	ctrlText *text = GetCtrl<ctrlText>(71);
 	assert(preview);
@@ -194,7 +196,7 @@
 	unsigned cy = 80 + row * 30;
 	TextureColor tc = (row&1 ? TC_GREY : TC_GREEN2);
 
-	// Alle Controls erstmal zerstören (die ganze Gruppe)
+	// Alle Controls erstmal zerst�ren (die ganze Gruppe)
 	DeleteCtrl(58 - row);
 	// und neu erzeugen
 	ctrlGroup *group = AddGroup(58 - row, scale);
@@ -283,7 +285,7 @@
 		{
 			ctrlComboBox *combo = group->AddComboBox(8, 570, cy, 150, 22, tc, NormalFont, 150, !GAMECLIENT.IsHost());
 
-			// Mit den alten Namen füllen
+			// Mit den alten Namen f�llen
 			for(unsigned i = 0; i < GAMECLIENT.GetPlayerCount(); ++i)
 			{
 				if(GAMECLIENT.GetPlayer(i)->origin_name.length())
@@ -299,7 +301,7 @@
 		if(player->ps == PS_KI || player->is_host)
 			ping->SetVisible(false);
 
-		// Felder ausfüllen
+		// Felder ausf�llen
 		ChangeNation(row,player->nation);
 		ChangeTeam(row,player->team);
 		ChangePing(row);
@@ -381,7 +383,7 @@
 			ChangeColor(GAMECLIENT.GetPlayerID(), player->color);
 		}
 
-		// Start-Farbe der Minimap ändern
+		// Start-Farbe der Minimap �ndern
 	} break;
 
 	// Team
@@ -457,7 +459,7 @@
 {
 	switch(ctrl_id)
 	{
-	case 3: // Zurück
+	case 3: // Zur�ck
 		{
 			if(GAMECLIENT.IsHost())
 				GAMESERVER.Stop();
@@ -467,7 +469,7 @@
 			if(LOBBYCLIENT.LoggedIn())
 				WindowManager::inst().Switch(new dskLobby);
 			else
-				// Hauptmenü zeigen
+				// Hauptmen� zeigen
 				WindowManager::inst().Switch(new dskDirectIP);
 
 		} break;
@@ -604,9 +606,9 @@
 	case 43: // Geschwindigkeit
 	case 42: // Ziel
 	case 41: // Waren
-	case 40: // Aufklärung
+	case 40: // Aufkl�rung
 		{
-			// GameSettings wurden verändert, resetten
+			// GameSettings wurden ver�ndert, resetten
 			UpdateGGS();
 		} break;
 	}
@@ -628,7 +630,7 @@
 	case 19: // Team-Sicht
 	case 20: // Teams
 		{
-			// GameSettings wurden verändert, resetten
+			// GameSettings wurden ver�ndert, resetten
 			UpdateGGS();
 		} break;
 	}
@@ -648,14 +650,14 @@
 	ggs.game_objective = static_cast<GlobalGameSettings::GameObjective>(GetCtrl<ctrlComboBox>(42)->GetSelection());
 	// Waren zu Beginn
 	ggs.start_wares = static_cast<GlobalGameSettings::StartWares>(GetCtrl<ctrlComboBox>(41)->GetSelection());
-	// Aufklärung
+	// Aufkl�rung
 	ggs.exploration = static_cast<GlobalGameSettings::Exploration>(GetCtrl<ctrlComboBox>(40)->GetSelection());
 	// Teams gesperrt
 	ggs.lock_teams = GetCtrl<ctrlCheck>(20)->GetCheck();
 	// Team sicht
 	ggs.team_view = GetCtrl<ctrlCheck>(19)->GetCheck();
 
-	// An Server übermitteln
+	// An Server �bermitteln
 	GameServer::inst().ChangeGlobalGameSettings(ggs);
 }
 
@@ -738,7 +740,7 @@
 {
 	GetCtrl<ctrlGroup>(58-i)->GetCtrl<ColorControlInterface>(4)->SetColor(COLORS[color]);
 
-	// Minimap-Startfarbe ändern
+	// Minimap-Startfarbe �ndern
 	if(GetCtrl<ctrlPreviewMinimap>(70))
 		GetCtrl<ctrlPreviewMinimap>(70)->SetPlayerColor(i,COLORS[color]);
 }
@@ -900,7 +902,7 @@
 	GetCtrl<ctrlComboBox>(42)->SetSelection(static_cast<unsigned short>(ggs.game_objective));
 	// Waren
 	GetCtrl<ctrlComboBox>(41)->SetSelection(static_cast<unsigned short>(ggs.start_wares));
-	// Aufklärung
+	// Aufkl�rung
 	GetCtrl<ctrlComboBox>(40)->SetSelection(static_cast<unsigned short>(ggs.exploration));
 	// Teams
 	GetCtrl<ctrlCheck>(20)->SetCheck(ggs.lock_teams);
@@ -966,7 +968,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 /** 
- *  (Lobby-)Status: Benutzerdefinierter Fehler (kann auch Conn-Loss o.ä sein)
+ *  (Lobby-)Status: Benutzerdefinierter Fehler (kann auch Conn-Loss o.� sein)
  *
  *  @author FloSoft
  */
 
=== modified file 'src/nobHQ.cpp'
--- src/nobHQ.cpp	2010-12-20 23:02:02 +0000
+++ src/nobHQ.cpp	2010-12-31 12:24:58 +0000
@@ -45,7 +45,7 @@
 	// Alter mit Bau setzen
 	SetAge();
 
-	// ins Militärquadrat einfügen
+	// ins Milit�rquadrat einf�gen
 	gwg->GetMilitarySquare(x,y).push_back(this);
 	gwg->RecalcTerritory(this,GetMilitaryRadius(),false,true);
 
@@ -53,8 +53,79 @@
 	// StartWaren setzen ( provisorisch )
 	switch(GameClient::inst().GetGGS().start_wares)
 	{
+	//sehr wenig
+
+		case 0:
+			goods.goods[GD_BEER] = 0;
+			goods.goods[GD_TONGS] = 1;
+			goods.goods[GD_HAMMER] = 4;
+			goods.goods[GD_AXE] = 1;
+			goods.goods[GD_SAW] = 0;
+			goods.goods[GD_PICKAXE] = 0;
+			goods.goods[GD_SHOVEL] = 1;
+			goods.goods[GD_CRUCIBLE] = 1;
+			goods.goods[GD_RODANDLINE] = 1;//??
+			goods.goods[GD_SCYTHE] = 2;//??
+			goods.goods[GD_WATEREMPTY] = 0;
+			goods.goods[GD_WATER] = 0;
+			goods.goods[GD_CLEAVER] = 0;
+			goods.goods[GD_ROLLINGPIN] = 1;
+			goods.goods[GD_BOW] = 0;
+			goods.goods[GD_BOAT] = 0;
+			goods.goods[GD_SWORD] = 0;
+			goods.goods[GD_IRON] = 0;
+			goods.goods[GD_FLOUR] = 0;
+			goods.goods[GD_FISH] = 1;
+			goods.goods[GD_BREAD] = 2;
+			goods.goods[GD_SHIELDROMANS] = 0;
+			goods.goods[GD_WOOD] = 6;
+			goods.goods[GD_BOARDS] = 11;
+			goods.goods[GD_STONES] = 17;
+			goods.goods[GD_SHIELDVIKINGS] = 0;
+			goods.goods[GD_SHIELDAFRICANS] = 0;
+			goods.goods[GD_GRAIN] = 0;
+			goods.goods[GD_COINS] = 0;
+			goods.goods[GD_GOLD] = 0;
+			goods.goods[GD_IRONORE] = 4;
+			goods.goods[GD_COAL] = 4;
+			goods.goods[GD_MEAT] = 0;
+			goods.goods[GD_HAM] = 0;
+			goods.goods[GD_SHIELDJAPANESE] = 0;
+
+			goods.people[JOB_HELPER] = 13;
+			goods.people[JOB_WOODCUTTER] = 2;
+			goods.people[JOB_FISHER] = 0;
+			goods.people[JOB_FORESTER] = 1;
+			goods.people[JOB_CARPENTER] = 1;
+			goods.people[JOB_STONEMASON] = 1;
+			goods.people[JOB_HUNTER] = 1;
+			goods.people[JOB_FARMER] = 0;
+			goods.people[JOB_MILLER] = 0;
+			goods.people[JOB_BAKER] = 0;
+			goods.people[JOB_BUTCHER] = 0;
+			goods.people[JOB_MINER] = 2;
+			goods.people[JOB_BREWER] = 0;
+			goods.people[JOB_PIGBREEDER] = 0;
+			goods.people[JOB_DONKEYBREEDER] = 0;
+			goods.people[JOB_IRONFOUNDER] = 0;
+			goods.people[JOB_MINTER] = 0;
+			goods.people[JOB_METALWORKER] = 0;
+			goods.people[JOB_ARMORER] = 1;
+			goods.people[JOB_BUILDER] = 2;
+			goods.people[JOB_PLANER] = 1;
+			goods.people[JOB_PRIVATE] = 13;
+			goods.people[JOB_PRIVATEFIRSTCLASS] = 0;
+			goods.people[JOB_SERGEANT] = 0;
+			goods.people[JOB_OFFICER] = 0;
+			goods.people[JOB_GENERAL] = 0;
+			goods.people[JOB_GEOLOGIST] = 2;
+			goods.people[JOB_SHIPWRIGHT] = 0;
+			goods.people[JOB_SCOUT] = 1;
+			goods.people[JOB_PACKDONKEY] = 2;
+			break;
+
 	// Wenig
-	case 0:
+	case 1:
 
 		goods.goods[GD_BEER] = 0;
 		goods.goods[GD_TONGS] = 0;
@@ -125,7 +196,7 @@
 		break;
 
 	// Mittel
-	case 1:
+	case 2:
 
 		goods.goods[GD_BEER] = 6;
 		goods.goods[GD_TONGS] = 0;
@@ -196,7 +267,7 @@
 		break;
 
 	// Viel
-	case 2:
+	case 3:
 		goods.goods[GD_BEER] = 12;
 		goods.goods[GD_TONGS] = 0;
 		goods.goods[GD_HAMMER] = 32;
@@ -264,6 +335,9 @@
 		goods.people[JOB_SCOUT] = 4;
 		goods.people[JOB_PACKDONKEY] = 16;
 		break;
+		
+
+
 	}
 
 	real_goods = goods;
@@ -280,10 +354,10 @@
 	Destroy_nobBaseWarehouse();
 
 	// Land drumherum neu berechnen (nur wenn es schon besetzt wurde!)
-	// Nach dem BaseDestroy erst, da in diesem erst das Feuer gesetzt, die Straße gelöscht wird usw.
+	// Nach dem BaseDestroy erst, da in diesem erst das Feuer gesetzt, die Stra�e gel�scht wird usw.
 	gwg->RecalcTerritory(this,MILITARY_RADIUS[GetSize()],true, false);
 
-	// Wieder aus dem Militärquadrat rauswerfen
+	// Wieder aus dem Milit�rquadrat rauswerfen
 	gwg->GetMilitarySquare(x,y).erase(this);
 }
 
@@ -294,7 +368,7 @@
 
 nobHQ::nobHQ(SerializedGameData * sgd, const unsigned obj_id) : nobBaseWarehouse(sgd,obj_id)
 {
-	// ins Militärquadrat einfügen
+	// ins Milit�rquadrat einf�gen
 	gwg->GetMilitarySquare(x,y).push_back(this);
 
 	// Startpos setzen
@@ -304,11 +378,11 @@
 
 void nobHQ::Draw(int x,int y)
 {
-	// Gebäude an sich zeichnen
+	// Geb�ude an sich zeichnen
  	DrawBaseBuilding(x,y);
 
 
-	// 4 Fähnchen zeichnen
+	// 4 F�hnchen zeichnen
 	for(unsigned i = min<unsigned>(GetSoldiersCount()+
 		reserve_soldiers_available[0]+reserve_soldiers_available[1]+reserve_soldiers_available[2]+reserve_soldiers_available[3]+reserve_soldiers_available[4]
 	,4);i;--i)