diff options
| author | Haruna <haru@dotalux.com> | 2014-12-06 18:25:14 +0100 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2014-12-06 18:25:14 +0100 |
| commit | 738e39d33186a4ff1a620509a7c13d986ff43ecb (patch) | |
| tree | e5176f3de9e227a8d76aee17c07165b1b7deccde /src/char | |
| parent | 04d981077de4bc5d6d0cf69a946091add1dc9309 (diff) | |
| parent | 2f9c0cc0c00339d2098907ad5542226b12e0f9f4 (diff) | |
| download | hercules-738e39d33186a4ff1a620509a7c13d986ff43ecb.tar.gz hercules-738e39d33186a4ff1a620509a7c13d986ff43ecb.tar.bz2 hercules-738e39d33186a4ff1a620509a7c13d986ff43ecb.tar.xz hercules-738e39d33186a4ff1a620509a7c13d986ff43ecb.zip | |
Merge pull request #403 from 4144/mapext
into mapindex add variable with default map and position.
Diffstat (limited to 'src/char')
| -rw-r--r-- | src/char/char.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/char/char.c b/src/char/char.c index d3b18cfa6..b18beed60 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -1216,15 +1216,15 @@ int char_mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_every p->save_point.map = mapindex->name2id(save_map); if( p->last_point.map == 0 ) { - p->last_point.map = (unsigned short)strdb_iget(mapindex->db, MAP_DEFAULT); - p->last_point.x = MAP_DEFAULT_X; - p->last_point.y = MAP_DEFAULT_Y; + p->last_point.map = (unsigned short)strdb_iget(mapindex->db, mapindex->default_map); + p->last_point.x = mapindex->default_x; + p->last_point.y = mapindex->default_y; } if( p->save_point.map == 0 ) { - p->save_point.map = (unsigned short)strdb_iget(mapindex->db, MAP_DEFAULT); - p->save_point.x = MAP_DEFAULT_X; - p->save_point.y = MAP_DEFAULT_Y; + p->save_point.map = (unsigned short)strdb_iget(mapindex->db, mapindex->default_map); + p->save_point.x = mapindex->default_x; + p->save_point.y = mapindex->default_y; } strcat(t_msg, " status"); @@ -5718,6 +5718,7 @@ void do_shutdown(void) } void char_hp_symbols(void) { + HPM->share(mapindex,"mapindex"); HPM->share(chr, "chr"); HPM->share(geoip, "geoip"); HPM->share(inter_auction, "inter_auction"); |