dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r14717) -Change: more 'Index' -> ClientID to not confuse ClientID and ClientIndex

Browse Source
This commit is contained in:
rubidium
2008-12-22 21:30:21 +00:00
parent 573d1b324a
commit f49cc67f83
6 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/console_cmds.cpp
View File

@@ -385,7 +385,7 @@ DEF_CONSOLE_CMD(ConBan)
if (strchr(argv[1], '.') == NULL) { // banning with ID
client_id = (ClientID)atoi(argv[1]);
ci = NetworkFindClientInfoFromIndex(client_id);
ci = NetworkFindClientInfoFromClientID(client_id);
} else { // banning IP
ci = NetworkFindClientInfoFromIP(argv[1]);
if (ci == NULL) {
@@ -567,7 +567,7 @@ DEF_CONSOLE_CMD(ConKick)
if (strchr(argv[1], '.') == NULL) {
client_id = (ClientID)atoi(argv[1]);
ci = NetworkFindClientInfoFromIndex(client_id);
ci = NetworkFindClientInfoFromClientID(client_id);
} else {
ci = NetworkFindClientInfoFromIP(argv[1]);
client_id = (ci == NULL) ? INVALID_CLIENT_ID : ci->client_id;
@@ -623,7 +623,7 @@ DEF_CONSOLE_CMD(ConResetCompany)
IConsoleError("Cannot remove company: a client is connected to that company.");
return false;
}
const NetworkClientInfo *ci = NetworkFindClientInfoFromIndex(CLIENT_ID_SERVER);
const NetworkClientInfo *ci = NetworkFindClientInfoFromClientID(CLIENT_ID_SERVER);
if (ci->client_playas == index) {
IConsoleError("Cannot remove company: the server is connected to that company.");
return true;