zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-07-29 19:06:48 +00:00
parent e649f6168e
commit 34f1c40381
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
source/map/map.cpp
View file

@ -238,14 +238,11 @@ void CMapScene::init()
m_font->setJustification(FontBank::JUST_LEFT); m_font->setJustification(FontBank::JUST_LEFT);
m_currentChapterSelection=s_chapterToStartOn; m_currentChapterSelection=s_chapterToStartOn;
/*
m_screenImage=MemAlloc(512*256*2,"MapScreen"); m_screenImage=MemAlloc(512*256*2,"MapScreen");
// m_mapBackgroundImage=(char*)CFileIO::loadFile(MAP_MAP_BACKGROUND_GFX);ASSERT(m_mapBackgroundImage); ASSERT(m_screenImage);
u8 *Back=(u8*)CFileIO::loadFile(MAP_MAP_BACKGROUND_GFX);ASSERT(Back); m_packedBackgroundImage=(char*)CFileIO::loadFile(MAP_MAP_BACKGROUND_GFX);
LZNP_Decode(Back,(u8*)m_screenImage); ASSERT(m_packedBackgroundImage);
MemFree(Back);
*/
m_screenImage=(char*)LoadPakScreen(MAP_MAP_BACKGROUND_GFX);
// Load level Gfx // Load level Gfx
for (int i=0; i<MAP_GFX_MAX; i++) for (int i=0; i<MAP_GFX_MAX; i++)
@ -287,7 +284,7 @@ void CMapScene::shutdown()
} }
delete m_pointerIcon; delete m_pointerIcon;
// MemFree(m_mapBackgroundImage); MemFree(m_packedBackgroundImage);
MemFree(m_screenImage); MemFree(m_screenImage);
m_font->dump(); delete m_font; m_font->dump(); delete m_font;
} }
@ -564,14 +561,14 @@ void CMapScene::generateMapScreenImage()
{ {
int i; int i;
LZNP_Decode((u8*)m_packedBackgroundImage,(u8*)m_screenImage);
m_currentLevelSelection=0; m_currentLevelSelection=0;
// memcpy(m_screenImage,m_mapBackgroundImage,512*256*2);
for(i=0;i<MAP_NUM_LEVELS_PER_CHAPTER;i++) for(i=0;i<MAP_NUM_LEVELS_PER_CHAPTER;i++)
{ {
if(isLevelOpen(m_currentChapterSelection,i)) if(isLevelOpen(m_currentChapterSelection,i))
{ {
copyImageToScreen(s_mapLevelData[m_currentChapterSelection][i].m_Gfx,s_mapLevelPositions[i].vx,s_mapLevelPositions[i].vy,MAP_LEVEL_WIDTH,MAP_LEVEL_HEIGHT); copyImageToScreen(s_mapLevelData[m_currentChapterSelection][i].m_Gfx,s_mapLevelPositions[i].vx,s_mapLevelPositions[i].vy,MAP_LEVEL_WIDTH,MAP_LEVEL_HEIGHT);
// copyImageToScreen(s_mapLevelData[m_currentChapterSelection][i].m_mapFile,s_mapLevelPositions[i].vx,s_mapLevelPositions[i].vy,MAP_LEVEL_WIDTH,MAP_LEVEL_HEIGHT);
} }
} }
@ -593,12 +590,10 @@ void CMapScene::copyImageToScreen(int _file,int _x,int _y,int _w,int _h)
image=(u8*)MemAlloc(MAP_LEVEL_WIDTH*MAP_LEVEL_HEIGHT*2,"MapLvlBuffer"); image=(u8*)MemAlloc(MAP_LEVEL_WIDTH*MAP_LEVEL_HEIGHT*2,"MapLvlBuffer");
LZNP_Decode(s_GfxTable[_file].Gfx,image); LZNP_Decode(s_GfxTable[_file].Gfx,image);
// image=CFileIO::loadFile((FileEquate)_file);ASSERT(image);
src=(u16*)image; src=(u16*)image;
dst=(u16*)m_screenImage+(_x+(_y*512)); dst=(u16*)m_screenImage+(_x+(_y*512));
for(y=0;y<_h;y++) for(y=0;y<_h;y++)
{ {
// memcpy(dst,src,_w*2);
u32 *S=(u32*)src; u32 *S=(u32*)src;
u32 *D=(u32*)dst; u32 *D=(u32*)dst;
for (int x=0; x<MAP_LEVEL_WIDTH/2; x++) for (int x=0; x<MAP_LEVEL_WIDTH/2; x++)

2
source/map/map.h
View file

@ -142,7 +142,7 @@ private:
int m_musicStarted; int m_musicStarted;
char *m_screenImage; char *m_screenImage;
// char *m_mapBackgroundImage; char *m_packedBackgroundImage;
int m_currentChapterSelection; int m_currentChapterSelection;
int m_currentLevelSelection; int m_currentLevelSelection;