summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-18 12:49:49 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-18 12:49:49 +0000
commitf20c6c19cda1c672ed93836ddd33ce8e08e104c9 (patch)
tree2191cdf38dc908565a7cc5e63c43cc627bdfd2bb /src/common
parentc6ea185bd9ca1c3fdf7a18c4bf1e0b1150fffed5 (diff)
downloadhercules-f20c6c19cda1c672ed93836ddd33ce8e08e104c9.tar.gz
hercules-f20c6c19cda1c672ed93836ddd33ce8e08e104c9.tar.bz2
hercules-f20c6c19cda1c672ed93836ddd33ce8e08e104c9.tar.xz
hercules-f20c6c19cda1c672ed93836ddd33ce8e08e104c9.zip
* Removed commented-out code for check_fake_id()
* Merged improved/cleaned up (WiP) code for clif_parse_WisMessage * Removed the requirement to provide a character name in the message string when calling is_atcommand() (needed for the previous fix) - currently both ways work, but old will be removed in the upcoming command cleanup so please adjust your custom code if you use this! * Added clif_process_message(), an unified way to validate all four types of player message packets and retrieve their components * Applied the new checking function to clif code, this fixes various length mismatches caused by incomplete code in r11386 (bugreport:198) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11507 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
-rw-r--r--src/common/mmo.h6
-rw-r--r--src/common/socket.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index ddc43ebbf..18b724e56 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -74,12 +74,12 @@
//For character names, title names, guilds, maps, etc.
//Includes null-terminator as it is the length of the array.
-#define NAME_LENGTH 24
+#define NAME_LENGTH (23 + 1)
//For item names, which tend to have much longer names.
#define ITEM_NAME_LENGTH 50
//For Map Names, which the client considers to be 16 in length including the .gat extension
-#define MAP_NAME_LENGTH 12
-#define MAP_NAME_LENGTH_EXT 16
+#define MAP_NAME_LENGTH (11 + 1)
+#define MAP_NAME_LENGTH_EXT (MAP_NAME_LENGTH + 4)
#define MAX_FRIENDS 40
#define MAX_MEMOPOINTS 10
diff --git a/src/common/socket.c b/src/common/socket.c
index d8f3365d3..ef8e99762 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -198,8 +198,6 @@ int send_from_fifo(int fd)
if( session[fd]->wdata_size == 0 )
return 0; // nothing to send
- ShowInfo("Session #%d sending %d bytes.\n", fd, session[fd]->wdata_size);
-
len = send(fd, (const char *) session[fd]->wdata, (int)session[fd]->wdata_size, 0);
if( len == SOCKET_ERROR )