Changeset 375 for ps

Timestamp:

06/03/04 02:20:20 (21 years ago)

Author:

janwas

Message:

fixed a few warnings; updated vfs file enum code

Location:

ps/trunk/source

Files:

• graphics/MiniPatch.cpp (modified) (1 diff)
• graphics/ObjectManager.cpp (modified) (1 diff)
• graphics/TextureManager.cpp (modified) (1 diff)
• gui/CGUI.cpp (modified) (1 diff)

ps/trunk/source/graphics/MiniPatch.cpp

@@ -28 +28 @@
 void CMiniPatch::GetTileIndex(u32& x,u32& z)
 {
-    u32 tindex=this-&m_Parent->m_MiniPatches[0][0];
+    const ptrdiff_t tindex = this - &m_Parent->m_MiniPatches[0][0];
     x=(m_Parent->m_X*16)+tindex%16;
     z=(m_Parent->m_Z*16)+tindex/16;

ps/trunk/source/graphics/ObjectManager.cpp

@@ -37 +37 @@
     SObjectType& type=m_ObjectTypes.back();
     type.m_Name=name;
-    type.m_Index=m_ObjectTypes.size()-1;
+    type.m_Index=(int)m_ObjectTypes.size()-1;
 }
 

ps/trunk/source/graphics/TextureManager.cpp

@@ -32 +32 @@
     STextureType& ttype=m_TerrainTextures.back();
     ttype.m_Name=name;
-    ttype.m_Index=m_TerrainTextures.size()-1;
+    ttype.m_Index=(int)m_TerrainTextures.size()-1;
 }
 

ps/trunk/source/gui/CGUI.cpp

@@ -755 +755 @@
             continue;
 
-        COverlayText txt(pos.x+it->m_Pos.x, pos.y+it->m_Pos.y, 
-                         z, it->m_Font, it->m_String, 
+        COverlayText txt((float)pos.x+it->m_Pos.x, (float)pos.y+it->m_Pos.y, 
+                         (int)z, it->m_Font, it->m_String, 
                          (it->m_UseCustomColor?it->m_Color:DefaultColor));
         render(&txt);