[Scummvm-git-logs] scummvm master -> 2d89a8cd80fae7f17782d1d0ce58c204008ff850

grisenti noreply at scummvm.org
Fri Dec 15 14:34:09 UTC 2023


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:
2d89a8cd80 HPL1: Remove always false conditional


Commit: 2d89a8cd80fae7f17782d1d0ce58c204008ff850
    https://github.com/scummvm/scummvm/commit/2d89a8cd80fae7f17782d1d0ce58c204008ff850
Author: grisenti (emanuele at grisenti.net)
Date: 2023-12-15T15:33:46+01:00

Commit Message:
HPL1: Remove always false conditional

Changed paths:
    engines/hpl1/engine/resources/MaterialManager.cpp


diff --git a/engines/hpl1/engine/resources/MaterialManager.cpp b/engines/hpl1/engine/resources/MaterialManager.cpp
index 3a97897752f..45e3be5b074 100644
--- a/engines/hpl1/engine/resources/MaterialManager.cpp
+++ b/engines/hpl1/engine/resources/MaterialManager.cpp
@@ -328,12 +328,6 @@ iMaterial *cMaterialManager::LoadFromFile(const tString &asName, const tString &
 		pTex->SetFrameTime(fFrameTime);
 		pTex->SetAnimMode(animMode);
 
-		if (pTex == NULL) {
-			hplDelete(pDoc);
-			hplDelete(pMat);
-			return NULL;
-		}
-
 		pTex->SetWrapS(wrap);
 		pTex->SetWrapT(wrap);
 




More information about the Scummvm-git-logs mailing list