summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog.txt2
-rw-r--r--conf-tmpl/charcommand_athena.conf3
-rw-r--r--src/common/db.c2
-rw-r--r--src/map/atcommand.c30
-rw-r--r--src/map/atcommand.h2
-rw-r--r--src/map/charcommand.c31
-rw-r--r--src/map/charcommand.h1
7 files changed, 38 insertions, 33 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 69884439d..647006597 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
12/17
+ * Fixed warning message in db.c line 445 [MC Cameri]
+ * Added #effect, removed @chareffect [MC Cameri]
* Reverted a change in map.c causing problems, sorry >.< [celest]
* Updated Sphere Mine - it'll now move in the opposite direction if
being hit by its master [celest]
diff --git a/conf-tmpl/charcommand_athena.conf b/conf-tmpl/charcommand_athena.conf
index 064a79327..9815f669b 100644
--- a/conf-tmpl/charcommand_athena.conf
+++ b/conf-tmpl/charcommand_athena.conf
@@ -17,4 +17,5 @@ option: 60
save: 60
statsall: 40
spiritball: 60
-itemlist: 40 \ No newline at end of file
+itemlist: 40
+effect: 40 \ No newline at end of file
diff --git a/src/common/db.c b/src/common/db.c
index 304165fc2..95a9b3578 100644
--- a/src/common/db.c
+++ b/src/common/db.c
@@ -442,7 +442,7 @@ void db_foreach(struct dbt *table,int (*func)(void*,void*,va_list),...)
sp=0;
while(1){
if (!p->data) {
- printf("Warning: no data for key %d in db_foreach (db.c) !\n",p->key);
+ printf("Warning: no data for key %d in db_foreach (db.c) !\n",(int)p->key);
} else {
func(p->key, p->data, ap);
}
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index d1f645d9c..fcd6812f6 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -186,7 +186,6 @@ ACMD_FUNC(killer); // by MouseJstr
ACMD_FUNC(npcmove); // by MouseJstr
ACMD_FUNC(killable); // by MouseJstr
ACMD_FUNC(charkillable); // by MouseJstr
-ACMD_FUNC(chareffect); // by MouseJstr
ACMD_FUNC(dropall); // by MouseJstr
ACMD_FUNC(chardropall); // by MouseJstr
ACMD_FUNC(storeall); // by MouseJstr
@@ -433,7 +432,6 @@ static AtCommandInfo atcommand_info[] = {
{ AtCommand_NpcMove, "@npcmove", 20, atcommand_npcmove }, // by MouseJstr
{ AtCommand_Killable, "@killable", 40, atcommand_killable }, // by MouseJstr
{ AtCommand_CharKillable, "@charkillable", 40, atcommand_charkillable }, // by MouseJstr
- { AtCommand_Chareffect, "@chareffect", 40, atcommand_chareffect }, // MouseJstr
{ AtCommand_Dropall, "@dropall", 40, atcommand_dropall }, // MouseJstr
{ AtCommand_Chardropall, "@chardropall", 40, atcommand_chardropall }, // MouseJstr
{ AtCommand_Storeall, "@storeall", 40, atcommand_storeall }, // MouseJstr
@@ -7098,34 +7096,6 @@ atcommand_follow(const int fd, struct map_session_data* sd,
/*==========================================
- * @chareffect by [MouseJstr]
- *
- * Create a effect localized on another character
- *------------------------------------------
- */
-int
-atcommand_chareffect(const int fd, struct map_session_data* sd,
- const char* command, const char* message)
-{
- struct map_session_data *pl_sd = NULL;
- char target[255];
- int type = 0;
- nullpo_retr(-1, sd);
-
- if (!message || !*message || sscanf(message, "%d %s", &type, target) != 2) {
- clif_displaymessage(fd, "usage: @chareffect <type+> <target>.");
- return -1;
- }
-
- if((pl_sd=map_nick2sd((char *) target)) == NULL)
- return -1;
-
- clif_specialeffect(&pl_sd->bl, type, 0);
- clif_displaymessage(fd, msg_table[229]); // Your effect has changed.
-
- return 0;
-}
-/*==========================================
* @dropall by [MouseJstr]
*
* Drop all your possession on the ground
diff --git a/src/map/atcommand.h b/src/map/atcommand.h
index 96838b7ae..c1fede0ba 100644
--- a/src/map/atcommand.h
+++ b/src/map/atcommand.h
@@ -168,7 +168,7 @@ enum AtCommandType {
AtCommand_NpcMove, // by MouseJstr
AtCommand_Killable, // by MouseJstr
AtCommand_CharKillable, // by MouseJstr
- AtCommand_Chareffect, // by MouseJstr
+// AtCommand_Chareffect, // by MouseJstr, now #effect
AtCommand_Dropall, // by MouseJstr
AtCommand_Chardropall, // by MouseJstr
AtCommand_Storeall, // by MouseJstr
diff --git a/src/map/charcommand.c b/src/map/charcommand.c
index f38914553..277c9ebfd 100644
--- a/src/map/charcommand.c
+++ b/src/map/charcommand.c
@@ -44,6 +44,7 @@ CCMD_FUNC(stats_all);
CCMD_FUNC(reset);
CCMD_FUNC(spiritball);
CCMD_FUNC(itemlist);
+CCMD_FUNC(effect);
#ifdef TXT_ONLY
/* TXT_ONLY */
@@ -74,6 +75,7 @@ static CharCommandInfo charcommand_info[] = {
{ CharCommandStatsAll, "#statsall", 40, charcommand_stats_all },
{ CharCommandSpiritball, "#spiritball", 40, charcommand_spiritball },
{ CharCommandItemList, "#itemlist", 40, charcommand_itemlist },
+ { CharCommandEffect, "#effect", 40, charcommand_effect },
#ifdef TXT_ONLY
/* TXT_ONLY */
@@ -864,3 +866,32 @@ charcommand_itemlist(
return 0;
}
+
+/*==========================================
+ * #effect by [MouseJstr]
+ *
+ * Create a effect localized on another character
+ *------------------------------------------
+ */
+int
+charcommand_effect(const int fd, struct map_session_data* sd,
+ const char* command, const char* message)
+{
+ struct map_session_data *pl_sd = NULL;
+ char target[255];
+ int type = 0;
+ nullpo_retr(-1, sd);
+
+ if (!message || !*message || sscanf(message, "%d %s", &type, target) != 2) {
+ clif_displaymessage(fd, "usage: #effect <type+> <target>.");
+ return -1;
+ }
+
+ if((pl_sd=map_nick2sd((char *) target)) == NULL)
+ return -1;
+
+ clif_specialeffect(&pl_sd->bl, type, 0);
+ clif_displaymessage(fd, msg_table[229]); // Your effect has changed.
+
+ return 0;
+}
diff --git a/src/map/charcommand.h b/src/map/charcommand.h
index f95fb631c..215e13e05 100644
--- a/src/map/charcommand.h
+++ b/src/map/charcommand.h
@@ -13,6 +13,7 @@ enum CharCommandType {
CharCommandStatsAll,
CharCommandSpiritball,
CharCommandItemList,
+ CharCommandEffect,
#ifdef TXT_ONLY
/* TXT_ONLY */