summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2006-01-26 13:01:53 +0000
committerDarkvater <darkvater@openttd.org>2006-01-26 13:01:53 +0000
commitfa735869e1ccc1ed809db04dc10685ca414704bd (patch)
tree32a23800f06df891eb2f65452f6eb17f3e1f9030
parent8721b05453af34541ac6cc80598706e0d7604250 (diff)
downloadopenttd-fa735869e1ccc1ed809db04dc10685ca414704bd.tar.xz
(svn r3435) - Fix a warning, removed unused extern and some comments in network_gamelist.c
-rw-r--r--network_gamelist.c8
-rw-r--r--network_gui.c7
2 files changed, 10 insertions, 5 deletions
diff --git a/network_gamelist.c b/network_gamelist.c
index a90b50aaa..0085f0fca 100644
--- a/network_gamelist.c
+++ b/network_gamelist.c
@@ -12,7 +12,11 @@
extern void UpdateNetworkGameWindow(bool unselect);
-
+/** Add a new item to the linked gamelist. If the IP and Port match
+ * return the existing item instead of adding it again
+ * @param ip the IP-address (inet_addr) of the to-be added item
+ * @param port the port the server is running on
+ * @return a point to the newly added or already existing item */
NetworkGameList *NetworkGameListAddItem(uint32 ip, uint16 port)
{
NetworkGameList *item, *prev_item;
@@ -38,6 +42,8 @@ NetworkGameList *NetworkGameListAddItem(uint32 ip, uint16 port)
return item;
}
+/** Remove an item from the gamelist linked list
+ * @param remove pointer to the item to be removed */
void NetworkGameListRemoveItem(NetworkGameList *remove)
{
NetworkGameList *item, *prev_item;
diff --git a/network_gui.c b/network_gui.c
index dc25f5bd9..c57654563 100644
--- a/network_gui.c
+++ b/network_gui.c
@@ -74,11 +74,10 @@ enum {
NET_PRC__SIZE_OF_ROW_COMPANY = 12,
};
+/* Used in both NetworkWindow and NetworkLobby to mark the currently selected server */
static NetworkGameList *_selected_item = NULL;
static int8 _selected_company_item = -1;
-extern const char _openttd_revision[];
-
static FiosItem *_selected_map = NULL; // to highlight slected map
// called when a new server is found on the network
@@ -409,11 +408,11 @@ void ShowNetworkGameWindow(void)
/* Only show once */
if (_first_time_show_network_game_window) {
- const char* const *srv;
+ char* const *srv;
_first_time_show_network_game_window = false;
// add all servers from the config file to our list
- for (srv = _network_host_list; srv != endof(_network_host_list) && *srv != NULL; srv++) {
+ for (srv = &_network_host_list[0]; srv != endof(_network_host_list) && *srv != NULL; srv++) {
NetworkAddServer(*srv);
}
}