Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed Bug (One Peasant Only) Should only effect Human and Computer Players, not Nobody, Neutral or Rescue Units

Browse source
This commit is contained in:
mr-russ 2003-03-02 06:23:25 +00:00
parent a53dafe2b9
commit 003f489207
2 changed files with 6 additions and 2 deletions
doc
ChangeLog.html
src/stratagus
pud.cpp

2
doc/ChangeLog.html
View file

@ -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>

6
src/stratagus/pud.cpp
View file

@ -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