comparison mm7_5.cpp @ 320:0b2af9c5f70f

Merge
author Nomad
date Wed, 20 Feb 2013 02:56:46 +0200
parents 5a66be213cff 981fbe2da232
children 15decc249a94
comparison
equal deleted inserted replaced
319:5a66be213cff 320:0b2af9c5f70f
13542 13542
13543 for (uint i = 1; i < 12; ++i) 13543 for (uint i = 1; i < 12; ++i)
13544 { 13544 {
13545 if (v11[i]) 13545 if (v11[i])
13546 { 13546 {
13547 sprintf(pContainer, "SB%sS%02d", spellbook_texture_filename_suffices[school], pSpellbookSpellIndices[school][i]); 13547 sprintf(pContainer, "SB%cS%02d", spellbook_texture_filename_suffices[school], pSpellbookSpellIndices[school][i]);
13548 dword_506408[i] = pIcons_LOD->LoadTexturePtr(pContainer, TEXTURE_16BIT_PALETTE); 13548 dword_506408[i] = pIcons_LOD->LoadTexturePtr(pContainer, TEXTURE_16BIT_PALETTE);
13549 13549
13550 sprintf(pContainer, "SB%sC%02d", spellbook_texture_filename_suffices[school], pSpellbookSpellIndices[school][i]); 13550 sprintf(pContainer, "SB%cC%02d", spellbook_texture_filename_suffices[school], pSpellbookSpellIndices[school][i]);
13551 dword_5063D8[i] = pIcons_LOD->LoadTexturePtr(pContainer, TEXTURE_16BIT_PALETTE); 13551 dword_5063D8[i] = pIcons_LOD->LoadTexturePtr(pContainer, TEXTURE_16BIT_PALETTE);
13552 } 13552 }
13553 } 13553 }
13554 } 13554 }
13555 13555