Merge branch 'master' into another

690e6245 · nanahira · 7dcc1b1d · 2e7cbcf2 · 690e6245 · 690e6245
Commit 690e6245 authored Sep 09, 2020 by nanahira
Showing with 5 additions and 5 deletions

cards.cdb cards.cdb +0 -0

gframe/replay_mode.cpp gframe/replay_mode.cpp +1 -1

ocgcore ocgcore +1 -1

premake/gframe/ygopro.rc premake/gframe/ygopro.rc +2 -2

script script +1 -1

No files found.
--- a/cards.cdb
+++ b/cards.cdb
--- a/gframe/replay_mode.cpp
+++ b/gframe/replay_mode.cpp
@@ -311,7 +311,7 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) {
 		mainGame->dInfo.curMsg = BufferIO::ReadUInt8(pbuf);
 		switch (mainGame->dInfo.curMsg) {
 		case MSG_RESET_TIME: {
-			pbuf += 2;
+			pbuf += 3;
 			break;
 		}
 		case MSG_RETRY: {

--- a/ocgcore @ 1b8b6c51
+++ b/ocgcore @ 1b8b6c51
-Subproject commit 1eedc8d1b7e4b36f7a78431351238b330b723aad
+Subproject commit 1b8b6c51acd68bf9a441f666316c787df0f6d967
--- a/premake/gframe/ygopro.rc
+++ b/premake/gframe/ygopro.rc
@@ -16,8 +16,8 @@ VALUE "InternalName", "KoishiPro"
 VALUE "LegalCopyright", "Copyright (C) 2019 Nanahira"
 VALUE "OriginalFilename", "ygopro_another.exe"
 VALUE "ProductName", "KoishiPro"
-VALUE "FileVersion", "IZANA"
-VALUE "ProductVersion", "IZANA"
+VALUE "FileVersion", "Replica"
+VALUE "ProductVersion", "Replica"
 END
 END
 BLOCK "VarFileInfo"

--- a/script @ 0895099e
+++ b/script @ 0895099e
-Subproject commit df1137c1d9ca27697cc9be63da50191df629a158
+Subproject commit 0895099e40fef293c6f7653836c5cdf7a36b9e61