Merge remote-tracking branch 'refs/remotes/Fluorohydride/master'

gframe/client_field.cpp

@@ -211,14 +211,15 @@ void ClientField::AddCard(ClientCard* pcard, int controler, int location, int se
 			pcard->sequence = extra[controler].size() - 1;
 		} else {
 			extra[controler].push_back(0);
-			for (int i = extra[controler].size() - 1; i > extra[controler].size() - extra_p_count[controler] - 1; --i) {
+			int p = extra[controler].size() - extra_p_count[controler] - 1;
+			for(int i = extra[controler].size() - 1; i > p; --i) {
 				extra[controler][i] = extra[controler][i - 1];
 				extra[controler][i]->sequence++;
 				extra[controler][i]->curPos += irr::core::vector3df(0, 0, 0.01f);
 				extra[controler][i]->mTransform.setTranslation(extra[controler][i]->curPos);
 			}
-			extra[controler][extra[controler].size() - extra_p_count[controler] - 1] = pcard;
-			pcard->sequence = extra[controler].size() - extra_p_count[controler] - 1;
+			extra[controler][p] = pcard;
+			pcard->sequence = p;
 		}
 		if (pcard->position & POS_FACEUP)
 			extra_p_count[controler]++;

gframe/duelclient.cpp

@@ -2039,9 +2039,7 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
 			float shift = -0.15f;
 			if (player == 1) shift = 0.15f;
 			pcard->dPos = irr::core::vector3df(shift, 0, 0);
-			if(!mainGame->dField.deck_reversed)
-				pcard->dRot = irr::core::vector3df(0, 3.14159f / 5.0f, 0);
-			else pcard->dRot = irr::core::vector3df(0, 0, 0);
+			pcard->dRot = irr::core::vector3df(0, 3.14159f / 5.0f, 0);
 			pcard->is_moving = true;
 			pcard->aniFrame = 5;
 			mainGame->WaitFrameSignal(45);

gframe/game.cpp

@@ -17,7 +17,7 @@
 #include <dirent.h>
 #endif
 
-unsigned short PRO_VERSION = 0x1341;
+unsigned short PRO_VERSION = 0x1342;
 
 namespace ygo {
 
@@ -110,7 +110,7 @@ bool Game::Initialize() {
 	wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));
-	btnServerMode = env->addButton(rect<s32>(10, 65, 270, 95), wMainMenu, BUTTON_SINGLE_MODE, dataManager.GetSysString(1201));
+	btnSingleMode = env->addButton(rect<s32>(10, 65, 270, 95), wMainMenu, BUTTON_SINGLE_MODE, dataManager.GetSysString(1201));
 	btnReplayMode = env->addButton(rect<s32>(10, 100, 270, 130), wMainMenu, BUTTON_REPLAY_MODE, dataManager.GetSysString(1202));
 //	btnTestMode = env->addButton(rect<s32>(10, 135, 270, 165), wMainMenu, BUTTON_TEST_MODE, dataManager.GetSysString(1203));
 	btnDeckEdit = env->addButton(rect<s32>(10, 135, 270, 165), wMainMenu, BUTTON_DECK_EDIT, dataManager.GetSysString(1204));

gframe/game.h

@@ -254,7 +254,7 @@ public:
 	//main menu
 	irr::gui::IGUIWindow* wMainMenu;
 	irr::gui::IGUIButton* btnLanMode;
-	irr::gui::IGUIButton* btnServerMode;
+	irr::gui::IGUIButton* btnSingleMode;
 	irr::gui::IGUIButton* btnReplayMode;
 	irr::gui::IGUIButton* btnTestMode;
 	irr::gui::IGUIButton* btnDeckEdit;

gframe/gframe.cpp

@@ -151,7 +151,7 @@ int main(int argc, char* argv[]) {
 				open_file = true;
 				GetParameterW(open_file_name, &argv[i + 1][0]);
 			}
-			ClickButton(ygo::mainGame->btnServerMode);
+			ClickButton(ygo::mainGame->btnSingleMode);
 			if(open_file)
 				ClickButton(ygo::mainGame->btnLoadSinglePlay);
 			break;