merge

gframe/game.cpp

@@ -13,7 +13,7 @@
 #include <dirent.h>
 #endif
 
-const unsigned short PRO_VERSION = 0x1271;
+const unsigned short PRO_VERSION = 0x1272;
 
 namespace ygo {
 

gframe/replay_mode.cpp

@@ -326,7 +326,6 @@ bool ReplayMode::ReplayAnalyze(char* msg, unsigned int len) {
 		}
 		case MSG_NEW_TURN: {
 			pbuf++;
-			ReplayRefresh();
 			DuelClient::ClientAnalyze(offset, pbuf - offset);
 			break;
 		}

ocgcore/ocgapi.cpp

@@ -153,12 +153,14 @@ extern "C" DECL_DLLEXPORT void new_tag_card(ptr pduel, uint32 code, uint8 owner,
 	switch(location) {
 	case LOCATION_DECK:
 		ptduel->game_field->player[owner].tag_list_main.push_back(pcard);
+		pcard->owner = owner;
 		pcard->current.controler = owner;
 		pcard->current.location = LOCATION_DECK;
 		pcard->current.sequence = ptduel->game_field->player[owner].tag_list_main.size() - 1;
 		break;
 	case LOCATION_EXTRA:
 		ptduel->game_field->player[owner].tag_list_extra.push_back(pcard);
+		pcard->owner = owner;
 		pcard->current.controler = owner;
 		pcard->current.location = LOCATION_EXTRA;
 		pcard->current.sequence = ptduel->game_field->player[owner].tag_list_extra.size() - 1;

system.conf

@@ -9,9 +9,5 @@ lastdeck = T1
 textfont = c:/windows/fonts/simsun.ttc 14
 numfont = c:/windows/fonts/arialbd.ttf
 serverport = 7911
-<<<<<<< HEAD
 lastip = 192.168.2.100
-=======
-lastip = 192.168.3.235
->>>>>>> a1621ee4c3685938a41fc0922899db9827f882fe
 lastport = 7911