Mercurial > mm7
comparison GUI/UI/UIPopup.cpp @ 2544:c674d547cc7c
GUIWindow switch logic refactored into behaviour classes
author | a.parshin |
---|---|
date | Mon, 11 May 2015 09:51:04 +0200 |
parents | a902abdfc7f2 |
children | 87e5590d034b |
comparison
equal
deleted
inserted
replaced
2543:b6140dfeac27 | 2544:c674d547cc7c |
---|---|
1480 { | 1480 { |
1481 if ( (signed int)pX > 467 && current_screen_type != SCREEN_E ) | 1481 if ( (signed int)pX > 467 && current_screen_type != SCREEN_E ) |
1482 Inventory_ItemPopupAndAlchemy(); | 1482 Inventory_ItemPopupAndAlchemy(); |
1483 else if ( (signed int)pY >= 345 ) | 1483 else if ( (signed int)pY >= 345 ) |
1484 break; | 1484 break; |
1485 else if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 100 )//2DEvent - CharacerScreenStats | 1485 else if (current_character_screen_window == WINDOW_CharacterWindow_Stats)//2DEvent - CharacerScreenStats |
1486 CharacterUI_StatsTab_ShowHint(); | 1486 CharacterUI_StatsTab_ShowHint(); |
1487 else if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 101 )//2DEvent - CharacerScreenSkills | 1487 else if (current_character_screen_window == WINDOW_CharacterWindow_Skills)//2DEvent - CharacerScreenSkills |
1488 CharacterUI_SkillsTab_ShowHint(); | 1488 CharacterUI_SkillsTab_ShowHint(); |
1489 else if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 103 )//2DEvent - CharacerScreenInventory | 1489 else if (current_character_screen_window == WINDOW_CharacterWindow_Inventory)//2DEvent - CharacerScreenInventory |
1490 Inventory_ItemPopupAndAlchemy(); | 1490 Inventory_ItemPopupAndAlchemy(); |
1491 break; | 1491 break; |
1492 } | 1492 } |
1493 case SCREEN_SPELL_BOOK: | 1493 case SCREEN_SPELL_BOOK: |
1494 { | 1494 { |