Merge branch 'server' of https://github.com/purerosefallen/ygopro

gframe/replay.cpp

@@ -22,7 +22,7 @@ Replay::~Replay() {
 }
 void Replay::BeginRecord() {
 #ifdef YGOPRO_SERVER_MODE
-	if(replay_mode > 0) {
+	if(replay_mode & 0x1) {
 #endif
 	if(!FileSystem::IsDirExists(L"./replay") && !FileSystem::MakeDir(L"./replay"))
 		return;
@@ -68,7 +68,7 @@ void Replay::BeginRecord() {
 void Replay::WriteHeader(ReplayHeader& header) {
 	pheader = header;
 #ifdef YGOPRO_SERVER_MODE
-	if(replay_mode == 0) return;
+	if(!(replay_mode & 0x1)) return;
 #endif
 #ifdef _WIN32
 	DWORD size;
@@ -84,7 +84,7 @@ void Replay::WriteData(const void* data, unsigned int length, bool flush) {
 	memcpy(pdata, data, length);
 	pdata += length;
 #ifdef YGOPRO_SERVER_MODE
-	if(replay_mode == 0) return;
+	if(!(replay_mode & 0x1)) return;
 #endif
 #ifdef _WIN32
 	DWORD size;
@@ -101,7 +101,7 @@ void Replay::WriteInt32(int data, bool flush) {
 	*((int*)(pdata)) = data;
 	pdata += 4;
 #ifdef YGOPRO_SERVER_MODE
-	if(replay_mode == 0) return;
+	if(!(replay_mode & 0x1)) return;
 #endif
 #ifdef _WIN32
 	DWORD size;
@@ -118,7 +118,7 @@ void Replay::WriteInt16(short data, bool flush) {
 	*((short*)(pdata)) = data;
 	pdata += 2;
 #ifdef YGOPRO_SERVER_MODE
-	if(replay_mode == 0) return;
+	if(!(replay_mode & 0x1)) return;
 #endif
 #ifdef _WIN32
 	DWORD size;
@@ -135,7 +135,7 @@ void Replay::WriteInt8(char data, bool flush) {
 	*pdata = data;
 	pdata++;
 #ifdef YGOPRO_SERVER_MODE
-	if(replay_mode == 0) return;
+	if(!(replay_mode & 0x1)) return;
 #endif
 #ifdef _WIN32
 	DWORD size;
@@ -150,7 +150,7 @@ void Replay::Flush() {
 	if(!is_recording)
 		return;
 #ifdef YGOPRO_SERVER_MODE
-	if(replay_mode == 0) return;
+	if(!(replay_mode & 0x1)) return;
 #endif
 #ifdef _WIN32
 #else
@@ -161,7 +161,7 @@ void Replay::EndRecord() {
 	if(!is_recording)
 		return;
 #ifdef YGOPRO_SERVER_MODE
-	if(replay_mode > 0) {
+	if(replay_mode & 0x1) {
 #endif
 #ifdef _WIN32
 	CloseHandle(recording_fp);

gframe/single_duel.cpp

@@ -1811,7 +1811,7 @@ void SingleDuel::EndDuel() {
 	NetServer::SendBufferToPlayer(players[0], STOC_REPLAY, replaybuf, sizeof(ReplayHeader) + last_replay.comp_size);
 	NetServer::ReSendToPlayer(players[1]);
 #ifdef YGOPRO_SERVER_MODE
-	if(replay_mode == 0) {
+	if(!(replay_mode & 0x2)) {
 		for(auto oit = observers.begin(); oit != observers.end(); ++oit)
 			NetServer::ReSendToPlayer(*oit);
 		NetServer::ReSendToPlayers(cache_recorder, replay_recorder);

gframe/tag_duel.cpp

@@ -1848,7 +1848,7 @@ void TagDuel::EndDuel() {
 	NetServer::ReSendToPlayer(players[2]);
 	NetServer::ReSendToPlayer(players[3]);
 #ifdef YGOPRO_SERVER_MODE
-	if (replay_mode == 0) {
+	if(!(replay_mode & 0x2)) {
 		for(auto oit = observers.begin(); oit != observers.end(); ++oit)
 			NetServer::ReSendToPlayer(*oit);
 		NetServer::ReSendToPlayers(cache_recorder, replay_recorder);