Mercurial > hg > openttd
changeset 4828:94deb59a0d47 draft
(svn r6752) -Codechange: Move command functions from messy functions.h into command.h
| author | Darkvater <Darkvater@openttd.org> |
|---|---|
| date | Thu, 12 Oct 2006 14:42:00 +0000 |
| parents | a36061a024db |
| children | 640f36a9346e |
| files | ai/ai.h callback_table.h command.h functions.h |
| diffstat | 4 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ai/ai.h +++ b/ai/ai.h @@ -4,6 +4,7 @@ #include "../functions.h" #include "../network.h" #include "../player.h" +#include "../command.h" /* How DoCommands look like for an AI */ typedef struct AICommand {
--- a/callback_table.h +++ b/callback_table.h @@ -3,7 +3,7 @@ #ifndef CALLBACK_TABLE_H #define CALLBACK_TABLE_H -#include "functions.h" +#include "command.h" extern CommandCallback *_callback_table[]; extern const int _callback_table_count;
--- a/command.h +++ b/command.h @@ -195,7 +195,14 @@ } /* command.c */ +typedef void CommandCallback(bool success, TileIndex tile, uint32 p1, uint32 p2); int32 DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 flags, uint procc); +bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback, uint32 cmd); + +#ifdef ENABLE_NETWORK + +void NetworkSend_Command(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallback *callback); +#endif /* ENABLE_NETWORK */ extern const char* _cmd_text; // Text, which gets sent with a command
--- a/functions.h +++ b/functions.h @@ -132,9 +132,6 @@ uint32 GetBridgeLength(TileIndex begin, TileIndex end); int CalcBridgeLenCostFactor(int x); -typedef void CommandCallback(bool success, TileIndex tile, uint32 p1, uint32 p2); -bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, CommandCallback *callback, uint32 cmd); - /* network.c */ void NetworkUDPClose(void); void NetworkStartUp(void); @@ -145,8 +142,6 @@ bool NetworkClientConnectGame(const char* host, unsigned short port); void NetworkReboot(void); void NetworkDisconnect(void); -void NetworkSend_Command(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallback *callback); - /* misc_cmd.c */ void PlaceTreesRandomly(void);