Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: #919 egs warning by kerozcak

Browse source
This commit is contained in:
vl 2010-05-20 15:41:41 +02:00
parent ddb6a2dc1c
commit 8564e3992e
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
code/ryzom/server/src/entities_game_service/backward_compatibility/places_back_compat.cpp
View file

@ -32,9 +32,9 @@ namespace BACK_COMPAT
{ {
// !!! DO NOT EDIT THIS TABLE !!! // !!! DO NOT EDIT THIS TABLE !!!
/*
static const string OldPlaces[] = static const string OldPlaces[] =
{ {
/*
"region_groveofconfusion", "region_groveofconfusion",
"region_hiddensource", "region_hiddensource",
"region_hereticshovel", "region_hereticshovel",
@ -552,14 +552,14 @@ static const string OldPlaces[] =
"goo_border_24", "goo_border_24",
"goo_border_23", "goo_border_23",
"goo_border_22" "goo_border_22"
*/
}; };
static vector<uint16> OldToNewPlaceId; static vector<uint16> OldToNewPlaceId;
*/
void initPlacesCompat() void initPlacesCompat()
{ {
static bool initialized = false; /* static bool initialized = false;
if (initialized) if (initialized)
return; return;
@ -579,13 +579,14 @@ void initPlacesCompat()
} }
initialized = true; initialized = true;
*/
} }
uint16 oldToNewPlaceId(uint16 oldId) uint16 oldToNewPlaceId(uint16 oldId)
{ {
BOMB_IF( (oldId >= OldToNewPlaceId.size()), "<oldToNewPlaceId> invalid old place index", return 0xffff ); // BOMB_IF( (oldId >= OldToNewPlaceId.size()), "<oldToNewPlaceId> invalid old place index", return 0xffff );
// return OldToNewPlaceId[oldId];
return OldToNewPlaceId[oldId]; return oldId;
} }
} // namespace BACK_COMPAT } // namespace BACK_COMPAT

7
code/ryzom/server/src/entities_game_service/backward_compatibility/spawn_zones_back_compat.cpp
View file

@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "stdpch.h" #include "stdpch.h"
#include "spawn_zones_back_compat.h" //#include "spawn_zones_back_compat.h"
// game_share // game_share
#include "game_share/utils.h" #include "game_share/utils.h"
@ -27,14 +27,13 @@ using namespace NLMISC;
using namespace NLNET; using namespace NLNET;
using namespace std; using namespace std;
/*
namespace BACK_COMPAT namespace BACK_COMPAT
{ {
// !!! DO NOT EDIT THIS TABLE !!! // !!! DO NOT EDIT THIS TABLE !!!
static const string OldSpawnZones[] = static const string OldSpawnZones[] =
{ {
/*
"spawn_global_fyros_matis", "spawn_global_fyros_matis",
"spawn_global_tryker_matis", "spawn_global_tryker_matis",
"spawn_global_bagne_matis", "spawn_global_bagne_matis",
@ -616,7 +615,6 @@ static const string OldSpawnZones[] =
"spawn_outpost_prime_root_01", "spawn_outpost_prime_root_01",
"spawn_outpost_prime_root_02", "spawn_outpost_prime_root_02",
"spawn_outpost_prime_root_03" "spawn_outpost_prime_root_03"
*/
}; };
static vector<uint16> OldToNewSpawnZoneId; static vector<uint16> OldToNewSpawnZoneId;
@ -650,3 +648,4 @@ uint16 oldToNewSpawnZoneId(uint16 oldId)
} }
} // namespace BACK_COMPAT } // namespace BACK_COMPAT
*/

4
code/ryzom/server/src/entities_game_service/backward_compatibility/spawn_zones_back_compat.h
View file

@ -16,7 +16,7 @@
#ifndef RY_SPAWN_ZONES_BACK_COMPAT_H #ifndef RY_SPAWN_ZONES_BACK_COMPAT_H
#define RY_SPAWN_ZONES_BACK_COMPAT_H #define RY_SPAWN_ZONES_BACK_COMPAT_H
/*
namespace BACK_COMPAT namespace BACK_COMPAT
{ {
@ -24,7 +24,7 @@ void initSpawnZonesCompat();
uint16 oldToNewSpawnZoneId(uint16 oldId); uint16 oldToNewSpawnZoneId(uint16 oldId);
} // namespace BACK_COMPAT } // namespace BACK_COMPAT
*/
#endif // RY_SPAWN_ZONES_BACK_COMPAT_H #endif // RY_SPAWN_ZONES_BACK_COMPAT_H

2
code/ryzom/server/src/entities_game_service/player_manager/character_respawn_points.cpp
View file

@ -23,7 +23,7 @@
#include "game_share/fame.h" #include "game_share/fame.h"
#include "game_share/continent.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_respawn_points.h"
#include "player_manager/character.h" #include "player_manager/character.h"
#include "pvp_manager/pvp_manager_2.h" #include "pvp_manager/pvp_manager_2.h"

4
code/ryzom/server/src/entities_game_service/zone_manager.cpp
View file

@ -43,7 +43,7 @@
#include "pvp_manager/pvp_manager_2.h" #include "pvp_manager/pvp_manager_2.h"
#include "pvp_manager/pvp_safe_zone.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 "backward_compatibility/places_back_compat.h"
#include "pvp_manager/pvp.h" #include "pvp_manager/pvp.h"
@ -636,7 +636,7 @@ void CZoneManager::initInstance()
CPVPManager::getInstance()->applyConfigToPVPZones(); CPVPManager::getInstance()->applyConfigToPVPZones();
// for backward compatibility // for backward compatibility
BACK_COMPAT::initSpawnZonesCompat(); //BACK_COMPAT::initSpawnZonesCompat();
BACK_COMPAT::initPlacesCompat(); BACK_COMPAT::initPlacesCompat();