Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-05-28 03:11:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix compile warnings on windows

Browse source
This commit is contained in:
Andrew Meadows 2018-12-10 15:41:25 -08:00
parent d622635a71
commit dedc14434b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/avatar/MyAvatar.cpp
View file

@ -1261,7 +1261,7 @@ void MyAvatar::resizeAvatarEntitySettingHandles(uint32_t maxIndex) {
// Avatar/avatarEntityData/5/properties: ... // Avatar/avatarEntityData/5/properties: ...
// //
// Create Setting::Handles to mimic this. // Create Setting::Handles to mimic this.
uint32_t settingsIndex = _avatarEntityIDSettings.size() + 1; uint32_t settingsIndex = (uint32_t)_avatarEntityIDSettings.size() + 1;
while (settingsIndex <= maxIndex) { while (settingsIndex <= maxIndex) {
Setting::Handle<QString> idHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData" Setting::Handle<QString> idHandle(QStringList() << AVATAR_SETTINGS_GROUP_NAME << "avatarEntityData"
<< QString::number(settingsIndex) << "id", QUuid().toString()); << QString::number(settingsIndex) << "id", QUuid().toString());
@ -1335,7 +1335,7 @@ void MyAvatar::saveAvatarEntityDataToSettings() {
_entitiesToRemoveFromSettings.clear(); _entitiesToRemoveFromSettings.clear();
}); });
uint32_t numEntities = entitiesToSave.size() + _avatarEntityStrings.size(); uint32_t numEntities = (uint32_t)(entitiesToSave.size() + _avatarEntityStrings.size());
uint32_t prevNumEntities = _avatarEntityCountSetting.get(0); uint32_t prevNumEntities = _avatarEntityCountSetting.get(0);
resizeAvatarEntitySettingHandles(std::max<uint32_t>(numEntities, prevNumEntities)); resizeAvatarEntitySettingHandles(std::max<uint32_t>(numEntities, prevNumEntities));