diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2015-11-21 21:05:30 -0500 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2015-11-21 21:05:30 -0500 |
| commit | 29b219f6a668b26442b0cfcf7fb9dcdf4b7d8c0d (patch) | |
| tree | b13568df19333f7b21dedf739677c67b6c0bb904 /src/map | |
| parent | f7c99c70de0f5bd77939966d085ad0da61bfd739 (diff) | |
| parent | f6b949498ddb7a3738405f76cb300134d2653247 (diff) | |
| download | tmwa-29b219f6a668b26442b0cfcf7fb9dcdf4b7d8c0d.tar.gz tmwa-29b219f6a668b26442b0cfcf7fb9dcdf4b7d8c0d.tar.bz2 tmwa-29b219f6a668b26442b0cfcf7fb9dcdf4b7d8c0d.tar.xz tmwa-29b219f6a668b26442b0cfcf7fb9dcdf4b7d8c0d.zip | |
Merge pull request #182 from mekolat/warps
do not require a name for warps
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/npc-parse.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/npc-parse.cpp b/src/map/npc-parse.cpp index 9ee84d2..0bd23a9 100644 --- a/src/map/npc-parse.cpp +++ b/src/map/npc-parse.cpp @@ -153,7 +153,7 @@ bool npc_load_warp(ast::npc::Warp& warp) nd->dir = DIR::S; nd->flag = 0; nd->sit = DamageType::STAND; - nd->name = warp.name.data; + nd->name = stringish<NpcName>(STRPRINTF("w%c%i"_fmt, 6, nd->bl_id)); nd->npc_class = WARP_CLASS; nd->speed = 200_ms; |