Merge branch 'master' into server

804da3bc · Momobako · 69c72469 · b4802326 · 804da3bc · 46e3a6e6
Commit 804da3bc authored Jul 22, 2018 by Momobako
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

gframe/single_mode.cpp gframe/single_mode.cpp +2 -0

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/gframe/single_mode.cpp
+++ b/gframe/single_mode.cpp
@@ -748,6 +748,8 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) {
 								xcard->overlayTarget = ccard;
 								xcard->location = 0x80;
 								xcard->sequence = ccard->overlayed.size() - 1;
+								xcard->owner = p;
+								xcard->controler = p;
 							}
 						}
 					}

--- a/ocgcore @ 46e3a6e6
+++ b/ocgcore @ 46e3a6e6
-Subproject commit 90a5d2b738cbb06df94fa66130aac3b73d88c24b
+Subproject commit 46e3a6e6236e2bd7c849464c5c9727286f07ebb2
--- a/script @ f47c8cac
+++ b/script @ f47c8cac
-Subproject commit 19a8c29ff83290d9befeba65ba8981f2481b4d14
+Subproject commit f47c8cacdef68e62ca05d69ed2e9e8934b7c1acf