diff options
| author | Darkvater <Darkvater@openttd.org> | 2006-10-24 22:26:20 +0000 |
|---|---|---|
| committer | Darkvater <Darkvater@openttd.org> | 2006-10-24 22:26:20 +0000 |
| commit | a7c484f1ea3bbb61cc290ceeb34a595646d510cc (patch) | |
| tree | c438df07f9e38fc848f75b85830b01a28ae506f2 /network_client.c | |
| parent | 883d84a93ee3443b9063909323c1042b9a0d9d0e (diff) | |
| download | openttd-a7c484f1ea3bbb61cc290ceeb34a595646d510cc.tar.xz | |
(svn r6933) -Feature: Allow spectators to speak to eachother (team)
Diffstat (limited to 'network_client.c')
| -rw-r--r-- | network_client.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/network_client.c b/network_client.c index 80dd45b94..b5e9b34c7 100644 --- a/network_client.c +++ b/network_client.c @@ -623,14 +623,17 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CHAT) snprintf(name, sizeof(name), "%s", ci_to->client_name); ci = NetworkFindClientInfoFromIndex(_network_own_client_index); break; - case NETWORK_ACTION_CHAT_COMPANY: + + /* For speaking to company or giving money, we need the player-name */ case NETWORK_ACTION_GIVE_MONEY: - /* For speaking to player or give money, we need the player-name */ - if (!IsValidPlayer(ci_to->client_playas)) return NETWORK_RECV_STATUS_OKAY; // This should never happen + if (!IsValidPlayer(ci_to->client_playas)) return NETWORK_RECV_STATUS_OKAY; + /* fallthrough */ + case NETWORK_ACTION_CHAT_COMPANY: { + StringID str = IsValidPlayer(ci_to->client_playas) ? GetPlayer(ci_to->client_playas)->name_1 : STR_NETWORK_SPECTATORS; - GetString(name, GetPlayer(ci_to->client_playas)->name_1, lastof(name)); + GetString(name, str, lastof(name)); ci = NetworkFindClientInfoFromIndex(_network_own_client_index); - break; + } break; default: /* This should never happen */ NOT_REACHED(); |