summaryrefslogtreecommitdiff
path: root/src/map/map.h
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-20 20:40:34 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-20 20:40:34 +0000
commit0c42180571429f5a11ada59e3adc8fff5711c073 (patch)
tree811ce8e6c7f572f07bab57a37679b71ffbfe567b /src/map/map.h
parentb6ea55b755afff6cd8353896353272563498bfe2 (diff)
downloadhercules-0c42180571429f5a11ada59e3adc8fff5711c073.tar.gz
hercules-0c42180571429f5a11ada59e3adc8fff5711c073.tar.bz2
hercules-0c42180571429f5a11ada59e3adc8fff5711c073.tar.xz
hercules-0c42180571429f5a11ada59e3adc8fff5711c073.zip
- Fixed one missed malloc->aMallocA typo, causing memory deallocation problems
- Some small trunk-stable formatting synchronization git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10595 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.h')
-rw-r--r--src/map/map.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/map/map.h b/src/map/map.h
index 4ff29327b..32fea8239 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -38,7 +38,6 @@
#define LIFETIME_FLOORITEM 60
#define DAMAGELOG_SIZE 30
#define LOOTITEM_SIZE 10
-//#define MAX_STATUSCHANGE 300
//Quick defines to know which are the min-max common ailments. [Skotlex]
//Because of the way the headers are included.. these must be replaced for actual values.
//Remember to update as needed! Min is SC_STONE and max is SC_DPOISON currently.
@@ -1033,9 +1032,9 @@ struct pet_data {
// state of a single attack attempt; used in flee/def penalty calculations when mobbed
enum {
- ATK_LUCKY=1, // attack was lucky-dodged
- ATK_FLEE, // attack was dodged
- ATK_DEF // attack connected
+ ATK_LUCKY=1, // attack was lucky-dodged
+ ATK_FLEE, // attack was dodged
+ ATK_DEF // attack connected
};
struct map_data {