Resolve intentionality issues

client/renderSDL/SDL_Extensions.cpp

@@ -672,8 +672,8 @@ void scaleSurfaceFastInternal(SDL_Surface *surf, SDL_Surface *ret)
 		for(int x = 0; x < ret->w; x++)
 		{
 			//coordinates we want to calculate
-			int origX = static_cast<int>(floor(factorX * x));
-			int origY = static_cast<int>(floor(factorY * y));
+			auto origX = static_cast<int>(floor(factorX * x));
+			auto origY = static_cast<int>(floor(factorY * y));
 
 			// Get pointers to source pixels
 			uint8_t *srcPtr = (uint8_t*)surf->pixels + origY * surf->pitch + origX * bpp;

lib/mapping/CMapHeader.cpp

@@ -141,8 +141,8 @@ void CMapHeader::registerMapStrings()
 	VLC->generaltexth->addSubContainer(*this);
 	
 	//get supported languages. Assuming that translation containing most strings is the base language
-	std::set<std::string> mapLanguages;
-	std::set<std::string> mapBaseLanguages;
+	std::set<std::string, std::less<>> mapLanguages;
+	std::set<std::string, std::less<>> mapBaseLanguages;
 	int maxStrings = 0;
 	for(auto & translation : translations.Struct())
 	{