summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt5
-rw-r--r--src/map/clif.c3
-rw-r--r--src/map/map.h2
3 files changed, 6 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index fb30b9cb0..81e434eb4 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2007/02/07
+ * Moved CHAT_SIZE back to map.h because log_atcommand uses it on sql
+ builds. (moved to clif.c in r9811) [FlavioJS]
2007/02/06
* Cleaned up the script engine's get_val() function [ultramage]
- changed the long if-spaghetti into a compact switch statement
@@ -38,6 +41,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
* Moved the deletion of the invincible timer when using skills so that it
is not deleted for skills such as Ashura (when just selecting a target)
[Skotlex]
+2007/02/03
* Continuing the checking of script buildin functions and stop the script
execution when an attached player is required but not found.
This task will be referenced as Ticket #41 from now on. [FlavioJS]
@@ -49,7 +53,6 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
(although I'm not at all sure that the fix is correct)
Ref: http://www.eathena.ws/board/index.php?showtopic=137274
* Removed the silly and misleading 'firewall detected' message
-2007/02/03
* Added missing vc6 project file
* Corrected a lie in the script documentation [ultramage]
2007/02/02
diff --git a/src/map/clif.c b/src/map/clif.c
index d7358d13f..2f9039dd0 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -4,9 +4,6 @@
#define DUMP_UNKNOWN_PACKET 0
#define DUMP_ALL_PACKETS 0
-//Talk max size: <name> : <message of 70> [Skotlex]
-#define CHAT_SIZE (NAME_LENGTH + 3 + CHATBOX_SIZE)
-
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
diff --git a/src/map/map.h b/src/map/map.h
index b227ed4f3..cc6228bd2 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -164,6 +164,8 @@ enum {
#define MESSAGE_SIZE 80
//String length you can write in the 'talking box'
#define CHATBOX_SIZE 70
+//Talk max size: <name> : <message of 70> [Skotlex]
+#define CHAT_SIZE (NAME_LENGTH + 3 + CHATBOX_SIZE)
#define DEFAULT_AUTOSAVE_INTERVAL 5*60*1000