diff options
| author | rubidium <rubidium@openttd.org> | 2010-10-24 20:03:33 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-10-24 20:03:33 +0000 |
| commit | 2cd67a51acc71b08e52c94fefa44fe665977396f (patch) | |
| tree | 837c257316c331c6bcc3c390a3bd0828649c3a18 /src/network/network_server.cpp | |
| parent | fc15063838e6d802af0ae0de178d218dbf786c17 (diff) | |
| download | openttd-2cd67a51acc71b08e52c94fefa44fe665977396f.tar.xz | |
(svn r21029) -Codechange: split the map downloading packet + 3-state enum into 3 separate packets
Diffstat (limited to 'src/network/network_server.cpp')
| -rw-r--r-- | src/network/network_server.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index 4c6355b81..a7dc9daed 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -388,8 +388,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::SendMap() if (ftell(file_pointer) == 0) usererror("network savedump failed - zero sized savegame?"); /* Now send the _frame_counter and how many packets are coming */ - p = new Packet(PACKET_SERVER_MAP); - p->Send_uint8 (MAP_PACKET_START); + p = new Packet(PACKET_SERVER_MAP_BEGIN); p->Send_uint32(_frame_counter); p->Send_uint32(ftell(file_pointer)); this->Send_Packet(p); @@ -409,8 +408,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::SendMap() uint i; int res; for (i = 0; i < sent_packets; i++) { - Packet *p = new Packet(PACKET_SERVER_MAP); - p->Send_uint8(MAP_PACKET_NORMAL); + Packet *p = new Packet(PACKET_SERVER_MAP_DATA); res = (int)fread(p->buffer + p->size, 1, SEND_MTU - p->size, file_pointer); if (ferror(file_pointer)) usererror("Error reading temporary network savegame!"); @@ -419,8 +417,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::SendMap() this->Send_Packet(p); if (feof(file_pointer)) { /* Done reading! */ - Packet *p = new Packet(PACKET_SERVER_MAP); - p->Send_uint8(MAP_PACKET_END); + Packet *p = new Packet(PACKET_SERVER_MAP_DONE); this->Send_Packet(p); /* Set the status to DONE_MAP, no we will wait for the client |