Fix invalid usage of texture->getSize() where actually texture->getOriginalSize() was meant

sapier · sapier · commit 68bbdf1b2c1b · 2013-11-03T23:00:54.000+01:00
diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp
@@ -390,7 +390,7 @@ void GUIEngine::drawBackground(video::IVideoDriver* driver)
 	}
 
 	/* Draw background texture */
-	v2u32 sourcesize = texture->getSize();
+	v2u32 sourcesize = texture->getOriginalSize();
 	driver->draw2DImage(texture,
 		core::rect<s32>(0, 0, screensize.X, screensize.Y),
 		core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y),
@@ -409,7 +409,7 @@ void GUIEngine::drawOverlay(video::IVideoDriver* driver)
 		return;
 
 	/* Draw background texture */
-	v2u32 sourcesize = texture->getSize();
+	v2u32 sourcesize = texture->getOriginalSize();
 	driver->draw2DImage(texture,
 		core::rect<s32>(0, 0, screensize.X, screensize.Y),
 		core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y),
@@ -427,7 +427,7 @@ void GUIEngine::drawHeader(video::IVideoDriver* driver)
 	if(!texture)
 		return;
 
-	f32 mult = (((f32)screensize.Width / 2)) /
+	f32 mult = (((f32)screensize.Width / 2.0)) /
 			((f32)texture->getOriginalSize().Width);
 
 	v2s32 splashsize(((f32)texture->getOriginalSize().Width) * mult,
@@ -445,7 +445,7 @@ void GUIEngine::drawHeader(video::IVideoDriver* driver)
 
 	driver->draw2DImage(texture, splashrect,
 		core::rect<s32>(core::position2d<s32>(0,0),
-		core::dimension2di(texture->getSize())),
+		core::dimension2di(texture->getOriginalSize())),
 		NULL, NULL, true);
 	}
 }
@@ -477,7 +477,7 @@ void GUIEngine::drawFooter(video::IVideoDriver* driver)
 
 		driver->draw2DImage(texture, rect,
 			core::rect<s32>(core::position2d<s32>(0,0),
-			core::dimension2di(texture->getSize())),
+			core::dimension2di(texture->getOriginalSize())),
 			NULL, NULL, true);
 	}
 }
diff --git a/src/mesh.cpp b/src/mesh.cpp
@@ -260,7 +260,7 @@ scene::IAnimatedMesh* createExtrudedMesh(video::ITexture *texture,
 		video::IVideoDriver *driver, v3f scale)
 {
 	scene::IAnimatedMesh *mesh = NULL;
-	core::dimension2d<u32> size = texture->getSize();
+	core::dimension2d<u32> size = texture->getOriginalSize();
 	video::ECOLOR_FORMAT format = texture->getColorFormat();
 	if (format == video::ECF_A8R8G8B8)
 	{

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ scene::IAnimatedMesh* createExtrudedMesh(video::ITexture *texture,`
`260`	`260`	`video::IVideoDriver *driver, v3f scale)`
`261`	`261`	`{`
`262`	`262`	`scene::IAnimatedMesh *mesh = NULL;`
`263`		`- core::dimension2d<u32> size = texture->getSize();`
	`263`	`+ core::dimension2d<u32> size = texture->getOriginalSize();`
`264`	`264`	`video::ECOLOR_FORMAT format = texture->getColorFormat();`
`265`	`265`	`if (format == video::ECF_A8R8G8B8)`
`266`	`266`	`{`