Mercurial > mm7
comparison UI/Books/UISpellBook.cpp @ 1347:84db43e7db93
Merge
author | Grumpy7 |
---|---|
date | Fri, 12 Jul 2013 23:08:35 +0200 |
parents | 16036e3e2642 |
children | eb02a65e5c82 8557d021a31b |
comparison
equal
deleted
inserted
replaced
1346:1434b36f4bdb | 1347:84db43e7db93 |
---|---|
180 ++v4; | 180 ++v4; |
181 } | 181 } |
182 while ( v4 - 1 < 11 ); | 182 while ( v4 - 1 < 11 ); |
183 } | 183 } |
184 | 184 |
185 | |
186 v9 = pMouse->GetCursorPos(&a2); | 185 v9 = pMouse->GetCursorPos(&a2); |
187 v10 = pRenderer->pActiveZBuffer[v9->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v24)->y]] & 0xFFFF; | 186 v10 = pRenderer->pActiveZBuffer[v9->x + pSRZBufferLineOffsets[pMouse->GetCursorPos(&v24)->y]] & 0xFFFF; |
188 if ( v10 ) | 187 if ( v10 ) |
189 { | 188 { |
190 v11 = dword_5063D8[v10]; | 189 v11 = dword_5063D8[v10]; |