diff --git a/src/textures/multipatchtexture.cpp b/src/textures/multipatchtexture.cpp
index 860c59b3a9..88d8815a6f 100644
--- a/src/textures/multipatchtexture.cpp
+++ b/src/textures/multipatchtexture.cpp
@@ -192,6 +192,7 @@ protected:
 		int UseType = TEX_Null;
 		bool Silent = false;
 		bool HasLine = false;
+		bool UseOffsets = false;
 		FScriptPosition sc;
 	};
 
@@ -1139,11 +1140,7 @@ void FMultiPatchTexture::ParsePatch(FScanner &sc, TexPart & part, TexInit &init)
 			}
 			else if (sc.Compare("useoffsets"))
 			{
-				if (part.Texture != NULL)
-				{
-					part.OriginX -= part.Texture->LeftOffset;
-					part.OriginY -= part.Texture->TopOffset;
-				}
+				init.UseOffsets = true;
 			}
 		}
 	}
@@ -1341,7 +1338,7 @@ void FMultiPatchTexture::ResolvePatches()
 				else
 				{
 					// If it could be resolved, just print a developer warning.
-					DPrintf(DMSG_WARNING, "Resolved self-referencing texture by picking an older entry for %s", Inits[i].TexName.GetChars());
+					DPrintf(DMSG_WARNING, "Resolved self-referencing texture by picking an older entry for %s\n", Inits[i].TexName.GetChars());
 				}
 			}
 
@@ -1358,6 +1355,11 @@ void FMultiPatchTexture::ResolvePatches()
 				Parts[i].Texture = TexMan[texno];
 				bComplex |= Parts[i].Texture->bComplex;
 				Parts[i].Texture->bKeepAround = true;
+				if (Inits[i].UseOffsets)
+				{
+					Parts[i].OriginX -= Parts[i].Texture->LeftOffset;
+					Parts[i].OriginY -= Parts[i].Texture->TopOffset;
+				}
 			}
 		}
 		for (int i = 0; i < NumParts; i++)
diff --git a/src/textures/texture.cpp b/src/textures/texture.cpp
index bc0eaffa35..760437db99 100644
--- a/src/textures/texture.cpp
+++ b/src/textures/texture.cpp
@@ -615,8 +615,6 @@ namespace
 PalEntry FTexture::GetSkyCapColor(bool bottom)
 {
 	PalEntry col;
-	int w;
-	int h;
 
 	if (!bSWSkyColorDone)
 	{