Mercurial > mm7

changeset 1464:b870630761df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Mon, 26 Aug 2013 10:39:10 +0600
parents b330df6a2183
children 090ff42290c4
files LOD.h UI/UICharacter.cpp
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/LOD.h	Sun Aug 11 12:09:33 2013 +0600
+++ b/LOD.h	Mon Aug 26 10:39:10 2013 +0600
@@ -168,8 +168,9 @@
   inline struct Texture *GetTexture(int idx)
   {
     assert(idx < 1000);
-    if (idx == -1) return nullptr; // we need to return dummy texture here
-    return pTextures + idx;
+    if (idx == -1) 
+      return nullptr; // we need to return dummy texture here
+    return &pTextures[idx];
   }
 
 
--- a/UI/UICharacter.cpp	Sun Aug 11 12:09:33 2013 +0600
+++ b/UI/UICharacter.cpp	Mon Aug 26 10:39:10 2013 +0600
@@ -185,7 +185,7 @@
 unsigned int papredoll_dlhus[4];
 unsigned int papredoll_dlhs[4];
 unsigned int papredoll_dbods[5];
-int paperdoll_armor_texture[4][17][3];
+int paperdoll_armor_texture[4][17][3];//0x511294
 //int paperdoll_array_51132C[165];
 unsigned int papredoll_dlaus[5];
 unsigned int papredoll_dlads[4];