summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruebrain <truebrain@openttd.org>2011-12-19 20:50:36 +0000
committertruebrain <truebrain@openttd.org>2011-12-19 20:50:36 +0000
commit577fe0238e7f4681fdf96b8aed241908a9f72de9 (patch)
tree96a9e5a6d7ef530dcd88d42d633a479ba7e18e6d
parent561b25d0319674716b51d63594e146132d0a33e3 (diff)
downloadopenttd-577fe0238e7f4681fdf96b8aed241908a9f72de9.tar.xz
(svn r23602) -Add: support for DEITY commands, commands where no real company was involved in (Rubidium)
-rw-r--r--src/command.cpp2
-rw-r--r--src/command_type.h17
-rw-r--r--src/company_type.h1
3 files changed, 11 insertions, 9 deletions
diff --git a/src/command.cpp b/src/command.cpp
index 31c4843f0..f2bf49c13 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -609,7 +609,7 @@ CommandCost DoCommandPInternal(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd,
/* If the company isn't valid it may only do server command or start a new company!
* The server will ditch any server commands a client sends to it, so effectively
* this guards the server from executing functions for an invalid company. */
- if (_game_mode == GM_NORMAL && !exec_as_spectator && !Company::IsValidID(_current_company)) {
+ if (_game_mode == GM_NORMAL && !exec_as_spectator && !Company::IsValidID(_current_company) && !(_current_company == OWNER_DEITY && (cmd_flags & CMD_DEITY) != 0)) {
return_dcpi(CMD_ERROR, false);
}
diff --git a/src/command_type.h b/src/command_type.h
index 299534080..fd8f0d9bf 100644
--- a/src/command_type.h
+++ b/src/command_type.h
@@ -346,14 +346,15 @@ enum FlaggedCommands {
* This enumeration defines flags for the _command_proc_table.
*/
enum CommandFlags {
- CMD_SERVER = 0x01, ///< the command can only be initiated by the server
- CMD_SPECTATOR = 0x02, ///< the command may be initiated by a spectator
- CMD_OFFLINE = 0x04, ///< the command cannot be executed in a multiplayer game; single-player only
- CMD_AUTO = 0x08, ///< set the DC_AUTO flag on this command
- CMD_ALL_TILES = 0x10, ///< allow this command also on MP_VOID tiles
- CMD_NO_TEST = 0x20, ///< the command's output may differ between test and execute due to town rating changes etc.
- CMD_NO_WATER = 0x40, ///< set the DC_NO_WATER flag on this command
- CMD_CLIENT_ID = 0x80, ///< set p2 with the ClientID of the sending client.
+ CMD_SERVER = 0x001, ///< the command can only be initiated by the server
+ CMD_SPECTATOR = 0x002, ///< the command may be initiated by a spectator
+ CMD_OFFLINE = 0x004, ///< the command cannot be executed in a multiplayer game; single-player only
+ CMD_AUTO = 0x008, ///< set the DC_AUTO flag on this command
+ CMD_ALL_TILES = 0x010, ///< allow this command also on MP_VOID tiles
+ CMD_NO_TEST = 0x020, ///< the command's output may differ between test and execute due to town rating changes etc.
+ CMD_NO_WATER = 0x040, ///< set the DC_NO_WATER flag on this command
+ CMD_CLIENT_ID = 0x080, ///< set p2 with the ClientID of the sending client.
+ CMD_DEITY = 0x100, ///< the command may be executed by COMPANY_DEITY
};
DECLARE_ENUM_AS_BIT_SET(CommandFlags)
diff --git a/src/company_type.h b/src/company_type.h
index 0de8b5867..44a074e10 100644
--- a/src/company_type.h
+++ b/src/company_type.h
@@ -26,6 +26,7 @@ enum Owner {
OWNER_TOWN = 0x0F, ///< A town owns the tile, or a town is expanding
OWNER_NONE = 0x10, ///< The tile has no ownership
OWNER_WATER = 0x11, ///< The tile/execution is done by "water"
+ OWNER_DEITY = 0x12, ///< The object is owned by a superuser / goal script
OWNER_END, ///< Last + 1 owner
INVALID_OWNER = 0xFF, ///< An invalid owner
INVALID_COMPANY = 0xFF, ///< An invalid company