1 files changed, 4 insertions, 6 deletions

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 62f3de2..d24710c 100644
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -103,7 +103,7 @@ dScNewerWorldMap_c *dScNewerWorldMap_c::build() {
 #define STATE_SAVE_ERROR 27

 

 

-void dScNewerWorldMap_c::StartLevel(LevelInfo_Entry *entry) {

+void dScNewerWorldMap_c::StartLevel(LevelInfo::Entry *entry) {

 	for (int i = 0; i < 4; i++) {

 		bool isThere = QueryPlayerAvailability(i);

 		int id = Player_ID[i];

@@ -169,8 +169,8 @@ int dScNewerWorldMap_c::onCreate() {
 	*CurrentDrawFunc = NewerMapDrawFunc;

 

 	// level info

-	this->levelInfo = LoadFile(&this->levelInfoFH, "/NewerRes/LevelInfo.bin");

-	LevelInfo_Prepare(&this->levelInfoFH);

+	levelInfoFile.open("/NewerRes/LevelInfo.bin");

+	levelInfo.load(levelInfoFile.ptr());

 

 	// load the menu info

 	SaveBlock *save = GetSaveFile()->GetBlock(-1);

@@ -192,8 +192,6 @@ int dScNewerWorldMap_c::onCreate() {
 }

 

 int dScNewerWorldMap_c::onDelete() {

-	FreeFile(&this->levelInfoFH);

-

 	FreeScene(0);

 	FreeScene(1);

 

@@ -923,7 +921,7 @@ void dScNewerWorldMap_c::ActivatePoint() {
 	if (this->currentPoint->type == WMPathPoint::LEVEL_TYPE) {

 		int w = this->currentPoint->params[0] - 1;

 		int l = this->currentPoint->params[1] - 1;

-		LevelInfo_Entry *level = LevelInfo_Search(this->levelInfo, w, l);

+		LevelInfo::Entry *level = this->levelInfo.search(w, l);

 		StartLevel(level);

 	}

 }