comparison Mouse.cpp @ 784:b3e08a496778

Merge
author Nomad
date Sun, 24 Mar 2013 21:15:01 +0200
parents 2a3fd4d89ec2
children 346f7069676a
comparison
equal deleted inserted replaced
783:b27dd658ea77 784:b3e08a496778
108 v4 = (int)pAsyncMouse; 108 v4 = (int)pAsyncMouse;
109 if (pAsyncMouse) 109 if (pAsyncMouse)
110 { 110 {
111 v10 = 0.0; 111 v10 = 0.0;
112 v5 = 0.0; 112 v5 = 0.0;
113 LABEL_12: 113 //LABEL_12:
114 v6 = v5; 114 v6 = v5;
115 pAsyncMouse->SetHotspot(v6, v10); 115 pAsyncMouse->SetHotspot(v6, v10);
116 goto LABEL_18; 116 if ( !pAsyncMouse || (pAsyncMouse->LoadCursor(pName), !pAsyncMouse) )
117 } 117 {
118 goto LABEL_20; 118 GetCursorPos(&Point);
119 SetCursorPos(Point.x, Point.y);
120 }
121 return;
122 }
123 GetCursorPos(&Point);
124 ClientToScreen(hWnd,&Point);
125 SetCursorPos(Point.x, Point.y);
126 return;
119 } 127 }
120 if ( !strcmp(pName, "MICON2") ) 128 if ( !strcmp(pName, "MICON2") )
121 { 129 {
122 v7 = (LONG)LoadCursorA(GetModuleHandleW(nullptr), "Target"); 130 v7 = (LONG)LoadCursorA(GetModuleHandleW(nullptr), "Target");
123 SetClassLongA(hWnd, -12, v7); 131 SetClassLongA(hWnd, -12, v7);
124 v4 = (int)pAsyncMouse; 132 v4 = (int)pAsyncMouse;
125 if (pAsyncMouse) 133 if (pAsyncMouse)
126 { 134 {
127 v10 = 14.0; 135 v10 = 14.0;
128 v5 = 14.0; 136 v5 = 14.0;
129 goto LABEL_12; 137 v6 = v5;
130 } 138 pAsyncMouse->SetHotspot(v6, v10);
131 LABEL_20: 139 if ( !pAsyncMouse || (pAsyncMouse->LoadCursor(pName), !pAsyncMouse) )
140 {
141 GetCursorPos(&Point);
142 SetCursorPos(Point.x, Point.y);
143 }
144 return;
145 }
146 //LABEL_20:
132 GetCursorPos(&Point); 147 GetCursorPos(&Point);
133 SetCursorPos(Point.x, Point.y); 148 SetCursorPos(Point.x, Point.y);
134 return; 149 return;
135 } 150 }
136 if ( !strcmp(pName, "MICON3") ) 151 if ( !strcmp(pName, "MICON3") )
137 { 152 {
138 v8 = (LONG)LoadCursorA(0, (LPCSTR)IDC_WAIT); 153 v8 = (LONG)LoadCursorA(0, (LPCSTR)IDC_WAIT);
139 SetClassLongA(hWnd, -12, v8); 154 SetClassLongA(hWnd, -12, v8);
140 } 155 }
141 LABEL_18: 156 //LABEL_18:
142 if ( !pAsyncMouse || (pAsyncMouse->LoadCursor(pName), !pAsyncMouse) ) 157 if ( !pAsyncMouse || (pAsyncMouse->LoadCursor(pName), !pAsyncMouse) )
143 goto LABEL_20; 158 {
159 GetCursorPos(&Point);
160 SetCursorPos(Point.x, Point.y);
161 }
144 } 162 }
145 // 506128: using guessed type int areWeLoadingTexture; 163 // 506128: using guessed type int areWeLoadingTexture;
146 164
147 //----- (00469AE4) -------------------------------------------------------- 165 //----- (00469AE4) --------------------------------------------------------
148 LONG Mouse::_469AE4() 166 LONG Mouse::_469AE4()