Merge branch 'master' into server

f38ab540 · nanahira · 9225c657 · 01263ff2 · f38ab540
Commit f38ab540 authored Jan 04, 2020 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

gframe/game.h gframe/game.h +1 -1

No files found.
--- a/gframe/game.h
+++ b/gframe/game.h
@@ -840,7 +840,7 @@ extern HostInfo game_info;
 #define TEXTURE_ACTIVATE			6

 #ifndef DEFAULT_DUEL_RULE
-#define DEFAULT_DUEL_RULE			4
+#define DEFAULT_DUEL_RULE			5
 #endif

 #define CARD_ARTWORK_VERSIONS_OFFSET	10