Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed mapindex from char-server (#7533)

Browse Source 
Converted last_point to mapname
Converted save_point to mapname
Converted memo to mapname
Converted start point to mapname
Removed default map
Converted party member to mapname
Converted maplists to mapname
Removed mapindex loading
Fixed instance loading with multiple map-servers
Fixed castle loading with multiple map-servers
Fixed battleground loading with multiple map-servers
Fixed warping between map-servers

Thanks to @aleos89 for his help!
This commit is contained in:
Lemongrass3110
2023-01-11 16:54:53 +01:00
committed by GitHub
parent cbe2acb786
commit 14cb61d598
25 changed files with 311 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/map/guild.cpp
View File

@@ -299,7 +299,7 @@ uint64 CastleDatabase::parseBodyNode(const ryml::NodeRef& node) {
uint16 mapindex = mapindex_name2idx(map_name.c_str(), nullptr);
if (map_mapindex2mapid(mapindex) < 0) {
if( mapindex == 0 ){
this->invalidWarning(node["Map"], "Map %s doesn't exist, skipping.\n", map_name.c_str());
return 0;
}
@@ -394,7 +394,8 @@ uint64 CastleDatabase::parseBodyNode(const ryml::NodeRef& node) {
map_data* md = map_getmapdata( map_mapindex2mapid( gc->mapindex ) );
if( warp_x >= md->xs ){
// If the map is on another map-server, we cannot verify the bounds
if( md != nullptr && warp_x >= md->xs ){
this->invalidWarning( node["WarpX"], "WarpX has to be smaller than %hu.\n", md->xs );
return 0;
}
@@ -420,7 +421,8 @@ uint64 CastleDatabase::parseBodyNode(const ryml::NodeRef& node) {
map_data* md = map_getmapdata( map_mapindex2mapid( gc->mapindex ) );
if( warp_y >= md->ys ){
// If the map is on another map-server, we cannot verify the bounds
if( md != nullptr && warp_y >= md->ys ){
this->invalidWarning( node["WarpY"], "WarpY has to be smaller than %hu.\n", md->ys );
return 0;
}
@@ -1218,11 +1220,9 @@ int guild_member_withdraw(int guild_id, uint32 account_id, uint32 char_id, int f
if (g->instance_id) {
struct map_data *mapdata = map_getmapdata(sd->bl.m);
if (mapdata->instance_id) { // User was on the instance map
if (mapdata->save.map)
pc_setpos(sd, mapdata->save.map, mapdata->save.x, mapdata->save.y, CLR_TELEPORT);
else
pc_setpos(sd, sd->status.save_point.map, sd->status.save_point.x, sd->status.save_point.y, CLR_TELEPORT);
// User was on the instance map of the guild
if( g->instance_id == mapdata->instance_id ){
pc_setpos_savepoint( *sd );
}
}