diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-04 16:16:44 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-04 16:16:44 +0000 |
| commit | b8431ef147bb1f98ace6dcad5bfaa7d5e0a02897 (patch) | |
| tree | 748e07ec74b74e79c5240dcec014e0cc948a2851 /src/map/clif.c | |
| parent | 12bca4654c96b32bd282a9ce25b30bbf2f7e08b9 (diff) | |
| download | hercules-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/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index e48714c4e..a66bd72d5 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8003,9 +8003,9 @@ void clif_hotkeys_send(struct map_session_data *sd) { const int fd = sd->fd; int i; if (!fd) return; - WFIFOHEAD(fd, 2+HOTKEY_SAVING*7); + WFIFOHEAD(fd, 2+MAX_HOTKEYS*7); WFIFOW(fd, 0) = 0x02b9; - for(i = 0; i < HOTKEY_SAVING; i++) { + for(i = 0; i < MAX_HOTKEYS; i++) { WFIFOB(fd, 2 + 0 + i * 7) = sd->status.hotkeys[i].type; // type: 0: item, 1: skill WFIFOL(fd, 2 + 1 + i * 7) = sd->status.hotkeys[i].id; // item or skill ID WFIFOW(fd, 2 + 5 + i * 7) = sd->status.hotkeys[i].lv; // skill level @@ -8021,7 +8021,7 @@ void clif_parse_Hotkey(int fd, struct map_session_data *sd) { cmd = RFIFOW(fd, 0); idx = RFIFOW(fd, packet_db[sd->packet_ver][cmd].pos[0]); - if (idx >= HOTKEY_SAVING) return; + if (idx >= MAX_HOTKEYS) return; sd->status.hotkeys[idx].type = RFIFOB(fd, packet_db[sd->packet_ver][cmd].pos[1]); sd->status.hotkeys[idx].id = RFIFOL(fd, packet_db[sd->packet_ver][cmd].pos[2]); |