diff --git a/source/map/map.cpp b/source/map/map.cpp index 39489702f..b0a8209bf 100644 --- a/source/map/map.cpp +++ b/source/map/map.cpp @@ -238,14 +238,11 @@ void CMapScene::init() m_font->setJustification(FontBank::JUST_LEFT); m_currentChapterSelection=s_chapterToStartOn; -/* + m_screenImage=MemAlloc(512*256*2,"MapScreen"); -// m_mapBackgroundImage=(char*)CFileIO::loadFile(MAP_MAP_BACKGROUND_GFX);ASSERT(m_mapBackgroundImage); -u8 *Back=(u8*)CFileIO::loadFile(MAP_MAP_BACKGROUND_GFX);ASSERT(Back); - LZNP_Decode(Back,(u8*)m_screenImage); - MemFree(Back); -*/ - m_screenImage=(char*)LoadPakScreen(MAP_MAP_BACKGROUND_GFX); + ASSERT(m_screenImage); + m_packedBackgroundImage=(char*)CFileIO::loadFile(MAP_MAP_BACKGROUND_GFX); + ASSERT(m_packedBackgroundImage); // Load level Gfx for (int i=0; idump(); delete m_font; } @@ -564,14 +561,14 @@ void CMapScene::generateMapScreenImage() { int i; + LZNP_Decode((u8*)m_packedBackgroundImage,(u8*)m_screenImage); + m_currentLevelSelection=0; -// memcpy(m_screenImage,m_mapBackgroundImage,512*256*2); for(i=0;i