Mercurial > fife-parpg

diff engine/core/controller/enginesettings.cpp @ 650:51bbda7676f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Fixed some more integer definitions * All vars containing bits per pixel should now be uint16_t
author prock@33b003aa-7bff-0310-803a-e67f0ece8222
date Thu, 14 Oct 2010 15:32:09 +0000
parents 855ad500f991
children e3140f01749d
line wrap: on
line diff
--- a/engine/core/controller/enginesettings.cpp	Thu Oct 14 15:06:26 2010 +0000
+++ b/engine/core/controller/enginesettings.cpp	Thu Oct 14 15:32:09 2010 +0000
@@ -92,9 +92,9 @@
 		return result;
 	}
 
-	void EngineSettings::setBitsPerPixel(uint8_t bitsperpixel) {
-		std::vector<uint8_t> pv = getPossibleBitsPerPixel();
-		std::vector<uint8_t>::iterator i = std::find(pv.begin(), pv.end(), bitsperpixel);
+	void EngineSettings::setBitsPerPixel(uint16_t bitsperpixel) {
+		std::vector<uint16_t> pv = getPossibleBitsPerPixel();
+		std::vector<uint16_t>::iterator i = std::find(pv.begin(), pv.end(), bitsperpixel);
 		if (i != pv.end()) {
 			m_bitsperpixel = bitsperpixel;
 			return;
@@ -102,8 +102,8 @@
 		throw NotSupported("Given bits per pixel value is not supported");
 	}
 
-	std::vector<uint8_t> EngineSettings::getPossibleBitsPerPixel() const {
-		std::vector<uint8_t> tmp;
+	std::vector<uint16_t> EngineSettings::getPossibleBitsPerPixel() const {
+		std::vector<uint16_t> tmp;
 		tmp.push_back(0);
 		tmp.push_back(16);
 		tmp.push_back(24);