Mercurial > mm7
comparison mm7_3.cpp @ 552:bee46636df95
Merge
author | Nomad |
---|---|
date | Mon, 04 Mar 2013 20:29:31 +0200 |
parents | 214d9d47cf1f |
children | 9caf59edb1ee 7e8f5124056c 653724e9c234 |
comparison
equal
deleted
inserted
replaced
551:3b4a24fcd5a0 | 552:bee46636df95 |
---|---|
14456 ++v41; | 14456 ++v41; |
14457 } | 14457 } |
14458 while ( (signed int)v41 < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem ); | 14458 while ( (signed int)v41 < pDialogueWindow->pNumPresenceButton + pDialogueWindow->pStartingPosActiveItem ); |
14459 } | 14459 } |
14460 } | 14460 } |
14461 pRenderer->DrawTextureIndexed(471, 445, (Texture *)(uTextureID_506438 != -1 ? &pIcons_LOD->pTextures[uTextureID_506438] : 0)); | 14461 pRenderer->DrawTextureIndexed(471, 445, (Texture *)(uExitCancelTextureId != -1 ? &pIcons_LOD->pTextures[uExitCancelTextureId] : 0)); |
14462 } | 14462 } |
14463 | 14463 |
14464 //----- (004459F9) -------------------------------------------------------- | 14464 //----- (004459F9) -------------------------------------------------------- |
14465 NPCData *__fastcall GetNPCData(unsigned int npcid) | 14465 NPCData *__fastcall GetNPCData(unsigned int npcid) |
14466 { | 14466 { |