Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unimportant cleanups

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9633 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-01-08 16:50:54 +00:00
parent 284b66e65c
commit b0aa97039b
7 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -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)

6
eAthena-8.sln
View File

@ -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

1
src/common/malloc.c
View File

@ -651,6 +651,7 @@ static void memmgr_init (void)
}
#endif
/*======================================
* Initialise
*--------------------------------------

15
src/common/socket.c
View File

@ -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;

4
src/map/atcommand.c
View File

@ -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);

1
src/map/script.c
View File

@ -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
*------------------------------------------

4
src/plugins/console.c
View File

@ -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;