Skip to content

Y
ygopro
Commit a01ce2f2 authored by salix5's avatar salix5
Browse files
Options

set info to default value before creating duel_mode

parent c68e81a3
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 16 deletions
gframe/netserver.cpp
View file @ a01ce2f2
...@@ -261,29 +261,37 @@ void NetServer::HandleCTOSPacket(DuelPlayer* dp, unsigned char* data, int len) { ...@@ -261,29 +261,37 @@ void NetServer::HandleCTOSPacket(DuelPlayer* dp, unsigned char* data, int len) {
CTOS_CreateGame packet; CTOS_CreateGame packet;
std::memcpy(&packet, pdata, sizeof packet); std::memcpy(&packet, pdata, sizeof packet);
auto pkt = &packet; auto pkt = &packet;
if(pkt->info.mode == MODE_SINGLE) {
duel_mode = new SingleDuel(false);
duel_mode->etimer = event_new(net_evbase, 0, EV_TIMEOUT | EV_PERSIST, SingleDuel::SingleTimer, duel_mode);
} else if(pkt->info.mode == MODE_MATCH) {
duel_mode = new SingleDuel(true);
duel_mode->etimer = event_new(net_evbase, 0, EV_TIMEOUT | EV_PERSIST, SingleDuel::SingleTimer, duel_mode);
} else if(pkt->info.mode == MODE_TAG) {
duel_mode = new TagDuel();
duel_mode->etimer = event_new(net_evbase, 0, EV_TIMEOUT | EV_PERSIST, TagDuel::TagTimer, duel_mode);
}
if(pkt->info.rule > CURRENT_RULE) if(pkt->info.rule > CURRENT_RULE)
pkt->info.rule = CURRENT_RULE; pkt->info.rule = CURRENT_RULE;
if(pkt->info.mode > MODE_TAG) if(pkt->info.mode > MODE_TAG)
pkt->info.mode = MODE_SINGLE; pkt->info.mode = MODE_SINGLE;
unsigned int hash = 1; bool found = false;
for(auto lfit = deckManager._lfList.begin(); lfit != deckManager._lfList.end(); ++lfit) { for (const auto& lflist : deckManager._lfList) {
if(pkt->info.lflist == lfit->hash) { if(pkt->info.lflist == lflist.hash) {
hash = pkt->info.lflist; found = true;
break; break;
} }
} }
if(hash == 1) if (!found) {
pkt->info.lflist = deckManager._lfList[0].hash; if (deckManager._lfList.size())
pkt->info.lflist = deckManager._lfList[0].hash;
else
pkt->info.lflist = 0;
}
if (pkt->info.mode == MODE_SINGLE) {
duel_mode = new SingleDuel(false);
duel_mode->etimer = event_new(net_evbase, 0, EV_TIMEOUT | EV_PERSIST, SingleDuel::SingleTimer, duel_mode);
}
else if (pkt->info.mode == MODE_MATCH) {
duel_mode = new SingleDuel(true);
duel_mode->etimer = event_new(net_evbase, 0, EV_TIMEOUT | EV_PERSIST, SingleDuel::SingleTimer, duel_mode);
}
else if (pkt->info.mode == MODE_TAG) {
duel_mode = new TagDuel();
duel_mode->etimer = event_new(net_evbase, 0, EV_TIMEOUT | EV_PERSIST, TagDuel::TagTimer, duel_mode);
}
else
return;
duel_mode->host_info = pkt->info; duel_mode->host_info = pkt->info;
BufferIO::NullTerminate(pkt->name); BufferIO::NullTerminate(pkt->name);
BufferIO::NullTerminate(pkt->pass); BufferIO::NullTerminate(pkt->pass);
......
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