Skip to content

Y
ygopro
Commit 06417418 authored by nanahira's avatar nanahira
Browse files
Options

send default LP on reconnect

parent 72be2703
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 66 deletions
gframe/single_duel.cpp
View file @ 06417418
...@@ -585,8 +585,6 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) { ...@@ -585,8 +585,6 @@ void SingleDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
NetServer::SendBufferToPlayer(cache_recorder, STOC_GAME_MSG, startbuf, 18); NetServer::SendBufferToPlayer(cache_recorder, STOC_GAME_MSG, startbuf, 18);
if(replay_recorder) if(replay_recorder)
NetServer::SendBufferToPlayer(replay_recorder, STOC_GAME_MSG, startbuf, 18); NetServer::SendBufferToPlayer(replay_recorder, STOC_GAME_MSG, startbuf, 18);
lp[0] = host_info.start_lp;
lp[1] = host_info.start_lp;
turn_player = 0; turn_player = 0;
phase = 1; phase = 1;
#endif #endif
...@@ -1436,15 +1434,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) { ...@@ -1436,15 +1434,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
break; break;
} }
case MSG_DAMAGE: { case MSG_DAMAGE: {
#ifdef YGOPRO_SERVER_MODE
int player = BufferIO::ReadInt8(pbuf);
int val = BufferIO::ReadInt32(pbuf);
lp[player] -= val;
if(lp[player] < 0)
lp[player] = 0;
#else
pbuf += 5; pbuf += 5;
#endif
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset); NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::ReSendToPlayer(players[1]); NetServer::ReSendToPlayer(players[1]);
for(auto oit = observers.begin(); oit != observers.end(); ++oit) for(auto oit = observers.begin(); oit != observers.end(); ++oit)
...@@ -1455,13 +1445,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) { ...@@ -1455,13 +1445,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
break; break;
} }
case MSG_RECOVER: { case MSG_RECOVER: {
#ifdef YGOPRO_SERVER_MODE
int player = BufferIO::ReadInt8(pbuf);
int val = BufferIO::ReadInt32(pbuf);
lp[player] += val;
#else
pbuf += 5; pbuf += 5;
#endif
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset); NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::ReSendToPlayer(players[1]); NetServer::ReSendToPlayer(players[1]);
for(auto oit = observers.begin(); oit != observers.end(); ++oit) for(auto oit = observers.begin(); oit != observers.end(); ++oit)
...@@ -1483,13 +1467,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) { ...@@ -1483,13 +1467,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
break; break;
} }
case MSG_LPUPDATE: { case MSG_LPUPDATE: {
#ifdef YGOPRO_SERVER_MODE
int player = BufferIO::ReadInt8(pbuf);
int val = BufferIO::ReadInt32(pbuf);
lp[player] = val;
#else
pbuf += 5; pbuf += 5;
#endif
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset); NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::ReSendToPlayer(players[1]); NetServer::ReSendToPlayer(players[1]);
for(auto oit = observers.begin(); oit != observers.end(); ++oit) for(auto oit = observers.begin(); oit != observers.end(); ++oit)
...@@ -1533,15 +1511,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) { ...@@ -1533,15 +1511,7 @@ int SingleDuel::Analyze(char* msgbuffer, unsigned int len) {
break; break;
} }
case MSG_PAY_LPCOST: { case MSG_PAY_LPCOST: {
#ifdef YGOPRO_SERVER_MODE
int player = BufferIO::ReadInt8(pbuf);
int val = BufferIO::ReadInt32(pbuf);
lp[player] -= val;
if(lp[player] < 0)
lp[player] = 0;
#else
pbuf += 5; pbuf += 5;
#endif
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset); NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::ReSendToPlayer(players[1]); NetServer::ReSendToPlayer(players[1]);
for(auto oit = observers.begin(); oit != observers.end(); ++oit) for(auto oit = observers.begin(); oit != observers.end(); ++oit)
...@@ -1807,8 +1777,8 @@ void SingleDuel::RequestField(DuelPlayer* dp) { ...@@ -1807,8 +1777,8 @@ void SingleDuel::RequestField(DuelPlayer* dp) {
char startbuf[32], *pbuf = startbuf; char startbuf[32], *pbuf = startbuf;
BufferIO::WriteInt8(pbuf, MSG_START); BufferIO::WriteInt8(pbuf, MSG_START);
BufferIO::WriteInt8(pbuf, player); BufferIO::WriteInt8(pbuf, player);
BufferIO::WriteInt32(pbuf, lp[0]); BufferIO::WriteInt32(pbuf, host_info.start_lp);
BufferIO::WriteInt32(pbuf, lp[1]); BufferIO::WriteInt32(pbuf, host_info.start_lp);
BufferIO::WriteInt16(pbuf, 0); BufferIO::WriteInt16(pbuf, 0);
BufferIO::WriteInt16(pbuf, 0); BufferIO::WriteInt16(pbuf, 0);
BufferIO::WriteInt16(pbuf, 0); BufferIO::WriteInt16(pbuf, 0);
......
gframe/single_duel.h
View file @ 06417418
...@@ -66,7 +66,6 @@ protected: ...@@ -66,7 +66,6 @@ protected:
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
DuelPlayer* cache_recorder; DuelPlayer* cache_recorder;
DuelPlayer* replay_recorder; DuelPlayer* replay_recorder;
int lp[2];
unsigned char turn_player; unsigned char turn_player;
unsigned short phase; unsigned short phase;
#endif #endif
......
gframe/tag_duel.cpp
View file @ 06417418
...@@ -589,8 +589,6 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) { ...@@ -589,8 +589,6 @@ void TagDuel::TPResult(DuelPlayer* dp, unsigned char tp) {
NetServer::SendBufferToPlayer(cache_recorder, STOC_GAME_MSG, startbuf, 18); NetServer::SendBufferToPlayer(cache_recorder, STOC_GAME_MSG, startbuf, 18);
if(replay_recorder) if(replay_recorder)
NetServer::SendBufferToPlayer(replay_recorder, STOC_GAME_MSG, startbuf, 18); NetServer::SendBufferToPlayer(replay_recorder, STOC_GAME_MSG, startbuf, 18);
lp[0] = host_info.start_lp;
lp[1] = host_info.start_lp;
turn_player = 0; turn_player = 0;
phase = 1; phase = 1;
#endif #endif
...@@ -1436,15 +1434,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) { ...@@ -1436,15 +1434,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
break; break;
} }
case MSG_DAMAGE: { case MSG_DAMAGE: {
#ifdef YGOPRO_SERVER_MODE
int player = BufferIO::ReadInt8(pbuf);
int val = BufferIO::ReadInt32(pbuf);
lp[player] -= val;
if(lp[player] < 0)
lp[player] = 0;
#else
pbuf += 5; pbuf += 5;
#endif
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset); NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::ReSendToPlayer(players[1]); NetServer::ReSendToPlayer(players[1]);
NetServer::ReSendToPlayer(players[2]); NetServer::ReSendToPlayer(players[2]);
...@@ -1457,13 +1447,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) { ...@@ -1457,13 +1447,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
break; break;
} }
case MSG_RECOVER: { case MSG_RECOVER: {
#ifdef YGOPRO_SERVER_MODE
int player = BufferIO::ReadInt8(pbuf);
int val = BufferIO::ReadInt32(pbuf);
lp[player] += val;
#else
pbuf += 5; pbuf += 5;
#endif
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset); NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::ReSendToPlayer(players[1]); NetServer::ReSendToPlayer(players[1]);
NetServer::ReSendToPlayer(players[2]); NetServer::ReSendToPlayer(players[2]);
...@@ -1489,13 +1473,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) { ...@@ -1489,13 +1473,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
break; break;
} }
case MSG_LPUPDATE: { case MSG_LPUPDATE: {
#ifdef YGOPRO_SERVER_MODE
int player = BufferIO::ReadInt8(pbuf);
int val = BufferIO::ReadInt32(pbuf);
lp[player] = val;
#else
pbuf += 5; pbuf += 5;
#endif
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset); NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::ReSendToPlayer(players[1]); NetServer::ReSendToPlayer(players[1]);
NetServer::ReSendToPlayer(players[2]); NetServer::ReSendToPlayer(players[2]);
...@@ -1547,15 +1525,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) { ...@@ -1547,15 +1525,7 @@ int TagDuel::Analyze(char* msgbuffer, unsigned int len) {
break; break;
} }
case MSG_PAY_LPCOST: { case MSG_PAY_LPCOST: {
#ifdef YGOPRO_SERVER_MODE
int player = BufferIO::ReadInt8(pbuf);
int val = BufferIO::ReadInt32(pbuf);
lp[player] -= val;
if(lp[player] < 0)
lp[player] = 0;
#else
pbuf += 5; pbuf += 5;
#endif
NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset); NetServer::SendBufferToPlayer(players[0], STOC_GAME_MSG, offset, pbuf - offset);
NetServer::ReSendToPlayer(players[1]); NetServer::ReSendToPlayer(players[1]);
NetServer::ReSendToPlayer(players[2]); NetServer::ReSendToPlayer(players[2]);
...@@ -1882,8 +1852,8 @@ void TagDuel::RequestField(DuelPlayer* dp) { ...@@ -1882,8 +1852,8 @@ void TagDuel::RequestField(DuelPlayer* dp) {
char startbuf[32], *pbuf = startbuf; char startbuf[32], *pbuf = startbuf;
BufferIO::WriteInt8(pbuf, MSG_START); BufferIO::WriteInt8(pbuf, MSG_START);
BufferIO::WriteInt8(pbuf, player); BufferIO::WriteInt8(pbuf, player);
BufferIO::WriteInt32(pbuf, lp[0]); BufferIO::WriteInt32(pbuf, host_info.start_lp);
BufferIO::WriteInt32(pbuf, lp[1]); BufferIO::WriteInt32(pbuf, host_info.start_lp);
BufferIO::WriteInt16(pbuf, 0); BufferIO::WriteInt16(pbuf, 0);
BufferIO::WriteInt16(pbuf, 0); BufferIO::WriteInt16(pbuf, 0);
BufferIO::WriteInt16(pbuf, 0); BufferIO::WriteInt16(pbuf, 0);
......
gframe/tag_duel.h
View file @ 06417418
...@@ -62,7 +62,6 @@ protected: ...@@ -62,7 +62,6 @@ protected:
#ifdef YGOPRO_SERVER_MODE #ifdef YGOPRO_SERVER_MODE
DuelPlayer* cache_recorder; DuelPlayer* cache_recorder;
DuelPlayer* replay_recorder; DuelPlayer* replay_recorder;
int lp[2];
int turn_player; int turn_player;
int phase; int phase;
#endif #endif
......
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