Fix compilation errors reported by clang

notehel · Apr 29, 2018 · e61b58e · e61b58e
1 parent 55b411f
commit e61b58e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/OrionUO/Managers/PacketManager.cpp b/OrionUO/Managers/PacketManager.cpp
@@ -2251,7 +2251,7 @@ PACKET_HANDLER(UpdateSkills)
 				if (change)
 				{
 					char str[128] = { 0 };
-					sprintf_s(str, "Your skill in %s has %s by %.1f%%.  It is now %.1f%%.", skill->Name.c_str(), ((change < 0) ? "decreased" : "increased"), abs(change), skill->BaseValue + change);
+					sprintf_s(str, "Your skill in %s has %s by %.1f%%.  It is now %.1f%%.", skill->Name.c_str(), ((change < 0) ? "decreased" : "increased"), std::abs(change), skill->BaseValue + change);
 					//else if (change > 0) sprintf(str, "Your skill in %s has increased by %.1f%%.  It is now %.1f%%.", UO->m_Skills[id].m_Name.c_str(), change, obj->GetSkillBaseValue(id) + change);
 					g_Orion.CreateTextMessage(TT_SYSTEM, 0, 3, 0x58, str);
 				}

diff --git a/OrionUO/Managers/SoundManager.cpp b/OrionUO/Managers/SoundManager.cpp
@@ -190,7 +190,10 @@ HSTREAM CSoundManager::LoadSoundEffect(CIndexSound &is)
 {
 	WISPFUN_DEBUG("c156_f7");
 	if (is.m_WaveFile.empty())
-		is.m_WaveFile.swap(CreateWaveFile(is));
+	{
+		auto wav = CreateWaveFile(is);
+		is.m_WaveFile.swap(wav);
+	}
 
 	size_t waveFileSize = is.DataSize - sizeof(SOUND_BLOCK) +sizeof(WaveHeader);	
 

diff --git a/OrionUO/Managers/UOFileReader.cpp b/OrionUO/Managers/UOFileReader.cpp
@@ -404,10 +404,10 @@ CGLTexture *UOFileReader::ReadArt(ushort id, CIndexObject &io, bool run)
 				{
 					if (pixels[pos++])
 					{
-						minX = min(minX, x);
-						maxX = max(maxX, x);
-						minY = min(minY, y);
-						maxY = max(maxY, y);
+						minX = min(minX, int(x));
+						maxX = max(maxX, int(x));
+						minY = min(minY, int(y));
+						maxY = max(maxY, int(y));
 					}
 				}
 			}