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

s/15/PlayerNumNeutral/

Browse source
This commit is contained in:
jarod42 2004-10-25 16:59:15 +00:00
parent 6c801713e6
commit b2bb9a4aa1
3 changed files with 7 additions and 10 deletions

4
src/editor/editloop.cpp
View file

@ -1863,7 +1863,7 @@ static void CreateEditor(void)
ReplayRevealMap = 1;
FlagRevealMap = 0;
SelectedPlayer = 15;
SelectedPlayer = PlayerNumNeutral;
//
// Place the start points, which the loader discarded.
@ -1871,7 +1871,7 @@ static void CreateEditor(void)
for (i = 0; i < PlayerMax; ++i) {
if (TheMap.Info.PlayerType[i] != PlayerNobody) {
// Set SelectedPlayer to a valid player
if (SelectedPlayer == 15) {
if (SelectedPlayer == PlayerNumNeutral) {
SelectedPlayer = i;
}
#if 0

8
src/editor/edmap.cpp
View file

@ -686,13 +686,13 @@ static void EditorRandomizeUnit(const char* unit_type, int count, int value)
TileFill(mx - rx - 1, mx - ry - 1, tile, z * 2);
// FIXME: can overlap units
unit = MakeUnitAndPlace(rx, ry , type, &Players[15]);
unit = MakeUnitAndPlace(rx, ry , type, &Players[PlayerNumNeutral]);
unit->ResourcesHeld = value;
unit = MakeUnitAndPlace(mx - rx - tw, ry, type, &Players[15]);
unit = MakeUnitAndPlace(mx - rx - tw, ry, type, &Players[PlayerNumNeutral]);
unit->ResourcesHeld = value;
unit = MakeUnitAndPlace(rx, my - ry - th, type, &Players[15]);
unit = MakeUnitAndPlace(rx, my - ry - th, type, &Players[PlayerNumNeutral]);
unit->ResourcesHeld = value;
unit = MakeUnitAndPlace(mx - rx - tw, mx - ry - th, type, &Players[15]);
unit = MakeUnitAndPlace(mx - rx - tw, mx - ry - th, type, &Players[PlayerNumNeutral]);
unit->ResourcesHeld = value;
}
}

5
src/include/player.h
View file

@ -443,10 +443,7 @@ enum PlayerAis {
PlayerAiUniversal = 0xFF, ///< attack best possible
};
#define PlayerNumNeutral 15 ///< this is the neutral player slot
#if 0
#define PlayerMax 16 ///< maximal players supported
#endif
#define PlayerNumNeutral (PlayerMax - 1) ///< this is the neutral player slot
/**
** Notify types. Noties are send to the player.