summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-01-23 02:01:05 +0000
committerrubidium <rubidium@openttd.org>2009-01-23 02:01:05 +0000
commit83e1288c6a327f711f047aff1e03e5f4a9dfc058 (patch)
tree1e43f88338690d1359c84c111155e7a20af52a2f /src
parent92f5c6b1da1b369e4518fc1f59b30feb9c771c30 (diff)
downloadopenttd-83e1288c6a327f711f047aff1e03e5f4a9dfc058.tar.xz
(svn r15215) -Fix: various MSVC x64 compiler warnings
Diffstat (limited to 'src')
-rw-r--r--src/ai/ai_config.cpp2
-rw-r--r--src/ai/ai_config.hpp2
-rw-r--r--src/ai/ai_gui.cpp4
-rw-r--r--src/network/network_content.cpp2
-rw-r--r--src/network/network_content_gui.cpp1
5 files changed, 6 insertions, 5 deletions
diff --git a/src/ai/ai_config.cpp b/src/ai/ai_config.cpp
index 2595bdf58..2f08e0d14 100644
--- a/src/ai/ai_config.cpp
+++ b/src/ai/ai_config.cpp
@@ -197,7 +197,7 @@ void AIConfig::StringToSettings(const char *value)
free(value_copy);
}
-void AIConfig::SettingsToString(char *string, int size)
+void AIConfig::SettingsToString(char *string, size_t size)
{
string[0] = '\0';
for (SettingValueList::iterator it = this->settings.begin(); it != this->settings.end(); it++) {
diff --git a/src/ai/ai_config.hpp b/src/ai/ai_config.hpp
index ba76a3add..39b680f1c 100644
--- a/src/ai/ai_config.hpp
+++ b/src/ai/ai_config.hpp
@@ -105,7 +105,7 @@ public:
* Convert the custom settings to a string that can be stored in the config
* file or savegames.
*/
- void SettingsToString(char *string, int size);
+ void SettingsToString(char *string, size_t size);
private:
const char *name;
diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index 0425bd4b5..a68613530 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -64,7 +64,7 @@ struct AIListWindow : public Window {
this->resize.step_height = 14;
this->vscroll.cap = (this->widget[AIL_WIDGET_LIST].bottom - this->widget[AIL_WIDGET_LIST].top) / 14 + 1;
this->widget[AIL_WIDGET_LIST].data = (this->vscroll.cap << 8) + 1;
- SetVScrollCount(this, this->ai_info_list->size() + 1);
+ SetVScrollCount(this, (int)this->ai_info_list->size() + 1);
/* Try if we can find the currently selected AI */
this->selected = -1;
@@ -251,7 +251,7 @@ struct AISettingsWindow : public Window {
this->resize.step_height = 14;
this->vscroll.cap = (this->widget[AIS_WIDGET_BACKGROUND].bottom - this->widget[AIS_WIDGET_BACKGROUND].top) / 14 + 1;
this->widget[AIS_WIDGET_BACKGROUND].data = (this->vscroll.cap << 8) + 1;
- SetVScrollCount(this, this->ai_config->GetConfigList()->size());
+ SetVScrollCount(this, (int)this->ai_config->GetConfigList()->size());
this->FindWindowPlacementAndResize(desc);
}
diff --git a/src/network/network_content.cpp b/src/network/network_content.cpp
index c263f0ce5..c0e097479 100644
--- a/src/network/network_content.cpp
+++ b/src/network/network_content.cpp
@@ -380,7 +380,7 @@ DEF_CONTENT_RECEIVE_COMMAND(Client, PACKET_CONTENT_SERVER_CONTENT)
return false;
}
- this->OnDownloadProgress(this->curInfo, toRead);
+ this->OnDownloadProgress(this->curInfo, (uint)toRead);
if (toRead == 0) {
/* We read nothing; that's our marker for end-of-stream.
diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp
index d25fde042..398f838da 100644
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -528,6 +528,7 @@ public:
break;
case NCLWW_UNSELECT:
+ _network_content_client.UnselectAll();
this->SetDirty();
break;