diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-08-13 08:43:39 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-08-13 08:43:39 -0600 |
| commit | 72eb808de6efd156af1463219572d809caf48978 (patch) | |
| tree | 7eaeaeca11fe793f8b8de00f7797e5dbd9b6cea1 | |
| parent | f6296b7d766a20ad7a48f8e4b01ce67402ae2931 (diff) | |
| download | tmwa-72eb808de6efd156af1463219572d809caf48978.tar.gz tmwa-72eb808de6efd156af1463219572d809caf48978.tar.bz2 tmwa-72eb808de6efd156af1463219572d809caf48978.tar.xz tmwa-72eb808de6efd156af1463219572d809caf48978.zip | |
Fix single message NPCs
Also have magic effect NPCs talk (they just say "?") to prevent problems
when accidentally talking to them.
| -rw-r--r-- | src/map/magic-stmt.c | 2 | ||||
| -rw-r--r-- | src/map/npc.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/map/magic-stmt.c b/src/map/magic-stmt.c index e488c2b..4c866ca 100644 --- a/src/map/magic-stmt.c +++ b/src/map/magic-stmt.c @@ -249,7 +249,7 @@ local_spell_effect(int m, int x, int y, int effect, int tdelay) { int delay = 30000; /* 1 minute should be enough for all interesting spell effects, I hope */ struct npc_data *effect_npc = npc_spawn_text(m, x, y, - INVISIBLE_NPC, "", NULL); + INVISIBLE_NPC, "", "?"); int effect_npc_id = effect_npc->bl.id; entity_effect(&effect_npc->bl, effect, tdelay); diff --git a/src/map/npc.c b/src/map/npc.c index 5fe190b..4e444b1 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -836,7 +836,10 @@ int npc_click(struct map_session_data *sd,int id) break; case MESSAGE: if (nd->u.message) + { clif_scriptmes(sd, id, nd->u.message); + clif_scriptclose(sd, id); + } break; } |