diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2015-06-24 18:27:45 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-15 11:45:15 -0400 |
| commit | 9cc8039347c5136adf4c1936db0d221a8217b26a (patch) | |
| tree | f7d129f02414dbbd87b387eba888a6537492a7c1 /src/map/script-fun.cpp | |
| parent | f0c8b228746f62123e2c4d53bcf0808f6c4e3c3a (diff) | |
| download | tmwa-9cc8039347c5136adf4c1936db0d221a8217b26a.tar.gz tmwa-9cc8039347c5136adf4c1936db0d221a8217b26a.tar.bz2 tmwa-9cc8039347c5136adf4c1936db0d221a8217b26a.tar.xz tmwa-9cc8039347c5136adf4c1936db0d221a8217b26a.zip | |
remove ugly workaround
Diffstat (limited to 'src/map/script-fun.cpp')
| -rw-r--r-- | src/map/script-fun.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index 6fe77bf..8afe4ef 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -3667,14 +3667,10 @@ static void builtin_registercmd(ScriptState *st) { RString evoke = conv_str(st, &AARG(0)); - NpcName npcname = stringish<NpcName>(conv_str(st, &AARG(1))); ZString event_ = conv_str(st, &AARG(1)); NpcEvent event; extract(event_, &event); - if (event.label) - spells_by_events.put(evoke, event); - else - spells_by_name.put(evoke, npcname); + spells_by_events.put(evoke, event); } /*========================================== |