Mercurial > mm7

comparison mm7_6.cpp @ 960:9a5db2cf999a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
UIMSG and WINDOW_Type
author Ritor1
date Sat, 04 May 2013 17:45:17 +0600
parents 9c2d08e42ed3
children 5a12082c803d
comparison
equal deleted inserted replaced
959:f8dd764fb7d7 960:9a5db2cf999a
2244 { 2244 {
2245 if ( a5 & 2 ) 2245 if ( a5 & 2 )
2246 { 2246 {
2247 if ( pGUIWindow_Settings ) 2247 if ( pGUIWindow_Settings )
2248 return; 2248 return;
2249 pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|0x2), (int)&pCastSpellInfo[result], 0); 2249 pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, WINDOW_1B, (int)&pCastSpellInfo[result], 0);
2250 pGUIWindow_Settings->CreateButton(0x34u, 0x1A6u, 0x23u, 0, 2, 0, UIMSG_45, 0, 0x31u, "", 0); 2250 pGUIWindow_Settings->CreateButton(0x34u, 0x1A6u, 0x23u, 0, 2, 0, UIMSG_45, 0, 0x31u, "", 0);
2251 pGUIWindow_Settings->CreateButton(0xA5u, 0x1A6u, 0x23u, 0, 2, 0, UIMSG_45, 1u, 0x32u, "", 0); 2251 pGUIWindow_Settings->CreateButton(0xA5u, 0x1A6u, 0x23u, 0, 2, 0, UIMSG_45, 1u, 0x32u, "", 0);
2252 pGUIWindow_Settings->CreateButton(0x118u, 0x1A6u, 0x23u, 0, 2, 0, UIMSG_45, 2u, 0x33u, "", 0); 2252 pGUIWindow_Settings->CreateButton(0x118u, 0x1A6u, 0x23u, 0, 2, 0, UIMSG_45, 2u, 0x33u, "", 0);
2253 pGUIWindow_Settings->CreateButton(0x186u, 0x1A6u, 0x23u, 0, 2, 0, UIMSG_45, 3u, 0x34u, "", 0); 2253 pGUIWindow_Settings->CreateButton(0x186u, 0x1A6u, 0x23u, 0, 2, 0, UIMSG_45, 3u, 0x34u, "", 0);
2254 sub_421B2C_PlaceInInventory_or_DropPickedItem(); 2254 sub_421B2C_PlaceInInventory_or_DropPickedItem();
2257 if ( a5 & 8 ) 2257 if ( a5 & 8 )
2258 { 2258 {
2259 if ( pGUIWindow_Settings ) 2259 if ( pGUIWindow_Settings )
2260 return; 2260 return;
2261 2261
2262 pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|0x2), (int)&pCastSpellInfo[result], 0); 2262 pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, WINDOW_1B, (int)&pCastSpellInfo[result], 0);
2263 pGUIWindow_Settings->CreateButton(game_viewport_x, game_viewport_y, game_viewport_width, game_viewport_height, 1, 0, UIMSG_46, 0, 0, "", 0); 2263 pGUIWindow_Settings->CreateButton(game_viewport_x, game_viewport_y, game_viewport_width, game_viewport_height, 1, 0, UIMSG_46, 0, 0, "", 0);
2264 sub_421B2C_PlaceInInventory_or_DropPickedItem(); 2264 sub_421B2C_PlaceInInventory_or_DropPickedItem();
2265 return; 2265 return;
2266 } 2266 }
2267 if ( a5 & 0x40 ) 2267 if ( a5 & 0x40 )
2268 { 2268 {
2269 if ( pGUIWindow_Settings ) 2269 if ( pGUIWindow_Settings )
2270 return; 2270 return;
2271 2271
2272 pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|0x2), (int)&pCastSpellInfo[result], 0); 2272 pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, WINDOW_1B, (int)&pCastSpellInfo[result], 0);
2273 pGUIWindow_Settings->CreateButton(game_viewport_x, game_viewport_y, game_viewport_width, game_viewport_height, 1, 0, UIMSG_BE, 0, 0, "", 0); 2273 pGUIWindow_Settings->CreateButton(game_viewport_x, game_viewport_y, game_viewport_width, game_viewport_height, 1, 0, UIMSG_BE, 0, 0, "", 0);
2274 sub_421B2C_PlaceInInventory_or_DropPickedItem(); 2274 sub_421B2C_PlaceInInventory_or_DropPickedItem();
2275 return; 2275 return;
2276 } 2276 }
2277 if ( (char)a5 < 0 ) 2277 if ( (char)a5 < 0 )
2289 } 2289 }
2290 if ( HIBYTE(a5) & 1 ) 2290 if ( HIBYTE(a5) & 1 )
2291 { 2291 {
2292 if ( pGUIWindow_Settings ) 2292 if ( pGUIWindow_Settings )
2293 return; 2293 return;
2294 pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|0x2), (int)&pCastSpellInfo[result], 0); 2294 pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, WINDOW_1B, (int)&pCastSpellInfo[result], 0);
2295 pGUIWindow_Settings->CreateButton(0x34u, 0x1A6u, 0x23u, 0, 2, 0, UIMSG_8D, 0, 0x31u, "", 0); 2295 pGUIWindow_Settings->CreateButton(0x34u, 0x1A6u, 0x23u, 0, 2, 0, UIMSG_8D, 0, 0x31u, "", 0);
2296 pGUIWindow_Settings->CreateButton(0xA5u, 0x1A6u, 0x23u, 0, 2, 0, UIMSG_8D, 1, 0x32u, "", 0); 2296 pGUIWindow_Settings->CreateButton(0xA5u, 0x1A6u, 0x23u, 0, 2, 0, UIMSG_8D, 1, 0x32u, "", 0);
2297 pGUIWindow_Settings->CreateButton(0x118u, 0x1A6u, 0x23u, 0, 2, 0, UIMSG_8D, 2, 0x33u, "", 0); 2297 pGUIWindow_Settings->CreateButton(0x118u, 0x1A6u, 0x23u, 0, 2, 0, UIMSG_8D, 2, 0x33u, "", 0);
2298 pGUIWindow_Settings->CreateButton(0x186u, 0x1A6u, 0x23u, 0, 2, 0, UIMSG_8D, 3, 0x34u, "", 0); 2298 pGUIWindow_Settings->CreateButton(0x186u, 0x1A6u, 0x23u, 0, 2, 0, UIMSG_8D, 3, 0x34u, "", 0);
2299 pGUIWindow_Settings->CreateButton(8, 8, game_viewport_width, game_viewport_height, 1, 0, UIMSG_8C, 0, 0, "", NULL); 2299 pGUIWindow_Settings->CreateButton(8, 8, game_viewport_width, game_viewport_height, 1, 0, UIMSG_8C, 0, 0, "", NULL);
2300 sub_421B2C_PlaceInInventory_or_DropPickedItem(); 2300 sub_421B2C_PlaceInInventory_or_DropPickedItem();
2301 } 2301 }
2302 if ( HIBYTE(a5) & 2 && !pGUIWindow_Settings ) 2302 if ( HIBYTE(a5) & 2 && !pGUIWindow_Settings )
2303 { 2303 {
2304 pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, (WindowType)(WINDOW_HouseInterior|0x2), (int)&pCastSpellInfo[result], 0); 2304 pGUIWindow_Settings = GUIWindow::Create(0, 0, 640, 480, WINDOW_1B, (int)&pCastSpellInfo[result], 0);
2305 pBtn_NPCLeft = pGUIWindow_Settings->CreateButton(469, 178, 2305 pBtn_NPCLeft = pGUIWindow_Settings->CreateButton(469, 178,
2306 pIcons_LOD->GetTexture(uTextureID_Btn_NPCLeft)->uTextureWidth, 2306 pIcons_LOD->GetTexture(uTextureID_Btn_NPCLeft)->uTextureWidth,
2307 pIcons_LOD->GetTexture(uTextureID_Btn_NPCLeft)->uTextureHeight, 2307 pIcons_LOD->GetTexture(uTextureID_Btn_NPCLeft)->uTextureHeight,
2308 1, 2308 1, 0, UIMSG_ScrollNPCPanel, 0, 0, "",
2309 0,
2310 UIMSG_ScrollNPCPanel, 0,
2311 0,
2312 "",
2313 pIcons_LOD->GetTexture(uTextureID_Btn_NPCLeft), 0); 2309 pIcons_LOD->GetTexture(uTextureID_Btn_NPCLeft), 0);
2314 pBtn_NPCRight = pGUIWindow_Settings->CreateButton(626, 178, 2310 pBtn_NPCRight = pGUIWindow_Settings->CreateButton(626, 178,
2315 pIcons_LOD->GetTexture(uTextureID_Btn_NPCRight)->uTextureWidth, 2311 pIcons_LOD->GetTexture(uTextureID_Btn_NPCRight)->uTextureWidth,
2316 pIcons_LOD->GetTexture(uTextureID_Btn_NPCRight)->uTextureHeight, 2312 pIcons_LOD->GetTexture(uTextureID_Btn_NPCRight)->uTextureHeight,
2317 1, 2313 1, 0, UIMSG_ScrollNPCPanel, 1, 0, "",
2318 0,
2319 UIMSG_ScrollNPCPanel, 1,
2320 0,
2321 "",
2322 pIcons_LOD->GetTexture(uTextureID_Btn_NPCRight), 0); 2314 pIcons_LOD->GetTexture(uTextureID_Btn_NPCRight), 0);
2323 pGUIWindow_Settings->CreateButton(0x1EBu, 149, 64, 74, 1, 0, UIMSG_8F, 4, 0x35u, "", 0); 2315 pGUIWindow_Settings->CreateButton(0x1EBu, 149, 64, 74, 1, 0, UIMSG_8F, 4, 0x35u, "", 0);
2324 pGUIWindow_Settings->CreateButton(0x231u, 149, 64, 74, 1, 0, UIMSG_8F, 5, 0x36u, "", 0); 2316 pGUIWindow_Settings->CreateButton(0x231u, 149, 64, 74, 1, 0, UIMSG_8F, 5, 0x36u, "", 0);
2325 } 2317 }
2326 } 2318 }