Merge branch 'patch-1' into test

gframe/event_handler.cpp

@@ -1006,6 +1006,9 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 					mainGame->ClearCardInfo(mcard->controler);
 				}
 			}
+			if(id == TEXT_CARD_LIST_TIP) {
+				mainGame->stCardListTip->setVisible(true);
+			}
 			break;
 		}
 		case irr::gui::EGET_ELEMENT_LEFT: {
@@ -1021,6 +1024,9 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				SetShowMark(mcard, false);
 				mainGame->stCardListTip->setVisible(false);
 			}
+			if(id == TEXT_CARD_LIST_TIP) {
+				mainGame->stCardListTip->setVisible(false);
+			}
 			break;
 		}
 		default:

gframe/game.cpp

@@ -709,7 +709,7 @@ bool Game::Initialize() {
 	stTip->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
 	stTip->setVisible(false);
 	//tip for cards in select / display list
-	stCardListTip = env->addStaticText(L"", rect<s32>(0, 0, 150, 150), false, true, wCardSelect, -1, true);
+	stCardListTip = env->addStaticText(L"", rect<s32>(0, 0, 150, 150), false, true, wCardSelect, TEXT_CARD_LIST_TIP, true);
 	stCardListTip->setBackgroundColor(0xc0ffffff);
 	stCardListTip->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
 	stCardListTip->setVisible(false);

gframe/game.h

@@ -598,6 +598,7 @@ extern Game* mainGame;
 #define BUTTON_CARD_4				234
 #define SCROLL_CARD_SELECT			235
 #define BUTTON_CARD_SEL_OK			236
+#define TEXT_CARD_LIST_TIP			237
 #define BUTTON_CMD_ACTIVATE			240
 #define BUTTON_CMD_SUMMON			241
 #define BUTTON_CMD_SPSUMMON			242