From 003f48920792e5430a03e9c20d71a4ccce0a9a81 Mon Sep 17 00:00:00 2001
From: mr-russ <>
Date: Sun, 2 Mar 2003 06:23:25 +0000
Subject: [PATCH] Fixed Bug (One Peasant Only) Should only effect Human and
Computer Players, not Nobody, Neutral or Rescue Units
---
doc/ChangeLog.html | 2 ++
src/stratagus/pud.cpp | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/doc/ChangeLog.html b/doc/ChangeLog.html
index 4cfc3c6be..d86450f78 100644
--- a/doc/ChangeLog.html
+++ b/doc/ChangeLog.html
@@ -1106,6 +1106,8 @@
<LI>Walls don't count for buildings stats (from Jimmy Salmon).
<LI>Fixed Bug 444273: Heroes have wrong upgrades (from Russell
Smith).
+ <LI>Fixed Bug (One Peasant Only) Should only effect Human and
+ Computer Players, not Nobody, Neutral or Rescue Units
<LI>+++
</UL>
</UL>
diff --git a/src/stratagus/pud.cpp b/src/stratagus/pud.cpp
index 0f65c2b14..0d390158b 100644
--- a/src/stratagus/pud.cpp
+++ b/src/stratagus/pud.cpp
@@ -1250,7 +1250,7 @@ global void LoadPud(const char* pud,WorldMap* map)
Players[o].StartX=MapOffsetX+x;
Players[o].StartY=MapOffsetY+y;
if (GameSettings.NumUnits == SettingsNumUnits1
- && Players[o].Type != PlayerNobody) {
+ && Players[o].Type != PlayerNobody ) {
if (t == WC_StartLocationHuman) {
t = WC_UnitPeasant;
} else {
@@ -1261,7 +1261,9 @@ global void LoadPud(const char* pud,WorldMap* map)
}
} else {
if (GameSettings.NumUnits == SettingsNumUnitsMapDefault ||
- t == WC_UnitGoldMine || t == WC_UnitOilPatch) {
+ t == WC_UnitGoldMine || t == WC_UnitOilPatch ||
+ (Players[o].Type != PlayerPerson &&
+ Players[o].Type != PlayerComputer) ) {
pawn:
if (t != WC_UnitGoldMine && t != WC_UnitOilPatch) {
if (NetworkFildes == -1