summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt5
-rw-r--r--src/char_sql/int_mail.c4
-rw-r--r--src/common/malloc.h2
-rw-r--r--src/map/npc.c8
4 files changed, 10 insertions, 9 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c0e733aa2..700bf564b 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,11 @@ 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/10/24
+ * Corrected a fex misshaps from r11571:
+ - disabling the memory manager
+ - using the wrong length for the title and body in mail_savemessage
+ * Removed the quick-fix in the npc duplicate check and the impossible condition
+ that is generating the warning. [FlavioJS]
* @/#jobchange no longer strips your equipment since pc_jobchange removes
any unequippables already.
* Removed the wasteful define MAX_PC_CLASS and replaced it by the
diff --git a/src/char_sql/int_mail.c b/src/char_sql/int_mail.c
index b1a1bff5f..bdf7653f1 100644
--- a/src/char_sql/int_mail.c
+++ b/src/char_sql/int_mail.c
@@ -124,8 +124,8 @@ static int mail_savemessage(struct mail_message* msg)
if( SQL_SUCCESS != SqlStmt_PrepareStr(stmt, StringBuf_Value(&buf))
|| SQL_SUCCESS != SqlStmt_BindParam(stmt, 0, SQLDT_STRING, msg->send_name, strnlen(msg->send_name, NAME_LENGTH))
|| SQL_SUCCESS != SqlStmt_BindParam(stmt, 1, SQLDT_STRING, msg->dest_name, strnlen(msg->dest_name, NAME_LENGTH))
- || SQL_SUCCESS != SqlStmt_BindParam(stmt, 2, SQLDT_STRING, msg->title, strnlen(msg->title, NAME_LENGTH))
- || SQL_SUCCESS != SqlStmt_BindParam(stmt, 3, SQLDT_STRING, msg->body, strnlen(msg->body, NAME_LENGTH))
+ || SQL_SUCCESS != SqlStmt_BindParam(stmt, 2, SQLDT_STRING, msg->title, strnlen(msg->title, MAIL_TITLE_LENGTH))
+ || SQL_SUCCESS != SqlStmt_BindParam(stmt, 3, SQLDT_STRING, msg->body, strnlen(msg->body, MAIL_BODY_LENGTH))
|| SQL_SUCCESS != SqlStmt_Execute(stmt) )
{
Sql_ShowDebug(sql_handle);
diff --git a/src/common/malloc.h b/src/common/malloc.h
index f73ff6588..43eff40f1 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -28,7 +28,7 @@
// Whether to use Athena's built-in Memory Manager (enabled by default)
// To disable just comment the following line
#if !defined(DMALLOC) && !defined(BCHECK)
- //#define USE_MEMMGR
+ #define USE_MEMMGR
#endif
// Whether to enable Memory Manager's logging
#define LOG_MEMMGR
diff --git a/src/map/npc.c b/src/map/npc.c
index bbd0363e1..457711255 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -1419,7 +1419,7 @@ void npc_delsrcfile(const char* name)
static void npc_parsename(struct npc_data* nd, const char* name, const char* start, const char* buffer, const char* filepath)
{
const char* p;
- struct npc_data* dnd;
+ struct npc_data* dnd;// duplicate npc
char newname[NAME_LENGTH];
// parse name
@@ -1458,16 +1458,12 @@ static void npc_parsename(struct npc_data* nd, const char* name, const char* sta
safestrncpy(nd->exname, newname, sizeof(nd->exname));
}
- if( *nd->exname == '\0' || (dnd=npc_name2id(nd->exname)) != NULL )
+ if( (dnd=npc_name2id(nd->exname)) != NULL )
{// duplicate unique name, generate new one
char this_mapname[32];
char other_mapname[32];
int i = 0;
- //TODO: the debug message is broken, if nd->exname == NULL
- //dnd is left uninitialized, and then is printed as that!
- if (*nd->exname == '\0')
- dnd = nd; //Dumb anti-crash measure since I am not sure what this piece of code is supposed to do.
do
{
++i;