summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-05-02 21:41:57 -0300
committershennetsind <ind@henn.et>2013-05-02 21:41:57 -0300
commit64adafab4a56d97f547a5daf0f9feda3f9a12032 (patch)
tree61defddf4e9a71f64fe4295944833815ef820a5a
parent274bfc3b06616ea03c467d8eed23fae61c72fe18 (diff)
downloadhercules-64adafab4a56d97f547a5daf0f9feda3f9a12032.tar.gz
hercules-64adafab4a56d97f547a5daf0f9feda3f9a12032.tar.bz2
hercules-64adafab4a56d97f547a5daf0f9feda3f9a12032.tar.xz
hercules-64adafab4a56d97f547a5daf0f9feda3f9a12032.zip
Fixed Bug #7064
Special Thanks to Kyeme~! http://hercules.ws/board/tracker/issue-7064-item-scroll/ Signed-off-by: shennetsind <ind@henn.et>
-rw-r--r--conf/messages.conf3
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/clif.h1
-rw-r--r--src/map/pc.c1
4 files changed, 6 insertions, 1 deletions
diff --git a/conf/messages.conf b/conf/messages.conf
index f3055145f..cc0ecb900 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -1496,5 +1496,8 @@
1472: - Available Costumes
1473: Costume '%s' removed.
+//src/map/pc.c::pc_isUseitem
+1474: You cannot use this item while sitting
+
//Custom translations
import: conf/import/msg_conf.txt
diff --git a/src/map/clif.c b/src/map/clif.c
index 0c323c6cd..2210c3072 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -17000,7 +17000,7 @@ void clif_bc_ready(void) {
*
*------------------------------------------*/
int do_init_clif(void) {
- const char* colors[COLOR_MAX] = { "0xFF0000", "0x00ff00" };
+ const char* colors[COLOR_MAX] = { "0xFF0000", "0x00ff00", "0xffffff" };
int i;
/**
* Setup Color Table (saves unnecessary load of strtoul on every call)
diff --git a/src/map/clif.h b/src/map/clif.h
index 9dfa83e00..b981cc535 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -324,6 +324,7 @@ enum clif_messages {
enum clif_colors {
COLOR_RED,
COLOR_DEFAULT,
+ COLOR_WHITE,
COLOR_MAX
};
diff --git a/src/map/pc.c b/src/map/pc.c
index 892c27e87..59b1c7443 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4087,6 +4087,7 @@ int pc_isUseitem(struct map_session_data *sd,int n)
return 0;
if( (item->item_usage.flag&NOUSE_SITTING) && (pc_issit(sd) == 1) && (pc_get_group_level(sd) < item->item_usage.override) ) {
+ clif->colormes(sd->fd,COLOR_WHITE,msg_txt(1474));
return 0; // You cannot use this item while sitting.
}