summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-31 13:20:48 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-31 13:20:48 +0000
commit5792a98ec3a549d28037c65465db8c64e009823d (patch)
tree43ac7806ce57d4e678cd995d2a1828f5d44978c5 /src/common
parent6e103602b6e23f86fd89f9c48a0846b4243f2c5f (diff)
downloadhercules-5792a98ec3a549d28037c65465db8c64e009823d.tar.gz
hercules-5792a98ec3a549d28037c65465db8c64e009823d.tar.bz2
hercules-5792a98ec3a549d28037c65465db8c64e009823d.tar.xz
hercules-5792a98ec3a549d28037c65465db8c64e009823d.zip
* Added names to the SC_ and SI_ enums, now they can be used to properly indicate where such values are to be used (replaces usage of 'int')
* removed MIN_/MAX_PORTAL_MEMO, set MAX_MEMOPOINTS from 10 to 3 * removed support for @go-ing to your memo points * simplified the overly verbose @memo command; now re-uses pc_memo() * cleaned up pc_memo(), now uses semi-correct packet replies * Minor code cleaning/formatting git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11625 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
-rw-r--r--src/common/mmo.h5
-rw-r--r--src/common/socket.c6
2 files changed, 4 insertions, 7 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 4e50e7ca1..d971e96e6 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -65,9 +65,6 @@
#define MIN_STAR 0
#define MAX_STAR 3
-#define MIN_PORTAL_MEMO 0
-#define MAX_PORTAL_MEMO 2
-
#define MAX_STATUS_TYPE 5
#define WEDDING_RING_M 2634
@@ -83,7 +80,7 @@
#define MAP_NAME_LENGTH_EXT (MAP_NAME_LENGTH + 4)
#define MAX_FRIENDS 40
-#define MAX_MEMOPOINTS 10
+#define MAX_MEMOPOINTS 3
//Size of the fame list arrays.
#define MAX_FAME_LIST 10
diff --git a/src/common/socket.c b/src/common/socket.c
index 7759a67ee..5fb9ead9e 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -171,7 +171,7 @@ int recv_to_fifo(int fd)
if( len == SOCKET_ERROR )
{//An exception has occured
if( s_errno != S_EWOULDBLOCK ) {
- ShowDebug("recv_to_fifo: code %d, closing connection #%d\n", s_errno, fd);
+ //ShowDebug("recv_to_fifo: code %d, closing connection #%d\n", s_errno, fd);
set_eof(fd);
}
return 0;
@@ -201,9 +201,9 @@ int send_from_fifo(int fd)
len = send(fd, (const char *) session[fd]->wdata, (int)session[fd]->wdata_size, 0);
if( len == SOCKET_ERROR )
- {
+ {//An exception has occured
if( s_errno != S_EWOULDBLOCK ) {
- ShowDebug("send_from_fifo: error %d, ending connection #%d\n", s_errno, fd);
+ //ShowDebug("send_from_fifo: error %d, ending connection #%d\n", s_errno, fd);
session[fd]->wdata_size = 0; //Clear the send queue as we can't send anymore. [Skotlex]
set_eof(fd);
}