summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-04 16:16:44 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-04 16:16:44 +0000
commitb8431ef147bb1f98ace6dcad5bfaa7d5e0a02897 (patch)
tree748e07ec74b74e79c5240dcec014e0cc948a2851 /src/common
parent12bca4654c96b32bd282a9ce25b30bbf2f7e08b9 (diff)
downloadhercules-b8431ef147bb1f98ace6dcad5bfaa7d5e0a02897.tar.gz
hercules-b8431ef147bb1f98ace6dcad5bfaa7d5e0a02897.tar.bz2
hercules-b8431ef147bb1f98ace6dcad5bfaa7d5e0a02897.tar.xz
hercules-b8431ef147bb1f98ace6dcad5bfaa7d5e0a02897.zip
* Added MAX_HOTKEYS to supplement the HOTKEY_SAVING define
* Fixed a compile problem when hotkey saving is disabled (topic:167265) * Added script source error reporting to countitem() (topic:167165) * Removed integer mob skill state/target definition support (unused) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11353 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
-rw-r--r--src/common/mmo.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 4858a1667..ddc43ebbf 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -11,11 +11,12 @@
//Remove/Comment this line to disable sc_data saving. [Skotlex]
#define ENABLE_SC_SAVING
-
//Remove/Comment this line to disable server-side hot-key saving support [Skotlex]
//Note that newer clients no longer save hotkeys in the registry!
+#define HOTKEY_SAVING
+
//The number is the max number of hotkeys to save (27 = 9 skills x 3 bars)
-#define HOTKEY_SAVING 27
+#define MAX_HOTKEYS 27
#define MAX_MAP_PER_SERVER 1024
#define MAX_INVENTORY 100
@@ -230,7 +231,7 @@ struct mmo_charstatus {
struct s_friend friends[MAX_FRIENDS]; //New friend system [Skotlex]
#ifdef HOTKEY_SAVING
- struct hotkey hotkeys[HOTKEY_SAVING];
+ struct hotkey hotkeys[MAX_HOTKEYS];
#endif
};