made world changes work, and HUD colourising and other fun things

1 files changed, 34 insertions, 2 deletions

diff --git a/include/game.h b/include/game.h
index 41b925f..32b3a1d 100755
--- a/include/game.h
+++ b/include/game.h
@@ -560,7 +560,13 @@ namespace ut {
 		LinkListNode initialNode;

 	};

 

-	class Color : public GXColor { };

+	class Color : public GXColor {

+		public:

+			GXColor& operator=(const GXColor &other) {

+				*((u32*)this) = *((u32*)&other);

+				return *this;

+			}

+	};

 

 	class Rect {

 	public:

@@ -651,9 +657,35 @@ namespace lyt {
 	};

 

 

+	class TexMap {

+		public:

+			void *image, *palette;

+			u16 width, height;

+			f32 minLOD, magLOD;

+			u16 lodBias, palEntryNum;

+			struct

+			{

+				u32                 textureFormat:      4;

+				u32                 mipmap:             1;

+				u32                 wrapS:              2;

+				u32                 wrapT:              2;

+				u32                 minFilter:          3;

+				u32                 magFilter:          1;

+				u32                 biasClampEnable:    1;

+				u32                 edgeLODEnable:      1;

+				u32                 anisotropy:         2;

+				u32                 paletteFormat:      2;

+			}   mBits;

+	};

+

 	class Material {

 	public:

-		// ...

+		virtual ~Material();

+

+		// cheating a bit here

+		u8 _[0x3C];

+		// this is actually a pointer to more stuff, not just texmaps

+		TexMap *texMaps;

 	};

 

 	class Pane {