update

gframe/deck_con.cpp

@@ -76,7 +76,9 @@ void DeckBuilder::Initialize() {
 	hovered_code = 0;
 	hovered_pos = 0;
 	hovered_seq = -1;
+	is_lastcard = 0;
 	is_draging = false;
+	is_starting_dragging = false;
 	prev_deck = mainGame->cbDBDecks->getSelected();
 	prev_operation = 0;
 	is_modified = false;
@@ -487,25 +489,20 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				if(!check_limit(draging_pointer))
 					break;
 			}
-			if(hovered_pos == 1)
-				pop_main(hovered_seq);
-			else if(hovered_pos == 2)
-				pop_extra(hovered_seq);
-			else if(hovered_pos == 3)
-				pop_side(hovered_seq);
-			is_draging = true;
+			is_starting_dragging = true;
 			break;
 		}
 		case irr::EMIE_LMOUSE_LEFT_UP: {
+			is_starting_dragging = false;
 			if(!is_draging)
 				break;
 			bool pushed = false;
 			if(hovered_pos == 1)
 				pushed = push_main(draging_pointer, hovered_seq);
 			else if(hovered_pos == 2)
-				pushed = push_extra(draging_pointer, hovered_seq);
+				pushed = push_extra(draging_pointer, hovered_seq + is_lastcard);
 			else if(hovered_pos == 3)
-				pushed = push_side(draging_pointer, hovered_seq);
+				pushed = push_side(draging_pointer, hovered_seq + is_lastcard);
 			else if(hovered_pos == 4 && !mainGame->is_siding)
 				pushed = true;
 			if(!pushed) {
@@ -603,6 +600,16 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 			break;
 		}
 		case irr::EMIE_MOUSE_MOVED: {
+			if(is_starting_dragging) {
+				is_draging = true;
+				if(hovered_pos == 1)
+					pop_main(hovered_seq);
+				else if(hovered_pos == 2)
+					pop_extra(hovered_seq);
+				else if(hovered_pos == 3)
+					pop_side(hovered_seq);
+				is_starting_dragging = false;
+			}
 			mouse_pos.set(event.MouseInput.X, event.MouseInput.Y);
 			GetHoveredCard();
 			break;
@@ -640,6 +647,7 @@ void DeckBuilder::GetHoveredCard() {
 	int pre_code = hovered_code;
 	hovered_pos = 0;
 	hovered_code = 0;
+	is_lastcard = 0;
 	if(x >= 314 && x <= 794) {
 		if(y >= 164 && y <= 435) {
 			int lx = 10, px, py = (y - 164) / 68;
@@ -671,6 +679,8 @@ void DeckBuilder::GetHoveredCard() {
 				hovered_code = 0;
 			} else {
 				hovered_code = deckManager.current_deck.extra[hovered_seq]->first;
+				if(x >= 772)
+					is_lastcard = 1;
 			}
 		} else if (y >= 564 && y <= 628) {
 			int lx = deckManager.current_deck.side.size();
@@ -686,6 +696,8 @@ void DeckBuilder::GetHoveredCard() {
 				hovered_code = 0;
 			} else {
 				hovered_code = deckManager.current_deck.side[hovered_seq]->first;
+				if(x >= 772)
+					is_lastcard = 1;
 			}
 		}
 	} else if(x >= 810 && x <= 995 && y >= 165 && y <= 626) {
@@ -779,7 +791,8 @@ void DeckBuilder::FilterCards() {
 			if(filter_scltype) {
 				if((filter_scltype == 1 && data.lscale != filter_scl) || (filter_scltype == 2 && data.lscale < filter_scl)
 				        || (filter_scltype == 3 && data.lscale <= filter_scl) || (filter_scltype == 4 && (data.lscale > filter_scl || data.lscale == 0))
-				        || (filter_scltype == 5 && (data.lscale >= filter_scl || data.lscale == 0)) || filter_scltype == 6)
+				        || (filter_scltype == 5 && (data.lscale >= filter_scl || data.lscale == 0)) || filter_scltype == 6
+				        || !(data.type & TYPE_PENDULUM))
 					continue;
 			}
 			break;

gframe/deck_con.h

@@ -49,8 +49,10 @@ public:
 	int hovered_code;
 	int hovered_pos;
 	int hovered_seq;
+	int is_lastcard;
 	int click_pos;
 	bool is_draging;
+	bool is_starting_dragging;
 	int dragx;
 	int dragy;
 	size_t pre_mainc;

gframe/duelclient.cpp

@@ -295,6 +295,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		mainGame->deckBuilder.result_string[1] = 0;
 		mainGame->deckBuilder.results.clear();
 		mainGame->deckBuilder.is_draging = false;
+		mainGame->deckBuilder.is_starting_dragging = false;
 		mainGame->deckBuilder.pre_mainc = deckManager.current_deck.main.size();
 		mainGame->deckBuilder.pre_extrac = deckManager.current_deck.extra.size();
 		mainGame->deckBuilder.pre_sidec = deckManager.current_deck.side.size();
@@ -359,6 +360,8 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		}
 		for(int i = 0; i < 4; ++i)
 			mainGame->chkHostPrepReady[i]->setChecked(false);
+		mainGame->btnHostPrepReady->setVisible(true);
+		mainGame->btnHostPrepNotReady->setVisible(false);
 		mainGame->dInfo.time_limit = pkt->info.time_limit;
 		mainGame->dInfo.time_left[0] = 0;
 		mainGame->dInfo.time_left[1] = 0;
@@ -411,9 +414,18 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 				mainGame->chkHostPrepReady[selftype]->setChecked(false);
 				mainGame->btnHostPrepDuelist->setEnabled(false);
 				mainGame->btnHostPrepOB->setEnabled(true);
+				mainGame->btnHostPrepReady->setVisible(true);
+				mainGame->btnHostPrepNotReady->setVisible(false);
 			} else {
 				mainGame->btnHostPrepDuelist->setEnabled(true);
 				mainGame->btnHostPrepOB->setEnabled(false);
+				mainGame->btnHostPrepReady->setVisible(false);
+				mainGame->btnHostPrepNotReady->setVisible(false);
+			}
+			if(mainGame->chkHostPrepReady[0]->isChecked() && mainGame->chkHostPrepReady[1]->isChecked()) {
+				mainGame->btnHostPrepStart->setEnabled(true);
+			} else {
+				mainGame->btnHostPrepStart->setEnabled(false);
 			}
 		} else {
 			if(selftype < 4) {
@@ -435,8 +447,18 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 			if(selftype < 4) {
 				mainGame->chkHostPrepReady[selftype]->setEnabled(true);
 				mainGame->btnHostPrepOB->setEnabled(true);
+				mainGame->btnHostPrepReady->setVisible(true);
+				mainGame->btnHostPrepNotReady->setVisible(false);
 			} else {
 				mainGame->btnHostPrepOB->setEnabled(false);
+				mainGame->btnHostPrepReady->setVisible(false);
+				mainGame->btnHostPrepNotReady->setVisible(false);
+			}
+			if(mainGame->chkHostPrepReady[0]->isChecked() && mainGame->chkHostPrepReady[1]->isChecked()
+				&& mainGame->chkHostPrepReady[2]->isChecked() && mainGame->chkHostPrepReady[3]->isChecked()) {
+				mainGame->btnHostPrepStart->setEnabled(true);
+			} else {
+				mainGame->btnHostPrepStart->setEnabled(false);
 			}
 		}
 		mainGame->dInfo.player_type = selftype;
@@ -674,8 +696,16 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 				BufferIO::CopyWStr(prename, mainGame->dInfo.clientname_tag, 20);
 		} else if(state == PLAYERCHANGE_READY) {
 			mainGame->chkHostPrepReady[pos]->setChecked(true);
+			if(pos == selftype) {
+				mainGame->btnHostPrepReady->setVisible(false);
+				mainGame->btnHostPrepNotReady->setVisible(true);
+			}
 		} else if(state == PLAYERCHANGE_NOTREADY) {
 			mainGame->chkHostPrepReady[pos]->setChecked(false);
+			if(pos == selftype) {
+				mainGame->btnHostPrepReady->setVisible(true);
+				mainGame->btnHostPrepNotReady->setVisible(false);
+			}
 		} else if(state == PLAYERCHANGE_LEAVE) {
 			mainGame->stHostPrepDuelist[pos]->setText(L"");
 			mainGame->chkHostPrepReady[pos]->setChecked(false);
@@ -687,6 +717,12 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 			mainGame->chkHostPrepReady[pos]->setChecked(false);
 			mainGame->stHostPrepOB->setText(watchbuf);
 		}
+		if(mainGame->chkHostPrepReady[0]->isChecked() && mainGame->chkHostPrepReady[1]->isChecked()
+			&& (!mainGame->dInfo.isTag || (mainGame->chkHostPrepReady[2]->isChecked() && mainGame->chkHostPrepReady[3]->isChecked()))) {
+			mainGame->btnHostPrepStart->setEnabled(true);
+		} else {
+			mainGame->btnHostPrepStart->setEnabled(false);
+		}
 		mainGame->gMutex.Unlock();
 		break;
 	}
@@ -1108,14 +1144,14 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			mainGame->dField.highlighting_card = pcard;
 		}
 		int desc = BufferIO::ReadInt32(pbuf);
- 		if(desc == 0) {
- 			wchar_t ynbuf[256];
- 			myswprintf(ynbuf, dataManager.GetSysString(200), dataManager.FormatLocation(l, s), dataManager.GetName(code));
- 			myswprintf(textBuffer, L"%ls\n%ls", event_string, ynbuf);
- 		} else if(desc < 2048) {
- 			myswprintf(textBuffer, dataManager.GetSysString(desc), dataManager.GetName(code));
- 		} else {
- 			myswprintf(textBuffer, dataManager.GetDesc(desc), dataManager.GetName(code));
+		if(desc == 0) {
+			wchar_t ynbuf[256];
+			myswprintf(ynbuf, dataManager.GetSysString(200), dataManager.FormatLocation(l, s), dataManager.GetName(code));
+			myswprintf(textBuffer, L"%ls\n%ls", event_string, ynbuf);
+		} else if(desc < 2048) {
+			myswprintf(textBuffer, dataManager.GetSysString(desc), dataManager.GetName(code));
+		} else {
+			myswprintf(textBuffer, dataManager.GetDesc(desc), dataManager.GetName(code));
 		}
 		mainGame->gMutex.Lock();
 		mainGame->SetStaticText(mainGame->stQMessage, 310, mainGame->textFont, textBuffer);

gframe/game.cpp

@@ -246,8 +246,11 @@ bool Game::Initialize() {
 	env->addStaticText(dataManager.GetSysString(1254), rect<s32>(10, 235, 110, 255), false, false, wHostPrepare);
 	cbDeckSelect = env->addComboBox(rect<s32>(120, 230, 270, 255), wHostPrepare);
 	cbDeckSelect->setMaxSelectionRows(10);
+	btnHostPrepReady = env->addButton(rect<s32>(170, 180, 270, 205), wHostPrepare, BUTTON_HP_READY, dataManager.GetSysString(1218));
+	btnHostPrepNotReady = env->addButton(rect<s32>(170, 180, 270, 205), wHostPrepare, BUTTON_HP_NOTREADY, dataManager.GetSysString(1219));
+	btnHostPrepNotReady->setVisible(false);
 	btnHostPrepStart = env->addButton(rect<s32>(230, 280, 340, 305), wHostPrepare, BUTTON_HP_START, dataManager.GetSysString(1215));
-	btnHostPrepCancel = env->addButton(rect<s32>(350, 280, 460, 305), wHostPrepare, BUTTON_HP_CANCEL, dataManager.GetSysString(1212));
+	btnHostPrepCancel = env->addButton(rect<s32>(350, 280, 460, 305), wHostPrepare, BUTTON_HP_CANCEL, dataManager.GetSysString(1210));
 	//img
 	wCardImg = env->addStaticText(L"", rect<s32>(1, 1, 199, 273), true, false, 0, -1, true);
 	wCardImg->setBackgroundColor(0xc0c0c0c0);
@@ -327,7 +330,7 @@ bool Game::Initialize() {
 	chkIgnoreDeckChanges = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260, posY + 25), tabSystem, -1, dataManager.GetSysString(1357));
 	chkIgnoreDeckChanges->setChecked(gameConf.chkIgnoreDeckChanges != 0);
 	posY += 30;
-	chkAutoSearch = env->addCheckBox(false, rect<s32>(posX, posY, posX + 225, posY + 25), tabSystem, CHECKBOX_AUTO_SEARCH, dataManager.GetSysString(1358));
+	chkAutoSearch = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260, posY + 25), tabSystem, CHECKBOX_AUTO_SEARCH, dataManager.GetSysString(1358));
 	chkAutoSearch->setChecked(gameConf.auto_search_limit >= 0);
 	//
 	wHand = env->addWindow(rect<s32>(500, 450, 825, 605), false, L"");
@@ -643,12 +646,12 @@ bool Game::Initialize() {
 	btnChainIgnore->setVisible(false);
 	btnChainAlways->setVisible(false);
 	btnChainWhenAvail->setVisible(false);
-	//cancel or finish
-	btnCancelOrFinish = env->addButton(rect<s32>(205, 230, 295, 265), 0, BUTTON_CANCEL_OR_FINISH, dataManager.GetSysString(1295));
-	btnCancelOrFinish->setVisible(false);
 	//shuffle
 	btnShuffle = env->addButton(rect<s32>(205, 230, 295, 265), 0, BUTTON_CMD_SHUFFLE, dataManager.GetSysString(1297));
 	btnShuffle->setVisible(false);
+	//cancel or finish
+	btnCancelOrFinish = env->addButton(rect<s32>(205, 230, 295, 265), 0, BUTTON_CANCEL_OR_FINISH, dataManager.GetSysString(1295));
+	btnCancelOrFinish->setVisible(false);
 	//leave/surrender/exit
 	btnLeaveGame = env->addButton(rect<s32>(205, 5, 295, 80), 0, BUTTON_LEAVE_GAME, L"");
 	btnLeaveGame->setVisible(false);

gframe/game.h

@@ -267,6 +267,8 @@ public:
 	irr::gui::IGUIComboBox* cbDeckSelect;
 	irr::gui::IGUIStaticText* stHostPrepRule;
 	irr::gui::IGUIStaticText* stHostPrepOB;
+	irr::gui::IGUIButton* btnHostPrepReady;
+	irr::gui::IGUIButton* btnHostPrepNotReady;
 	irr::gui::IGUIButton* btnHostPrepStart;
 	irr::gui::IGUIButton* btnHostPrepCancel;
 	//replay
@@ -480,6 +482,8 @@ extern unsigned char draw_count;
 #define BUTTON_HP_CANCEL			123
 #define BUTTON_HP_KICK				124
 #define CHECKBOX_HP_READY			125
+#define BUTTON_HP_READY				126
+#define BUTTON_HP_NOTREADY			127
 #define LISTBOX_REPLAY_LIST			130
 #define BUTTON_LOAD_REPLAY			131
 #define BUTTON_CANCEL_REPLAY		132

gframe/gframe.cpp

@@ -37,11 +37,13 @@ void ClickButton(irr::gui::IGUIElement* btn) {
 */
 int main(int argc, char* argv[]) {
 #ifdef _WIN32
+#ifndef _DEBUG
 	wchar_t exepath[MAX_PATH];
 	GetModuleFileNameW(NULL, exepath, MAX_PATH);
 	wchar_t* p = wcsrchr(exepath, '\\');
 	*p = '\0';
 	SetCurrentDirectoryW(exepath);
+#endif //_DEBUG
 #endif //_WIN32
 #ifdef _WIN32
 	WORD wVersionRequested;

gframe/menu_handler.cpp

@@ -10,6 +10,21 @@
 
 namespace ygo {
 
+void UpdateDeck() {
+	BufferIO::CopyWStr(mainGame->cbDeckSelect->getItem(mainGame->cbDeckSelect->getSelected()),
+		mainGame->gameConf.lastdeck, 64);
+	char deckbuf[1024];
+	char* pdeck = deckbuf;
+	BufferIO::WriteInt32(pdeck, deckManager.current_deck.main.size() + deckManager.current_deck.extra.size());
+	BufferIO::WriteInt32(pdeck, deckManager.current_deck.side.size());
+	for(size_t i = 0; i < deckManager.current_deck.main.size(); ++i)
+		BufferIO::WriteInt32(pdeck, deckManager.current_deck.main[i]->first);
+	for(size_t i = 0; i < deckManager.current_deck.extra.size(); ++i)
+		BufferIO::WriteInt32(pdeck, deckManager.current_deck.extra[i]->first);
+	for(size_t i = 0; i < deckManager.current_deck.side.size(); ++i)
+		BufferIO::WriteInt32(pdeck, deckManager.current_deck.side[i]->first);
+	DuelClient::SendBufferToServer(CTOS_UPDATE_DECK, deckbuf, pdeck - deckbuf);
+}
 bool MenuHandler::OnEvent(const irr::SEvent& event) {
 	switch(event.EventType) {
 	case irr::EET_GUI_EVENT: {
@@ -128,10 +143,22 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				DuelClient::SendPacketToServer(CTOS_HS_KICK, csk);
 				break;
 			}
-			case BUTTON_HP_START: {
-				if(!mainGame->chkHostPrepReady[0]->isChecked()
-				        || !mainGame->chkHostPrepReady[1]->isChecked())
+			case BUTTON_HP_READY: {
+				if(mainGame->cbDeckSelect->getSelected() == -1 ||
+					!deckManager.LoadDeck(mainGame->cbDeckSelect->getItem(mainGame->cbDeckSelect->getSelected()))) {
 					break;
+				}
+				UpdateDeck();
+				DuelClient::SendPacketToServer(CTOS_HS_READY);
+				mainGame->cbDeckSelect->setEnabled(false);
+				break;
+			}
+			case BUTTON_HP_NOTREADY: {
+				DuelClient::SendPacketToServer(CTOS_HS_NOTREADY);
+				mainGame->cbDeckSelect->setEnabled(true);
+				break;
+			}
+			case BUTTON_HP_START: {
 				DuelClient::SendPacketToServer(CTOS_HS_START);
 				break;
 			}
@@ -308,19 +335,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 						static_cast<irr::gui::IGUICheckBox*>(caller)->setChecked(false);
 						break;
 					}
-					BufferIO::CopyWStr(mainGame->cbDeckSelect->getItem(mainGame->cbDeckSelect->getSelected()),
-					                   mainGame->gameConf.lastdeck, 64);
-					char deckbuf[1024];
-					char* pdeck = deckbuf;
-					BufferIO::WriteInt32(pdeck, deckManager.current_deck.main.size() + deckManager.current_deck.extra.size());
-					BufferIO::WriteInt32(pdeck, deckManager.current_deck.side.size());
-					for(size_t i = 0; i < deckManager.current_deck.main.size(); ++i)
-						BufferIO::WriteInt32(pdeck, deckManager.current_deck.main[i]->first);
-					for(size_t i = 0; i < deckManager.current_deck.extra.size(); ++i)
-						BufferIO::WriteInt32(pdeck, deckManager.current_deck.extra[i]->first);
-					for(size_t i = 0; i < deckManager.current_deck.side.size(); ++i)
-						BufferIO::WriteInt32(pdeck, deckManager.current_deck.side[i]->first);
-					DuelClient::SendBufferToServer(CTOS_UPDATE_DECK, deckbuf, pdeck - deckbuf);
+					UpdateDeck();
 					DuelClient::SendPacketToServer(CTOS_HS_READY);
 					mainGame->cbDeckSelect->setEnabled(false);
 				} else {

gframe/single_duel.cpp

@@ -202,7 +202,9 @@ void SingleDuel::LeaveGame(DuelPlayer* dp) {
 		} else {
 			EndDuel();
 			NetServer::StopServer();
+			return;
 		}
+		ready[host_pos] = false;
 		STOC_TypeChange sctc;
 		sctc.type = 0x10 | host_pos;
 		NetServer::SendPacketToPlayer(players[host_pos], STOC_TYPE_CHANGE, sctc);
@@ -349,6 +351,7 @@ void SingleDuel::PlayerReady(DuelPlayer* dp, bool is_ready) {
 	ready[dp->type] = is_ready;
 	STOC_HS_PlayerChange scpc;
 	scpc.status = (dp->type << 4) | (is_ready ? PLAYERCHANGE_READY : PLAYERCHANGE_NOTREADY);
+	NetServer::SendPacketToPlayer(players[dp->type], STOC_HS_PLAYER_CHANGE, scpc);
 	if(players[1 - dp->type])
 		NetServer::SendPacketToPlayer(players[1 - dp->type], STOC_HS_PLAYER_CHANGE, scpc);
 	for(auto pit = observers.begin(); pit != observers.end(); ++pit)
@@ -679,10 +682,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
 					NetServer::ReSendToPlayer(*oit);
 				break;
 			}
-			case 10:
-			//modded
-			case 11:
-			case 12: {
+			case 10: {
 				NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset);
 				NetServer::SendBufferToPlayer(players[1], STOC_GAME_MSG, offset, pbuf - offset);
 				for(auto oit = observers.begin(); oit != observers.end(); ++oit)

gframe/tag_duel.cpp

@@ -175,7 +175,9 @@ void TagDuel::LeaveGame(DuelPlayer* dp) {
 		} else {
 			EndDuel();
 			NetServer::StopServer();
+			return;
 		}
+		ready[host_pos] = false;
 		STOC_TypeChange sctc;
 		sctc.type = 0x10 | host_pos;
 		NetServer::SendPacketToPlayer(players[host_pos], STOC_TYPE_CHANGE, sctc);
@@ -317,7 +319,7 @@ void TagDuel::PlayerReady(DuelPlayer* dp, bool is_ready) {
 	STOC_HS_PlayerChange scpc;
 	scpc.status = (dp->type << 4) | (is_ready ? PLAYERCHANGE_READY : PLAYERCHANGE_NOTREADY);
 	for(int i = 0; i < 4; ++i)
-		if(players[i] && players[i] != dp)
+		if(players[i])
 			NetServer::SendPacketToPlayer(players[i], STOC_HS_PLAYER_CHANGE, scpc);
 	for(auto pit = observers.begin(); pit != observers.end(); ++pit)
 		NetServer::SendPacketToPlayer(*pit, STOC_HS_PLAYER_CHANGE, scpc);
@@ -600,10 +602,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
 			case 2:
 			case 3:
 			case 5:
-			case 10:
-			//modded
-			case 11:
-			case 12: {
+			case 10: {
 				NetServer::SendBufferToPlayer(cur_player[player], STOC_GAME_MSG, offset, pbuf - offset);
 				break;
 			}