Mercurial > mm7
changeset 134:1c6d36681f7f
Margaret
author | Ritor1 |
---|---|
date | Mon, 11 Feb 2013 23:18:44 +0600 |
parents | 96f68985c64c |
children | 541f3df0aa55 c49af6426e37 |
files | Game.cpp Party.cpp |
diffstat | 2 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Game.cpp Mon Feb 11 22:56:43 2013 +0600 +++ b/Game.cpp Mon Feb 11 23:18:44 2013 +0600 @@ -1,5 +1,3 @@ -#include <assert.h> - #include "Game.h" #include "Party.h" #include "IndoorCamera.h" @@ -106,7 +104,6 @@ pIndoor->Draw(); else if (uCurrentlyLoadedLevelType == LEVEL_Outdoor) pOutdoor->Draw(); - else assert(false); if (pRenderer->pRenderD3D) { @@ -150,8 +147,8 @@ pOtherOverlayList->field_3EC = 0; viewparams->bRedrawGameUI = v5; GameUI_DrawPartySpells(); - if (v4 || pParty->pHirelings[0].evtc || pParty->pHirelings[1].evtc ) - DrawHiredNPCs();//Ritor1: it's temporarily + if (v4 || pParty->pHirelings[0]._anim_end_time || pParty->pHirelings[1]._anim_end_time ) + DrawHiredNPCs(); GameUI_DrawPortraits(v4); GameUI_DrawLifeManaBars(); GameUI_DrawCharacterSelectionFrame();
--- a/Party.cpp Mon Feb 11 22:56:43 2013 +0600 +++ b/Party.cpp Mon Feb 11 23:18:44 2013 +0600 @@ -303,6 +303,7 @@ pHireling1Name[0] = 0; pHireling2Name[0] = 0; + pParty->field_709 = 0; memset(pHirelings, 0, 2 * sizeof(*pHirelings)); strcpy(this->pPlayers[0].pName, pGlobalTXT_LocalizationStrings[509]); //Zoltan @@ -989,7 +990,7 @@ memset(hireling, 0, sizeof(*hireling)); pParty->field_709 = 0; - sub_44A56A();//Ritor1: it's temporarily + sub_44A56A(); viewparams->bRedrawGameUI = 1; } }