Fix pkg to be coherent with src.
Fix typo in AStarDebug code. Patch from cybermind.
This commit is contained in:
parent
dc044a9c70
commit
485c46c4ec
4 changed files with 13 additions and 9 deletions
src
|
@ -336,7 +336,7 @@ int NextPathElement(CUnit &unit, short int *pxd, short int *pyd)
|
|||
// If obstructing unit is moving, wait for a bit.
|
||||
if (unit.CurrentOrder()->Data.Move.Fast) {
|
||||
unit.CurrentOrder()->Data.Move.Fast--;
|
||||
AstarDebugPrint("WAIT at %d\n" _C_ unit.Data.Move.Fast);
|
||||
AstarDebugPrint("WAIT at %d\n" _C_ unit.CurrentOrder()->Data.Move.Fast);
|
||||
result = PF_WAIT;
|
||||
} else {
|
||||
unit.CurrentOrder()->Data.Move.Fast = 10;
|
||||
|
|
|
@ -16,15 +16,16 @@ void NetworkServerResyncClients(void);
|
|||
void NetworkDetachFromServer(void);
|
||||
|
||||
class CServerSetup {
|
||||
unsigned char ResourcesOption;
|
||||
unsigned char UnitsOption;
|
||||
unsigned char FogOfWar;
|
||||
unsigned char RevealMap;
|
||||
unsigned char GameTypeOption;
|
||||
unsigned char Difficulty;
|
||||
unsigned char MapRichness;
|
||||
unsigned int ResourcesOption;
|
||||
unsigned int UnitsOption;
|
||||
unsigned int FogOfWar;
|
||||
unsigned int RevealMap;
|
||||
unsigned int GameTypeOption;
|
||||
unsigned int Difficulty;
|
||||
unsigned int MapRichness;
|
||||
unsigned CompOpt[PlayerMax];
|
||||
unsigned Ready[PlayerMax];
|
||||
unsigned Race[PlayerMax];
|
||||
unsigned long LastFrame[PlayerMax];
|
||||
};
|
||||
extern CServerSetup LocalSetupState;
|
||||
|
|
|
@ -49,7 +49,7 @@ $]
|
|||
#define MaxResourceInfo MaxCosts + 2
|
||||
#define PlayerMax 16
|
||||
#define PlayerNumNeutral (PlayerMax - 1)
|
||||
#define UnitMax 2048
|
||||
#define UnitMax 65536
|
||||
|
||||
#define NoButton 0
|
||||
#define LeftButton 2
|
||||
|
|
|
@ -22,6 +22,9 @@ class CPreference
|
|||
bool ShowSightRange;
|
||||
bool ShowReactionRange;
|
||||
bool ShowAttackRange;
|
||||
bool ShowMessages;
|
||||
bool BigScreen;
|
||||
|
||||
unsigned int ShowOrders;
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue