[Scummvm-git-logs] scummvm master -> a69b17611c6c17637bb5d693147922414cc467d5

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a69b17611c WINTERMUTE: Fixed material names


Commit: a69b17611c6c17637bb5d693147922414cc467d5
    https://github.com/scummvm/scummvm/commit/a69b17611c6c17637bb5d693147922414cc467d5
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-11-06T14:04:50+01:00

Commit Message:
WINTERMUTE: Fixed material names

Changed paths:
    engines/wintermute/base/gfx/xmaterial.cpp


diff --git a/engines/wintermute/base/gfx/xmaterial.cpp b/engines/wintermute/base/gfx/xmaterial.cpp
index 9f07d04c653..9321744bb3c 100644
--- a/engines/wintermute/base/gfx/xmaterial.cpp
+++ b/engines/wintermute/base/gfx/xmaterial.cpp
@@ -74,7 +74,7 @@ bool Material::restoreDeviceObjects() {
 //////////////////////////////////////////////////////////////////////////
 bool Material::setTexture(const Common::String &filename, bool adoptName) {
 	if (adoptName) {
-		setName(PathUtil::getFileName(filename).c_str());
+		setName(PathUtil::getFileNameWithoutExtension(filename).c_str());
 	}
 
 	_textureFilename = filename;
@@ -93,7 +93,7 @@ bool Material::setTexture(const Common::String &filename, bool adoptName) {
 //////////////////////////////////////////////////////////////////////////
 bool Material::setSprite(BaseSprite *sprite, bool adoptName) {
 	if (adoptName) {
-		setName(PathUtil::getFileName(sprite->getFilename()).c_str());
+		setName(PathUtil::getFileNameWithoutExtension(sprite->getFilename()).c_str());
 	}
 
 	_textureFilename = sprite->getFilename();
@@ -113,7 +113,7 @@ bool Material::setSprite(BaseSprite *sprite, bool adoptName) {
 //////////////////////////////////////////////////////////////////////////
 bool Material::setTheora(VideoTheoraPlayer *theora, bool adoptName) {
 	if (adoptName) {
-		setName(PathUtil::getFileName(theora->_filename).c_str());
+		setName(PathUtil::getFileNameWithoutExtension(theora->_filename).c_str());
 	}
 	_textureFilename = theora->_filename;