support ALL master rules

55c41bfa · nanahira · 643f6ca8 · 55c41bfa · df7f36d8 · ebd97b35
Commit 55c41bfa authored Jul 19, 2019 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

gframe/gframe.cpp gframe/gframe.cpp +8 -1

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/gframe/gframe.cpp
+++ b/gframe/gframe.cpp
@@ -86,8 +86,15 @@ int main(int argc, char* argv[]) {
 		ygo::game_info.mode = mode;
 		if(argv[5][0] == 'T')
 			ygo::game_info.duel_rule = DEFAULT_DUEL_RULE - 1;
+		else if(argv[5][0] == 'F')
+			ygo::game_info.duel_rule = DEFAULT_DUEL_RULE;
+		else {
+			int master_rule = atoi(argv[5]);
+			if(master_rule)
+				ygo::game_info.duel_rule = master_rule;
 			else
 				ygo::game_info.duel_rule = DEFAULT_DUEL_RULE;
+		}
 		if(argv[6][0] == 'T')
 			ygo::game_info.no_check_deck = true;
 		else

--- a/ocgcore @ df7f36d8
+++ b/ocgcore @ df7f36d8
-Subproject commit f79332d76d1b5774fe0105e541d34c7b40e3e54a
+Subproject commit df7f36d8847fc560991ad8bd80ad40ea8ab8361e
--- a/script @ ebd97b35
+++ b/script @ ebd97b35
-Subproject commit 573645ee990be70d8e7c7ae2fa8a8fad33e9d62e
+Subproject commit ebd97b358b20e82c334a972ae3eaa42ec91329eb