diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-30 03:47:18 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-30 03:47:18 +0000 |
| commit | f29b1bc83edac7b0f153b98bb64ac79d29b633a0 (patch) | |
| tree | 95fc02c911379d0d544bb9d99ebf1a8e1f844404 /src/map | |
| parent | 646305245c8bebe78169ceb93a62b058ed1edd89 (diff) | |
| download | hercules-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
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 35 | ||||
| -rw-r--r-- | src/map/atcommand.h | 3 | ||||
| -rw-r--r-- | src/map/map.h | 2 |
3 files changed, 39 insertions, 1 deletions
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] |