summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-30 03:47:18 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-30 03:47:18 +0000
commitf29b1bc83edac7b0f153b98bb64ac79d29b633a0 (patch)
tree95fc02c911379d0d544bb9d99ebf1a8e1f844404
parent646305245c8bebe78169ceb93a62b058ed1edd89 (diff)
downloadhercules-f29b1bc83edac7b0f153b98bb64ac79d29b633a0.tar.gz
hercules-f29b1bc83edac7b0f153b98bb64ac79d29b633a0.tar.bz2
hercules-f29b1bc83edac7b0f153b98bb64ac79d29b633a0.tar.xz
hercules-f29b1bc83edac7b0f153b98bb64ac79d29b633a0.zip
update
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@866 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt3
-rw-r--r--Makefile1
-rw-r--r--src/char_sql/int_guild.c8
-rw-r--r--src/char_sql/int_party.c6
-rw-r--r--src/char_sql/int_pet.c6
-rw-r--r--src/char_sql/int_storage.c5
-rw-r--r--src/map/atcommand.c35
-rw-r--r--src/map/atcommand.h3
-rw-r--r--src/map/map.h2
9 files changed, 55 insertions, 14 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 222c6a9aa..0b77a3a4b 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,8 @@
Date Added
12/29
+ * Another -1 alive_timer fix (SVN 866) [MouseJstr]
+ * Added @dmstart and @dmtick for debugging malloc tests [MouseJstr]
+ * Fix some more compile errors on different platforms [MouseJstr]
* Fixing a crash if you change the name of a pet you don't have (SVN 863) [MouseJstr]
* Eliminated src/common/malloc.c when not needed [MouseJstr]
* Some code cleanup in prep for new debugging malloc (SVN 861) [MouseJstr]
diff --git a/Makefile b/Makefile
index e8f251ad4..254ac58c1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-# $Id: Makefile 158 2004-10-01 03:45:15Z PoW $
CC = gcc -pipe
# CC = gcc -pipe -x c++
diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c
index 258c173cf..3f9243bfe 100644
--- a/src/char_sql/int_guild.c
+++ b/src/char_sql/int_guild.c
@@ -4,6 +4,10 @@
//
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
#include "char.h"
#include "../common/strlib.h"
#include "int_storage.h"
@@ -15,10 +19,6 @@
#include "db.h"
#include "malloc.h"
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
static struct dbt *guild_db_;
static struct dbt *castle_db_;
static struct dbt *guild_expcache_db_;
diff --git a/src/char_sql/int_party.c b/src/char_sql/int_party.c
index 05a607a15..af3ad7dc3 100644
--- a/src/char_sql/int_party.c
+++ b/src/char_sql/int_party.c
@@ -3,12 +3,12 @@
// SQL conversion by hack
//
-#include "char.h"
-#include "../common/strlib.h"
-#include "socket.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "char.h"
+#include "../common/strlib.h"
+#include "socket.h"
static struct party *party_pt;
static int party_newid=100;
diff --git a/src/char_sql/int_pet.c b/src/char_sql/int_pet.c
index edad95f84..44151c8e4 100644
--- a/src/char_sql/int_pet.c
+++ b/src/char_sql/int_pet.c
@@ -2,13 +2,13 @@
// original code from athena
// SQL conversion by Jioh L. Jung
//
-#include "char.h"
-#include "../common/strlib.h"
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "char.h"
+#include "../common/strlib.h"
+
struct s_pet *pet_pt;
static int pet_newid = 100;
diff --git a/src/char_sql/int_storage.c b/src/char_sql/int_storage.c
index a6ad01eea..69eaf2469 100644
--- a/src/char_sql/int_storage.c
+++ b/src/char_sql/int_storage.c
@@ -2,11 +2,12 @@
// original code from athena
// SQL conversion by Jioh L. Jung
//
-#include "char.h"
-#include "itemdb.h"
#include <string.h>
#include <stdlib.h>
+#include "char.h"
+#include "itemdb.h"
+
#define STORAGE_MEMINC 16
// reset by inter_config_read()
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index dc6c55777..2f7cdd995 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -230,6 +230,11 @@ ACMD_FUNC(rings); // by MouseJstr
ACMD_FUNC(grind); // by MouseJstr
ACMD_FUNC(grind2); // by MouseJstr
+#ifdef DMALLOC
+ACMD_FUNC(dmstart); // by MouseJstr
+ACMD_FUNC(dmtick); // by MouseJstr
+#endif
+
ACMD_FUNC(jumptoid); // by Dino9021
ACMD_FUNC(jumptoid2); // by Dino9021
ACMD_FUNC(recallid); // by Dino9021
@@ -490,6 +495,11 @@ static AtCommandInfo atcommand_info[] = {
{ AtCommand_Grind, "@grind", 99, atcommand_grind }, // [MouseJstr]
{ AtCommand_Grind2, "@grind2", 99, atcommand_grind2 }, // [MouseJstr]
+#ifdef DMALLOC
+ { AtCommand_DMStart, "@dmstart", 99, atcommand_dmstart }, // [MouseJstr]
+ { AtCommand_DMTick, "@dmtick", 99, atcommand_dmtick }, // [MouseJstr]
+#endif
+
{ AtCommand_JumpToId, "@jumptoid", 20, atcommand_jumptoid }, // [Dino9021]
{ AtCommand_JumpToId, "@warptoid", 20, atcommand_jumptoid }, // [Dino9021]
{ AtCommand_JumpToId, "@gotoid", 20, atcommand_jumptoid }, // [Dino9021]
@@ -7329,6 +7339,31 @@ atcommand_rings(const int fd, struct map_session_data* sd,
return 0;
}
+#ifdef DMALLOC
+unsigned long dmark_;
+int
+atcommand_dmstart(const int fd, struct map_session_data* sd,
+ const char* command, const char* message)
+{
+ dmark_ = dmalloc_mark();
+
+ clif_displaymessage(fd, "debug mark set");
+
+ return 0;
+}
+
+int
+atcommand_dmtick(const int fd, struct map_session_data* sd,
+ const char* command, const char* message)
+{
+ dmalloc_log_changed ( dmark_, 1, 0, 1 ) ;
+ dmark_ = dmalloc_mark();
+ clif_displaymessage(fd, "malloc changes logged");
+
+ return 0;
+}
+#endif
+
/*==========================================
* @grind by [MouseJstr]
*------------------------------------------
diff --git a/src/map/atcommand.h b/src/map/atcommand.h
index d53be174d..4dba383e3 100644
--- a/src/map/atcommand.h
+++ b/src/map/atcommand.h
@@ -217,6 +217,9 @@ enum AtCommandType {
AtCommand_Grind, // by MouseJstr
AtCommand_Grind2, // by MouseJstr
+ AtCommand_DMStart, // by MouseJstr
+ AtCommand_DMTick, // by MouseJstr
+
AtCommand_JumpToId, // by Dino9021
AtCommand_JumpToId2, // by Dino9021
AtCommand_RecallId, // by Dino9021
diff --git a/src/map/map.h b/src/map/map.h
index 405c34d65..eecb35afc 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -327,7 +327,7 @@ struct map_session_data {
int last_skillid,last_skilllv; // Added by RoVeRT
unsigned char change_level; // [celest]
- unsigned int alive_timer; //[Valaris]
+ int alive_timer; //[Valaris]
#ifndef TXT_ONLY
int mail_counter; // mail counter for mail system [Valaris]