diff options
author | Andrei Karas <akaras@inbox.ru> | 2018-11-13 20:52:46 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2018-11-15 01:40:31 +0300 |
commit | 7904cecc22e4008f7862eaad8162a72a28595521 (patch) | |
tree | f1046f098157a6cb4061083cc6ac1f74c7b39f14 | |
parent | dcf07d8a47221b92942f5c62d3d64ab9f86b8f8c (diff) | |
download | hercules-7904cecc22e4008f7862eaad8162a72a28595521.tar.gz hercules-7904cecc22e4008f7862eaad8162a72a28595521.tar.bz2 hercules-7904cecc22e4008f7862eaad8162a72a28595521.tar.xz hercules-7904cecc22e4008f7862eaad8162a72a28595521.zip |
Update visual studio project files.
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | src/common/socket.c | 6 | ||||
-rw-r--r-- | src/common/socket.h | 2 | ||||
-rw-r--r-- | vcproj-12/char-server.vcxproj | 1 | ||||
-rw-r--r-- | vcproj-12/char-server.vcxproj.filters | 3 | ||||
-rw-r--r-- | vcproj-12/login-server.vcxproj | 1 | ||||
-rw-r--r-- | vcproj-12/login-server.vcxproj.filters | 3 | ||||
-rw-r--r-- | vcproj-12/map-server.vcxproj | 1 | ||||
-rw-r--r-- | vcproj-12/map-server.vcxproj.filters | 3 | ||||
-rw-r--r-- | vcproj-14/char-server.vcxproj | 1 | ||||
-rw-r--r-- | vcproj-14/char-server.vcxproj.filters | 3 | ||||
-rw-r--r-- | vcproj-14/login-server.vcxproj | 1 | ||||
-rw-r--r-- | vcproj-14/login-server.vcxproj.filters | 3 | ||||
-rw-r--r-- | vcproj-14/map-server.vcxproj | 1 | ||||
-rw-r--r-- | vcproj-14/map-server.vcxproj.filters | 3 | ||||
-rw-r--r-- | vcproj-15/char-server.vcxproj | 1 | ||||
-rw-r--r-- | vcproj-15/char-server.vcxproj.filters | 3 | ||||
-rw-r--r-- | vcproj-15/login-server.vcxproj | 1 | ||||
-rw-r--r-- | vcproj-15/login-server.vcxproj.filters | 3 | ||||
-rw-r--r-- | vcproj-15/map-server.vcxproj | 1 | ||||
-rw-r--r-- | vcproj-15/map-server.vcxproj.filters | 3 |
21 files changed, 41 insertions, 5 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac 26efcebad. +# From configure.ac e207bf99b. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69. # diff --git a/src/common/socket.c b/src/common/socket.c index f9ee16bf9..025776172 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -817,7 +817,7 @@ static int rfifoskip(int fd, size_t len) const size_t lenRest = RFIFOREST(fd); if (s->flag.validate == 1 && len == lenRest) { if (lenRest >= 2) { - const uint cmd = (uint)RFIFOW(fd, 0); + const uint32 cmd = (uint32)RFIFOW(fd, 0); if (cmd < MIN_PACKET_DB || cmd > MAX_PACKET_DB) { ShowError("Skip wrong packet id: 0x%04X\n", cmd); Assert_report(0); @@ -2102,8 +2102,8 @@ static void socket_validateWfifo(int fd, size_t len) Assert_retv(0); return; } - const uint cmd = (uint)WFIFOW(fd, 0); - const uint last_head_size = sockt->session[fd]->last_head_size; + const uint32 cmd = (uint32)WFIFOW(fd, 0); + const uint32 last_head_size = sockt->session[fd]->last_head_size; sockt->session[fd]->last_head_size = 0; if (cmd < MIN_PACKET_DB || cmd > MAX_PACKET_DB) { diff --git a/src/common/socket.h b/src/common/socket.h index c5d0e224e..5e4251989 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -128,7 +128,7 @@ struct socket_data { size_t max_rdata, max_wdata; size_t rdata_size, wdata_size; size_t rdata_pos; - uint last_head_size; + uint32 last_head_size; time_t rdata_tick; // time of last recv (for detecting timeouts); zero when timeout is disabled RecvFunc func_recv; diff --git a/vcproj-12/char-server.vcxproj b/vcproj-12/char-server.vcxproj index 411191400..284f38239 100644 --- a/vcproj-12/char-server.vcxproj +++ b/vcproj-12/char-server.vcxproj @@ -206,6 +206,7 @@ <ClCompile Include="..\src\char\int_rodex.c" /> <ClCompile Include="..\src\common\conf.c" /> <ClCompile Include="..\src\common\core.c" /> + <ClCompile Include="..\src\common\packets.c" /> <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\des.c" /> diff --git a/vcproj-12/char-server.vcxproj.filters b/vcproj-12/char-server.vcxproj.filters index 52d3bde16..ab023a77f 100644 --- a/vcproj-12/char-server.vcxproj.filters +++ b/vcproj-12/char-server.vcxproj.filters @@ -7,6 +7,9 @@ <ClCompile Include="..\src\common\core.c"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\src\common\packets.c"> + <Filter>common</Filter> + </ClCompile> <ClCompile Include="..\src\common\console.c"> <Filter>common</Filter> </ClCompile> diff --git a/vcproj-12/login-server.vcxproj b/vcproj-12/login-server.vcxproj index 060460923..325fe53c8 100644 --- a/vcproj-12/login-server.vcxproj +++ b/vcproj-12/login-server.vcxproj @@ -203,6 +203,7 @@ <ClCompile Include="..\src\login\loginlog.c" /> <ClCompile Include="..\src\common\conf.c" /> <ClCompile Include="..\src\common\core.c" /> + <ClCompile Include="..\src\common\packets.c" /> <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\ers.c" /> diff --git a/vcproj-12/login-server.vcxproj.filters b/vcproj-12/login-server.vcxproj.filters index 1f3b6ba0f..301950f0d 100644 --- a/vcproj-12/login-server.vcxproj.filters +++ b/vcproj-12/login-server.vcxproj.filters @@ -22,6 +22,9 @@ <ClCompile Include="..\src\common\core.c"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\src\common\packets.c"> + <Filter>common</Filter> + </ClCompile> <ClCompile Include="..\src\common\console.c"> <Filter>common</Filter> </ClCompile> diff --git a/vcproj-12/map-server.vcxproj b/vcproj-12/map-server.vcxproj index 4756cca2a..3435ec4b6 100644 --- a/vcproj-12/map-server.vcxproj +++ b/vcproj-12/map-server.vcxproj @@ -232,6 +232,7 @@ <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" /> <ClCompile Include="..\src\common\conf.c" /> <ClCompile Include="..\src\common\core.c" /> + <ClCompile Include="..\src\common\packets.c" /> <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\des.c" /> diff --git a/vcproj-12/map-server.vcxproj.filters b/vcproj-12/map-server.vcxproj.filters index e3bf78fb9..8457ddf5f 100644 --- a/vcproj-12/map-server.vcxproj.filters +++ b/vcproj-12/map-server.vcxproj.filters @@ -124,6 +124,9 @@ <ClCompile Include="..\src\common\core.c"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\src\common\packets.c"> + <Filter>common</Filter> + </ClCompile> <ClCompile Include="..\src\common\console.c"> <Filter>common</Filter> </ClCompile> diff --git a/vcproj-14/char-server.vcxproj b/vcproj-14/char-server.vcxproj index 692210a15..bc5014b9c 100644 --- a/vcproj-14/char-server.vcxproj +++ b/vcproj-14/char-server.vcxproj @@ -205,6 +205,7 @@ <ClCompile Include="..\src\char\int_rodex.c" /> <ClCompile Include="..\src\common\conf.c" /> <ClCompile Include="..\src\common\core.c" /> + <ClCompile Include="..\src\common\packets.c" /> <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\des.c" /> diff --git a/vcproj-14/char-server.vcxproj.filters b/vcproj-14/char-server.vcxproj.filters index 52d3bde16..ab023a77f 100644 --- a/vcproj-14/char-server.vcxproj.filters +++ b/vcproj-14/char-server.vcxproj.filters @@ -7,6 +7,9 @@ <ClCompile Include="..\src\common\core.c"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\src\common\packets.c"> + <Filter>common</Filter> + </ClCompile> <ClCompile Include="..\src\common\console.c"> <Filter>common</Filter> </ClCompile> diff --git a/vcproj-14/login-server.vcxproj b/vcproj-14/login-server.vcxproj index 42f71c1a0..3b5e13373 100644 --- a/vcproj-14/login-server.vcxproj +++ b/vcproj-14/login-server.vcxproj @@ -201,6 +201,7 @@ <ClCompile Include="..\src\login\loginlog.c" /> <ClCompile Include="..\src\common\conf.c" /> <ClCompile Include="..\src\common\core.c" /> + <ClCompile Include="..\src\common\packets.c" /> <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\ers.c" /> diff --git a/vcproj-14/login-server.vcxproj.filters b/vcproj-14/login-server.vcxproj.filters index 1f3b6ba0f..301950f0d 100644 --- a/vcproj-14/login-server.vcxproj.filters +++ b/vcproj-14/login-server.vcxproj.filters @@ -22,6 +22,9 @@ <ClCompile Include="..\src\common\core.c"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\src\common\packets.c"> + <Filter>common</Filter> + </ClCompile> <ClCompile Include="..\src\common\console.c"> <Filter>common</Filter> </ClCompile> diff --git a/vcproj-14/map-server.vcxproj b/vcproj-14/map-server.vcxproj index ae834de75..fca2a7826 100644 --- a/vcproj-14/map-server.vcxproj +++ b/vcproj-14/map-server.vcxproj @@ -230,6 +230,7 @@ <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" /> <ClCompile Include="..\src\common\conf.c" /> <ClCompile Include="..\src\common\core.c" /> + <ClCompile Include="..\src\common\packets.c" /> <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\des.c" /> diff --git a/vcproj-14/map-server.vcxproj.filters b/vcproj-14/map-server.vcxproj.filters index 9bf13d9f7..49099de50 100644 --- a/vcproj-14/map-server.vcxproj.filters +++ b/vcproj-14/map-server.vcxproj.filters @@ -121,6 +121,9 @@ <ClCompile Include="..\src\common\core.c"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\src\common\packets.c"> + <Filter>common</Filter> + </ClCompile> <ClCompile Include="..\src\common\console.c"> <Filter>common</Filter> </ClCompile> diff --git a/vcproj-15/char-server.vcxproj b/vcproj-15/char-server.vcxproj index ad4de5be4..253437275 100644 --- a/vcproj-15/char-server.vcxproj +++ b/vcproj-15/char-server.vcxproj @@ -205,6 +205,7 @@ <ClCompile Include="..\src\char\int_rodex.c" /> <ClCompile Include="..\src\common\conf.c" /> <ClCompile Include="..\src\common\core.c" /> + <ClCompile Include="..\src\common\packets.c" /> <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\des.c" /> diff --git a/vcproj-15/char-server.vcxproj.filters b/vcproj-15/char-server.vcxproj.filters index 52d3bde16..ab023a77f 100644 --- a/vcproj-15/char-server.vcxproj.filters +++ b/vcproj-15/char-server.vcxproj.filters @@ -7,6 +7,9 @@ <ClCompile Include="..\src\common\core.c"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\src\common\packets.c"> + <Filter>common</Filter> + </ClCompile> <ClCompile Include="..\src\common\console.c"> <Filter>common</Filter> </ClCompile> diff --git a/vcproj-15/login-server.vcxproj b/vcproj-15/login-server.vcxproj index 0f03acabc..9f372373b 100644 --- a/vcproj-15/login-server.vcxproj +++ b/vcproj-15/login-server.vcxproj @@ -202,6 +202,7 @@ <ClCompile Include="..\src\login\loginlog.c" /> <ClCompile Include="..\src\common\conf.c" /> <ClCompile Include="..\src\common\core.c" /> + <ClCompile Include="..\src\common\packets.c" /> <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\ers.c" /> diff --git a/vcproj-15/login-server.vcxproj.filters b/vcproj-15/login-server.vcxproj.filters index 1f3b6ba0f..301950f0d 100644 --- a/vcproj-15/login-server.vcxproj.filters +++ b/vcproj-15/login-server.vcxproj.filters @@ -22,6 +22,9 @@ <ClCompile Include="..\src\common\core.c"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\src\common\packets.c"> + <Filter>common</Filter> + </ClCompile> <ClCompile Include="..\src\common\console.c"> <Filter>common</Filter> </ClCompile> diff --git a/vcproj-15/map-server.vcxproj b/vcproj-15/map-server.vcxproj index fb9d57e9c..ac24ce2a2 100644 --- a/vcproj-15/map-server.vcxproj +++ b/vcproj-15/map-server.vcxproj @@ -231,6 +231,7 @@ <ClCompile Include="..\3rdparty\mt19937ar\mt19937ar.c" /> <ClCompile Include="..\src\common\conf.c" /> <ClCompile Include="..\src\common\core.c" /> + <ClCompile Include="..\src\common\packets.c" /> <ClCompile Include="..\src\common\console.c" /> <ClCompile Include="..\src\common\db.c" /> <ClCompile Include="..\src\common\des.c" /> diff --git a/vcproj-15/map-server.vcxproj.filters b/vcproj-15/map-server.vcxproj.filters index 8c91df7c7..d616f0cbc 100644 --- a/vcproj-15/map-server.vcxproj.filters +++ b/vcproj-15/map-server.vcxproj.filters @@ -124,6 +124,9 @@ <ClCompile Include="..\src\common\core.c"> <Filter>common</Filter> </ClCompile> + <ClCompile Include="..\src\common\packets.c"> + <Filter>common</Filter> + </ClCompile> <ClCompile Include="..\src\common\console.c"> <Filter>common</Filter> </ClCompile> |