Mercurial > mm7

diff Events.cpp @ 898:10fa7dad1391

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DrawPaperdoll clean
author Ritor1
date Mon, 15 Apr 2013 16:36:56 +0600
parents b66abf8b7d50
children 5a2dbb00c399
line wrap: on
line diff
--- a/Events.cpp	Thu Apr 04 09:35:58 2013 +0600
+++ b/Events.cpp	Mon Apr 15 16:36:56 2013 +0600
@@ -401,7 +401,7 @@
 						if ( v128 == 3 )
 							pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen;
 						if ( v128 == 13 )
-							pVideoPlayer->_4BF28F(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u);
+							pVideoPlayer->OpenHouseMovie(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u);
 						}
 					if (pAsyncMouse)
 						pAsyncMouse->Resume();
@@ -424,7 +424,7 @@
 						if ( v128 == 3 )
 							pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen;
 						if ( v128 == 13 )
-							pVideoPlayer->_4BF28F(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u);
+							pVideoPlayer->OpenHouseMovie(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u);
 						}
 					if (pAsyncMouse)
 						pAsyncMouse->Resume();
@@ -448,7 +448,7 @@
 					if ( v128 == 3 )
 						pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen;
 					if ( v128 == 13 )
-						pVideoPlayer->_4BF28F(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u);
+						pVideoPlayer->OpenHouseMovie(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u);
 					}
 				if (pAsyncMouse)
 					pAsyncMouse->Resume();
@@ -865,7 +865,7 @@
 					{
 						if ( *(int *)v69 && (int)&pPlayers[uActiveCharacter]->pInventoryItems[v69] == pValue )
 						{
-							*(&pPlayers[uActiveCharacter]->pEquipment.uOffHand + v68) = 0;
+							*(&pPlayers[uActiveCharacter]->pEquipment.uShield + v68) = 0;
 							++curr_seq_num;
 							v4 = v124;
 							break;
@@ -893,7 +893,7 @@
 							if ( v73 >= 16 )
 								break;
 						}
-						*(&pPlayers[i]->pEquipment.uOffHand + v73) = 0;
+						*(&pPlayers[i]->pEquipment.uShield + v73) = 0;
 					}
 				}
 				if ( player_choose <= 3 )