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

Fix various compiler warnings

Browse Source 
See: #267
This commit is contained in:
Jonathan G Rennison
2021-06-11 22:54:27 +01:00
parent 97d5982cb5
commit 1002c6d9d2
46 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/settings.cpp
View File

@@ -2915,7 +2915,7 @@ static void SaveSettingsPatx(const SettingDesc *sd, void *object)
size_t length = 8;
for (const SettingDesc *desc = sd; desc->save.cmd != SL_END; desc++) {
if (desc->patx_name == nullptr) continue;
uint32 setting_length = SlCalcObjMemberLength(object, &desc->save);
uint32 setting_length = (uint32)SlCalcObjMemberLength(object, &desc->save);
if (!setting_length) continue;
current_setting.name = desc->patx_name;
@@ -2932,8 +2932,8 @@ static void SaveSettingsPatx(const SettingDesc *sd, void *object)
}
SlSetLength(length);
SlWriteUint32(0); // flags
SlWriteUint32(settings_to_add.size()); // settings count
SlWriteUint32(0); // flags
SlWriteUint32((uint32)settings_to_add.size()); // settings count
for (size_t i = 0; i < settings_to_add.size(); i++) {
const SettingDesc *desc = settings_to_add[i].setting;
@@ -3060,7 +3060,7 @@ void SaveSettingsPlyx()
uint32 setting_count = 0;
for (const SettingDesc *desc = _company_settings; desc->save.cmd != SL_END; desc++) {
if (desc->patx_name == nullptr) continue;
uint32 setting_length = SlCalcObjMemberLength(&(c->settings), &desc->save);
uint32 setting_length = (uint32)SlCalcObjMemberLength(&(c->settings), &desc->save);
if (!setting_length) continue;
current_setting.name = desc->patx_name;
@@ -3091,7 +3091,7 @@ void SaveSettingsPlyx()
for (const SettingDesc *desc = _company_settings; desc->save.cmd != SL_END; desc++) {
if (desc->patx_name == nullptr) continue;
uint32 setting_length = SlCalcObjMemberLength(&(c->settings), &desc->save);
uint32 setting_length = (uint32)SlCalcObjMemberLength(&(c->settings), &desc->save);
if (!setting_length) continue;
current_setting.flags = 0;