diff --git a/casino3d.inc b/casino3d.inc --- a/casino3d.inc +++ b/casino3d.inc @@ -149,1 +149,2 @@ include src_graphics\npc_mind_data.inc +include src_graphics\npc_life_data.inc @@ -5124,1 +5125,3 @@ include src_graphics\npc_mind.inc +include src_graphics\npc_life.inc +include src_graphics\npc_contracts.inc @@ -5240,1 +5243,7 @@ check_slots_mode: + cmp engineMode,MODE_NPC_DIALOG + jne @F + call HandleNpcDialog3D + call RenderNpcDialog3D + jmp present_frame +@@: diff --git a/src_graphics/hall_scene.inc b/src_graphics/hall_scene.inc --- a/src_graphics/hall_scene.inc +++ b/src_graphics/hall_scene.inc @@ -281,1 +281,2 @@ call InitCasinoNpcMind + call InitNpcLife3D @@ -624,2 +625,3 @@ invoke HallTarget3D, 27*FP_1,25*FP_1,INTERACT_BILLIARDS,OFFSET hallPoolPrompt3D + call CheckNpcInteractions3D ret @@ -640,1 +642,7 @@ TriggerHallInteraction3D PROC + cmp interactTargetId,INTERACT_NPC + jne @F + call OpenNpcDialog3D + ret +@@: + @@ -1207,1 +1215,4 @@ UpdatePatrons3D PROC uses ebx esi edi + call UpdateNpcLife3D + ret +IF 0 @@ -1281,1 +1292,2 @@ +ENDIF UpdatePatrons3D ENDP @@ -1284,2 +1296,3 @@ RenderPatrons3D PROC uses esi - xor esi, esi + call RenderNpcLife3D + mov esi,8 @@ -1291,1 +1304,1 @@ - cmp esi, HALL_PATRON_COUNT + cmp esi,12