diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | eAthena-8.sln | 6 | ||||
| -rw-r--r-- | src/common/malloc.c | 1 | ||||
| -rw-r--r-- | src/common/socket.c | 15 | ||||
| -rw-r--r-- | src/map/atcommand.c | 4 | ||||
| -rw-r--r-- | src/map/script.c | 1 | ||||
| -rw-r--r-- | src/plugins/console.c | 4 |
7 files changed, 11 insertions, 21 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index ec9bfc496..78bc3c708 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2007/01/08 + * Unimportant cleanups * Moved the plugin.def file to the plugins dir and added console.def * Found the reason why the console didn't want to run on windows (Microsoft uses !0 and unix uses 0 in pipe_create) diff --git a/eAthena-8.sln b/eAthena-8.sln index 3db074fe5..f1799933e 100644 --- a/eAthena-8.sln +++ b/eAthena-8.sln @@ -12,8 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "login-server_sql", "vcproj- EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map-server_sql", "vcproj-8\map-server_sql.vcproj", "{D356871D-58E1-450B-967A-E6E9646175AF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin-console", "vcproj-8\plugin-console.vcproj", "{97D96B7A-817F-4610-8EF4-966384850E65}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -41,10 +39,6 @@ Global {D356871D-58E1-450B-967A-E6E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 {D356871D-58E1-450B-967A-E6E9646175AF}.Debug|Win32.Build.0 = Debug|Win32 {D356871D-58E1-450B-967A-E6E9646175AF}.Release|Win32.ActiveCfg = Release|Win32 - {97D96B7A-817F-4610-8EF4-966384850E65}.Debug|Win32.ActiveCfg = Debug|Win32 - {97D96B7A-817F-4610-8EF4-966384850E65}.Debug|Win32.Build.0 = Debug|Win32 - {97D96B7A-817F-4610-8EF4-966384850E65}.Release|Win32.ActiveCfg = Release|Win32 - {97D96B7A-817F-4610-8EF4-966384850E65}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/common/malloc.c b/src/common/malloc.c index fe73057ad..1417bfbec 100644 --- a/src/common/malloc.c +++ b/src/common/malloc.c @@ -651,6 +651,7 @@ static void memmgr_init (void) } #endif + /*====================================== * Initialise *-------------------------------------- diff --git a/src/common/socket.c b/src/common/socket.c index 3c8396961..6589978bb 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -35,6 +35,10 @@ #define S_ENOTSOCK WSAENOTSOCK #define S_EWOULDBLOCK WSAEWOULDBLOCK #define S_ECONNABORTED WSAECONNABORTED + + #define SHUT_RD SD_RECEIVE + #define SHUT_WR SD_SEND + #define SHUT_RDWR SD_BOTH #else #define SOCKET_ERROR -1 #define INVALID_SOCKET -1 @@ -56,17 +60,6 @@ #include "../common/malloc.h" #include "../common/showmsg.h" -/// shutdown() constants -#ifndef SHUT_RD -#ifdef SD_RECEIVE - #define SHUT_RD SD_RECEIVE - #define SHUT_WR SD_SEND - #define SHUT_RDWR SD_BOTH -#else - #error "Unknown socket constants, please report this to a developer" -#endif -#endif - fd_set readfds; int fd_max; time_t last_tick; diff --git a/src/map/atcommand.c b/src/map/atcommand.c index b4ccf5b79..e1c622462 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -4962,7 +4962,7 @@ int atcommand_raisemap( nullpo_retr(-1, sd); pl_allsd = map_getallusers(&users); - + for (i = 0; i < users; i++) { if (sd->bl.m == pl_allsd[i]->bl.m) atcommand_raise_sub(pl_allsd[i]); @@ -6898,7 +6898,7 @@ int atcommand_undisguiseall( nullpo_retr(-1, sd); pl_allsd = map_getallusers(&users); - + for(i=0; i < users; i++) { if((pl_sd = pl_allsd[i]) && pl_sd->disguise) pc_disguise(pl_sd, 0); diff --git a/src/map/script.c b/src/map/script.c index 3efa8dbc0..005e471c6 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -8954,6 +8954,7 @@ int buildin_agitend(struct script_state *st) guild_agit_end(); return 0; } + /*========================================== * Returns whether woe is on or off. // choice script *------------------------------------------ diff --git a/src/plugins/console.c b/src/plugins/console.c index fca087618..e9fceecbf 100644 --- a/src/plugins/console.c +++ b/src/plugins/console.c @@ -120,7 +120,7 @@ int console_parsebuf(int tid, unsigned int tick, int id, int data_) //printf("console_parsebuf pipe_hasdata\n"); // receive string pipe_read(data, &len, sizeof(size_t)); - pipe_read(data, &buf, len); + pipe_read(data, buf, len); buf[len] = '\0'; //printf("console_parsebuf buf='%s'\n", buf); // parse it @@ -128,7 +128,7 @@ int console_parsebuf(int tid, unsigned int tick, int id, int data_) //printf("console_parsebuf writing next\n"); // send next state buf[0] = 'R'; - pipe_write(next, &buf, 1); + pipe_write(next, buf, 1); //printf("console_parsebuf done with next\n"); } return 0; |