diff --git a/code/ryzom/server/src/entities_game_service/backward_compatibility/places_back_compat.cpp b/code/ryzom/server/src/entities_game_service/backward_compatibility/places_back_compat.cpp index 195ac704f..4aa178eab 100644 --- a/code/ryzom/server/src/entities_game_service/backward_compatibility/places_back_compat.cpp +++ b/code/ryzom/server/src/entities_game_service/backward_compatibility/places_back_compat.cpp @@ -32,9 +32,9 @@ namespace BACK_COMPAT { // !!! DO NOT EDIT THIS TABLE !!! +/* static const string OldPlaces[] = { -/* "region_groveofconfusion", "region_hiddensource", "region_hereticshovel", @@ -552,14 +552,14 @@ static const string OldPlaces[] = "goo_border_24", "goo_border_23", "goo_border_22" -*/ }; static vector OldToNewPlaceId; +*/ void initPlacesCompat() { - static bool initialized = false; +/* static bool initialized = false; if (initialized) return; @@ -579,13 +579,14 @@ void initPlacesCompat() } initialized = true; +*/ } uint16 oldToNewPlaceId(uint16 oldId) { - BOMB_IF( (oldId >= OldToNewPlaceId.size()), " invalid old place index", return 0xffff ); - - return OldToNewPlaceId[oldId]; +// BOMB_IF( (oldId >= OldToNewPlaceId.size()), " invalid old place index", return 0xffff ); +// return OldToNewPlaceId[oldId]; + return oldId; } } // namespace BACK_COMPAT diff --git a/code/ryzom/server/src/entities_game_service/backward_compatibility/spawn_zones_back_compat.cpp b/code/ryzom/server/src/entities_game_service/backward_compatibility/spawn_zones_back_compat.cpp index 25101d640..73c2c3c3d 100644 --- a/code/ryzom/server/src/entities_game_service/backward_compatibility/spawn_zones_back_compat.cpp +++ b/code/ryzom/server/src/entities_game_service/backward_compatibility/spawn_zones_back_compat.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stdpch.h" -#include "spawn_zones_back_compat.h" +//#include "spawn_zones_back_compat.h" // game_share #include "game_share/utils.h" @@ -27,14 +27,13 @@ using namespace NLMISC; using namespace NLNET; using namespace std; - +/* namespace BACK_COMPAT { // !!! DO NOT EDIT THIS TABLE !!! static const string OldSpawnZones[] = { -/* "spawn_global_fyros_matis", "spawn_global_tryker_matis", "spawn_global_bagne_matis", @@ -616,7 +615,6 @@ static const string OldSpawnZones[] = "spawn_outpost_prime_root_01", "spawn_outpost_prime_root_02", "spawn_outpost_prime_root_03" -*/ }; static vector OldToNewSpawnZoneId; @@ -650,3 +648,4 @@ uint16 oldToNewSpawnZoneId(uint16 oldId) } } // namespace BACK_COMPAT +*/ \ No newline at end of file diff --git a/code/ryzom/server/src/entities_game_service/backward_compatibility/spawn_zones_back_compat.h b/code/ryzom/server/src/entities_game_service/backward_compatibility/spawn_zones_back_compat.h index f06c632d7..349930857 100644 --- a/code/ryzom/server/src/entities_game_service/backward_compatibility/spawn_zones_back_compat.h +++ b/code/ryzom/server/src/entities_game_service/backward_compatibility/spawn_zones_back_compat.h @@ -16,7 +16,7 @@ #ifndef RY_SPAWN_ZONES_BACK_COMPAT_H #define RY_SPAWN_ZONES_BACK_COMPAT_H - +/* namespace BACK_COMPAT { @@ -24,7 +24,7 @@ void initSpawnZonesCompat(); uint16 oldToNewSpawnZoneId(uint16 oldId); } // namespace BACK_COMPAT - +*/ #endif // RY_SPAWN_ZONES_BACK_COMPAT_H diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_respawn_points.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character_respawn_points.cpp index fcf4a95b0..9fd4f003d 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character_respawn_points.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/character_respawn_points.cpp @@ -23,7 +23,7 @@ #include "game_share/fame.h" #include "game_share/continent.h" -#include "backward_compatibility/spawn_zones_back_compat.h" +//#include "backward_compatibility/spawn_zones_back_compat.h" #include "player_manager/character_respawn_points.h" #include "player_manager/character.h" #include "pvp_manager/pvp_manager_2.h" diff --git a/code/ryzom/server/src/entities_game_service/zone_manager.cpp b/code/ryzom/server/src/entities_game_service/zone_manager.cpp index 191917961..7e4bc519f 100644 --- a/code/ryzom/server/src/entities_game_service/zone_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/zone_manager.cpp @@ -43,7 +43,7 @@ #include "pvp_manager/pvp_manager_2.h" #include "pvp_manager/pvp_safe_zone.h" -#include "backward_compatibility/spawn_zones_back_compat.h" +//#include "backward_compatibility/spawn_zones_back_compat.h" #include "backward_compatibility/places_back_compat.h" #include "pvp_manager/pvp.h" @@ -636,7 +636,7 @@ void CZoneManager::initInstance() CPVPManager::getInstance()->applyConfigToPVPZones(); // for backward compatibility - BACK_COMPAT::initSpawnZonesCompat(); + //BACK_COMPAT::initSpawnZonesCompat(); BACK_COMPAT::initPlacesCompat();