From 17c18f3367c4735229f2cd036452b058f1f7419e Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 8 Apr 2018 19:16:46 +0200
Subject: [PATCH] - fixed typo in texture search function. This caused the
crosshairs not to be found.
---
src/g_statusbar/shared_sbar.cpp | 4 ----
src/textures/texturemanager.cpp | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/g_statusbar/shared_sbar.cpp b/src/g_statusbar/shared_sbar.cpp
index 535f01856..6ea45eda5 100644
--- a/src/g_statusbar/shared_sbar.cpp
+++ b/src/g_statusbar/shared_sbar.cpp
@@ -193,10 +193,6 @@ void ST_LoadCrosshair(bool alwaysload)
return;
}
- if (CrosshairImage != NULL)
- {
- CrosshairImage->Unload ();
- }
if (num == 0)
{
CrosshairNum = 0;
diff --git a/src/textures/texturemanager.cpp b/src/textures/texturemanager.cpp
index bc49c33db..c7dc35fd3 100644
--- a/src/textures/texturemanager.cpp
+++ b/src/textures/texturemanager.cpp
@@ -172,7 +172,7 @@ FTextureID FTextureManager::CheckForTexture (const char *name, ETextureType uset
if (stricmp (tex->Name, name) == 0 )
{
// If we look for short names, we must ignore any long name texture.
- if ((flags & TEXMAN_ShortNameOnly) && !tex->bFullNameTexture)
+ if ((flags & TEXMAN_ShortNameOnly) && tex->bFullNameTexture)
{
continue;
}