From 870dd12a6db8d8da732308b5b2b8347fa333dbdd Mon Sep 17 00:00:00 2001 From: Joshua Navarro Date: Sat, 5 Jan 2019 19:15:21 -0800 Subject: [PATCH] Updated CustomNpcs to have fixed texture references. Whether or notI use it is a different question. --- .../Framework/Graphics/DirectionalTexture.cs | 8 ++++---- .../Framework/ModularNPCS/AnimatedSpriteExtended.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/GeneralMods/CustomNPCFramework/Framework/Graphics/DirectionalTexture.cs b/GeneralMods/CustomNPCFramework/Framework/Graphics/DirectionalTexture.cs index d87d532e..524dd53b 100644 --- a/GeneralMods/CustomNPCFramework/Framework/Graphics/DirectionalTexture.cs +++ b/GeneralMods/CustomNPCFramework/Framework/Graphics/DirectionalTexture.cs @@ -63,10 +63,10 @@ namespace CustomNPCFramework.Framework.Graphics string upString = Class1.getShortenedDirectory(Path.Combine(path, info.upString + ".png")).Remove(0, 1); string downString = Class1.getShortenedDirectory(Path.Combine(path, info.downString + ".png")).Remove(0, 1); - this.leftTexture = new Texture2DExtended(helper, Class1.Manifest, leftString); - this.rightTexture = new Texture2DExtended(helper, Class1.Manifest, rightString); - this.upTexture = new Texture2DExtended(helper, Class1.Manifest, upString); - this.downTexture = new Texture2DExtended(helper, Class1.Manifest, downString); + this.leftTexture = new Texture2DExtended(helper, leftString); + this.rightTexture = new Texture2DExtended(helper, rightString); + this.upTexture = new Texture2DExtended(helper, upString); + this.downTexture = new Texture2DExtended(helper, downString); switch (direction) { diff --git a/GeneralMods/CustomNPCFramework/Framework/ModularNPCS/AnimatedSpriteExtended.cs b/GeneralMods/CustomNPCFramework/Framework/ModularNPCS/AnimatedSpriteExtended.cs index 9403c62b..36952747 100644 --- a/GeneralMods/CustomNPCFramework/Framework/ModularNPCS/AnimatedSpriteExtended.cs +++ b/GeneralMods/CustomNPCFramework/Framework/ModularNPCS/AnimatedSpriteExtended.cs @@ -19,7 +19,7 @@ namespace CustomNPCFramework.Framework.ModularNpcs { //Set the sprite texture this.sprite = new AnimatedSprite(); - Texture2D load = texture.Copy().texture; + Texture2D load = texture.Copy().Texture; var thing = Class1.ModHelper.Reflection.GetField(this.sprite, "Texture", true); thing.SetValue(load);