Merge branch 'master' into server

99e53102 · nanahira · 1a297b31 · 63418cc0 · 99e53102
Commit 99e53102 authored Aug 08, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

gframe/client_card.cpp gframe/client_card.cpp +6 -2

No files found.
--- a/gframe/client_card.cpp
+++ b/gframe/client_card.cpp
@@ -71,8 +71,12 @@ void ClientCard::UpdateInfo(char* buf) {
 			code = pdata;
 	}
 	if(flag & QUERY_POSITION) {
-		pdata = BufferIO::ReadInt32(buf);
+		pdata = (BufferIO::ReadInt32(buf) >> 24) & 0xff;
-		position = (pdata >> 24) & 0xff;
+		if((location & (LOCATION_EXTRA | LOCATION_REMOVED)) && (u8)pdata != position) {
+			position = pdata;
+			mainGame->dField.MoveCard(this, 1);
+		} else
+			position = pdata;
 	}
 	if(flag & QUERY_ALIAS)
 		alias = BufferIO::ReadInt32(buf);