Skip to content

Y
ygopro-2pick
Commit 64b51e90 authored by nanahira's avatar nanahira
Browse files
Options

fix

parent 34d1b400
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 8 deletions
gframe/single_duel.cpp
View file @ 64b51e90
...@@ -741,12 +741,8 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) { ...@@ -741,12 +741,8 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
//modded //modded
case 10: case 10:
case 11: case 11:
<<<<<<< HEAD
case 12: {
=======
case 12: case 12:
case 13: { case 13: {
>>>>>>> 14a10e9739978823dada7a651464807daa69d5a3
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset); NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::SendBufferToPlayer(players[1], STOC_GAME_MSG, offset, pbuf - offset); NetServer::SendBufferToPlayer(players[1], STOC_GAME_MSG, offset, pbuf - offset);
for(auto oit = observers.begin(); oit != observers.end(); ++oit) for(auto oit = observers.begin(); oit != observers.end(); ++oit)
......
gframe/tag_duel.cpp
View file @ 64b51e90
...@@ -667,12 +667,8 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) { ...@@ -667,12 +667,8 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
} }
//modded //modded
case 11: case 11:
<<<<<<< HEAD
case 12: {
=======
case 12: case 12:
case 13: { case 13: {
>>>>>>> 14a10e9739978823dada7a651464807daa69d5a3
for(int i = 0; i < 4; ++i) for(int i = 0; i < 4; ++i)
NetServer::SendBufferToPlayer(players[i], STOC_GAME_MSG, offset, pbuf - offset); NetServer::SendBufferToPlayer(players[i], STOC_GAME_MSG, offset, pbuf - offset);
for(auto oit = observers.begin(); oit != observers.end(); ++oit) for(auto oit = observers.begin(); oit != observers.end(); ++oit)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment