Merge branch 'develop' into server-develop

.ci/exec-macos-platform.sh

@@ -14,6 +14,8 @@ export VORBIS_INCLUDE_DIR=$PWD/miniaudio/external-built/include
 export VORBIS_LIB_DIR=$PWD/miniaudio/external-built/lib
 export OGG_INCLUDE_DIR=$PWD/miniaudio/external-built/include
 export OGG_LIB_DIR=$PWD/miniaudio/external-built/lib
+export ACLOCAL=aclocal
+export AUTOMAKE=automake
 
 ./.ci/libevent-prebuild.sh
 ./.ci/build-opus.sh
@@ -21,7 +23,7 @@ export OGG_LIB_DIR=$PWD/miniaudio/external-built/lib
 ./premake5 gmake --cc=clang --build-freetype --build-sqlite
 
 cd build
-make config=release -j$(nproc)
+make config=release -j$(sysctl -n hw.ncpu)
 cd ..
 
 mkdir ygopro-platforms

gframe/menu_handler.cpp

@@ -218,6 +218,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				break;
 			}
 			case BUTTON_LOAD_REPLAY: {
+				int start_turn = 1;
 				if(open_file) {
 					ReplayMode::cur_replay.OpenReplay(open_file_name);
 					open_file = false;
@@ -229,6 +230,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 					myswprintf(replay_path, L"./replay/%ls", mainGame->lstReplayList->getListItem(selected));
 					if (!ReplayMode::cur_replay.OpenReplay(replay_path))
 						break;
+					start_turn = std::wcstol(mainGame->ebRepStartTurn->getText(), nullptr, 10);
 				}
 				mainGame->ClearCardInfo();
 				mainGame->wCardImg->setVisible(true);
@@ -243,7 +245,6 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				mainGame->dField.Clear();
 				mainGame->HideElement(mainGame->wReplay);
 				mainGame->device->setEventReceiver(&mainGame->dField);
-				unsigned int start_turn = std::wcstol(mainGame->ebRepStartTurn->getText(), nullptr, 10);
 				if(start_turn == 1)
 					start_turn = 0;
 				ReplayMode::StartReplay(start_turn);
@@ -516,27 +517,27 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 					break;
 				wchar_t replay_path[256]{};
 				myswprintf(replay_path, L"./replay/%ls", mainGame->lstReplayList->getListItem(sel));
-				if (!ReplayMode::cur_replay.OpenReplay(replay_path)) {
+				if (!temp_replay.OpenReplay(replay_path)) {
 					mainGame->stReplayInfo->setText(L"Error");
 					break;
 				}
 				wchar_t infobuf[256]{};
 				std::wstring repinfo;
 				time_t curtime;
-				if(ReplayMode::cur_replay.pheader.flag & REPLAY_UNIFORM)
-					curtime = ReplayMode::cur_replay.pheader.start_time;
+				if(temp_replay.pheader.flag & REPLAY_UNIFORM)
+					curtime = temp_replay.pheader.start_time;
 				else
-					curtime = ReplayMode::cur_replay.pheader.seed;
+					curtime = temp_replay.pheader.seed;
 				std::wcsftime(infobuf, sizeof infobuf / sizeof infobuf[0], L"%Y/%m/%d %H:%M:%S\n", std::localtime(&curtime));
 				repinfo.append(infobuf);
-				if (ReplayMode::cur_replay.pheader.flag & REPLAY_SINGLE_MODE) {
+				if (temp_replay.pheader.flag & REPLAY_SINGLE_MODE) {
 					wchar_t path[256]{};
-					BufferIO::DecodeUTF8(ReplayMode::cur_replay.script_name.c_str(), path);
+					BufferIO::DecodeUTF8(temp_replay.script_name.c_str(), path);
 					repinfo.append(path);
 					repinfo.append(L"\n");
 				}
-				const auto& player_names = ReplayMode::cur_replay.players;
-				if(ReplayMode::cur_replay.pheader.flag & REPLAY_TAG)
+				const auto& player_names = temp_replay.players;
+				if(temp_replay.pheader.flag & REPLAY_TAG)
 					myswprintf(infobuf, L"%ls\n%ls\n===VS===\n%ls\n%ls\n", player_names[0].c_str(), player_names[1].c_str(), player_names[2].c_str(), player_names[3].c_str());
 				else
 					myswprintf(infobuf, L"%ls\n===VS===\n%ls\n", player_names[0].c_str(), player_names[1].c_str());

gframe/menu_handler.h

@@ -2,6 +2,7 @@
 #define MENU_HANDLER_H
 
 #include <irrlicht.h>
+#include "replay.h"
 
 namespace ygo {
 
@@ -10,7 +11,7 @@ public:
 	bool OnEvent(const irr::SEvent& event) override;
 	irr::s32 prev_operation{ 0 };
 	int prev_sel{ -1 };
-
+	Replay temp_replay;
 };
 
 }

gframe/replay.cpp

@@ -272,7 +272,11 @@ void Replay::Reset() {
 	script_name.clear();
 }
 void Replay::SkipInfo(){
-	data_position += info_offset;
+	if (data_position == 0)
+		data_position += info_offset;
+}
+bool Replay::IsReplaying() const {
+	return is_replaying;
 }
 bool Replay::ReadInfo() {
 	int player_count = (pheader.flag & REPLAY_TAG) ? 4 : 2;

gframe/replay.h

@@ -90,6 +90,7 @@ public:
 	void Rewind();
 	void Reset();
 	void SkipInfo();
+	bool IsReplaying() const;
 
 	FILE* fp{ nullptr };
 #ifdef _WIN32

gframe/replay_mode.h

@@ -25,7 +25,6 @@ private:
 public:
 	static Replay cur_replay;
 	
-public:
 	static bool StartReplay(int skipturn);
 	static void StopReplay(bool is_exiting = false);
 	static void SwapField();

ocgcore @ ab7ef30f

-Subproject commit 8ff6650aa51bc6b1031eeb7a4a127b1f664fb4d9
+Subproject commit ab7ef30f678a7356e0fca85b0091fcdf56581b35

script @ 540b9c33

-Subproject commit 31238bdbe0845e51286e0aa6ea7cc98fc1cd2735
+Subproject commit 540b9c33ef76d2905ee88c9d6e10da1e824b7b73