This commit is contained in:
parent
27c5b588b8
commit
e10126a374
1 changed files with 20 additions and 4 deletions
|
@ -452,7 +452,7 @@ void CMapScene::renderChapterArrows()
|
||||||
x=256-(fh->W/2);
|
x=256-(fh->W/2);
|
||||||
ft4=sb->printFT4Scaled(fh,x,y,0,0,0,scale);
|
ft4=sb->printFT4Scaled(fh,x,y,0,0,0,scale);
|
||||||
}
|
}
|
||||||
if(m_currentChapterSelection<5&&isChapterOpen(m_currentChapterSelection+1))
|
if(m_currentChapterSelection<5-1&&isChapterOpen(m_currentChapterSelection+1))
|
||||||
{
|
{
|
||||||
int scale;
|
int scale;
|
||||||
scale=m_currentIconSelection==MAP_ICON_NEXT_CHAPTER?383:256;
|
scale=m_currentIconSelection==MAP_ICON_NEXT_CHAPTER?383:256;
|
||||||
|
@ -520,19 +520,35 @@ void CMapScene::think(int _frames)
|
||||||
break;
|
break;
|
||||||
case MAP_ICON_NEXT_CHAPTER:
|
case MAP_ICON_NEXT_CHAPTER:
|
||||||
m_currentIconSelection=m_previousIconSelection;
|
m_currentIconSelection=m_previousIconSelection;
|
||||||
|
if(!isLevelOpen(m_currentChapterSelection,m_currentIconSelection-1))
|
||||||
|
{
|
||||||
|
for(int i=MAP_ICON_LEVEL_BONUS;i>=MAP_ICON_LEVEL_1;i--)
|
||||||
|
{
|
||||||
|
if(isLevelOpen(m_currentChapterSelection,i-1))
|
||||||
|
{
|
||||||
|
m_currentIconSelection=i;
|
||||||
|
m_pointerIcon->setTarget(getPointerTargetPosition());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(pad&PAD_DOWN)
|
else if(pad&PAD_DOWN)
|
||||||
{
|
{
|
||||||
int nextChapterAvailable=false;
|
int nextChapterAvailable=false;
|
||||||
if(m_currentChapterSelection<5&&isChapterOpen(m_currentChapterSelection+1))nextChapterAvailable=true;
|
if(m_currentChapterSelection<5-1&&isChapterOpen(m_currentChapterSelection+1))nextChapterAvailable=true;
|
||||||
|
|
||||||
cursor=CURSOR_MOVED;
|
cursor=CURSOR_MOVED;
|
||||||
switch(m_currentIconSelection)
|
switch(m_currentIconSelection)
|
||||||
{
|
{
|
||||||
case MAP_ICON_PREVIOUS_CHAPTER:
|
case MAP_ICON_PREVIOUS_CHAPTER:
|
||||||
m_currentIconSelection=m_previousIconSelection;
|
m_currentIconSelection=m_previousIconSelection;
|
||||||
|
if(!isLevelOpen(m_currentChapterSelection,m_currentIconSelection-1))
|
||||||
|
{
|
||||||
|
m_currentIconSelection=MAP_ICON_LEVEL_1;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case MAP_ICON_LEVEL_1:
|
case MAP_ICON_LEVEL_1:
|
||||||
case MAP_ICON_LEVEL_2:
|
case MAP_ICON_LEVEL_2:
|
||||||
|
@ -677,9 +693,9 @@ void CMapScene::think(int _frames)
|
||||||
case MAP_ICON_NEXT_CHAPTER:
|
case MAP_ICON_NEXT_CHAPTER:
|
||||||
m_currentChapterSelection++;
|
m_currentChapterSelection++;
|
||||||
generateMapScreenImage();
|
generateMapScreenImage();
|
||||||
if(m_currentChapterSelection==5||!isChapterOpen(m_currentChapterSelection+1))
|
if(m_currentChapterSelection==5-1||!isChapterOpen(m_currentChapterSelection+1))
|
||||||
{
|
{
|
||||||
for(int i=MAP_ICON_LEVEL_BONUS;i>MAP_ICON_LEVEL_1;i--)
|
for(int i=MAP_ICON_LEVEL_BONUS;i>=MAP_ICON_LEVEL_1;i--)
|
||||||
{
|
{
|
||||||
if(isLevelOpen(m_currentChapterSelection,i-1))
|
if(isLevelOpen(m_currentChapterSelection,i-1))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue