actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix crash with ShowCursor+SharedSelection

Browse Source
This commit is contained in:
Flameshadowxeroshin
2017-06-29 11:52:25 -05:00
parent 557be7cf1b
commit 4c9f06c693
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenSelectMaster.cpp
+7 -4
View File
@@ -684,7 +684,7 @@ bool ScreenSelectMaster::ChangePage( int iNewChoice )
FOREACH( PlayerNumber, vpns, p ) FOREACH( PlayerNumber, vpns, p )
{ {
if( GAMESTATE->IsHumanPlayer(*p) ) if( GAMESTATE->IsHumanPlayer(*p) || SHARED_SELECTION )
{ {
if( SHOW_CURSOR ) if( SHOW_CURSOR )
{ {
@@ -787,8 +787,11 @@ bool ScreenSelectMaster::ChangeSelection( PlayerNumber pn, MenuDir dir, int iNew
{ {
if( GAMESTATE->IsHumanPlayer(*p) ) if( GAMESTATE->IsHumanPlayer(*p) )
{ {
m_sprCursor[*p]->PlayCommand( "Change" ); PlayerNumber ep = *p;
m_sprCursor[*p]->SetXY( GetCursorX(*p), GetCursorY(*p) ); if( SHARED_SELECTION )
ep = PLAYER_1;
m_sprCursor[ep]->PlayCommand( "Change" );
m_sprCursor[ep]->SetXY( GetCursorX(*p), GetCursorY(*p) );
} }
} }
@@ -1039,7 +1042,7 @@ void ScreenSelectMaster::TweenOnScreen()
{ {
FOREACH( PlayerNumber, vpns, p ) FOREACH( PlayerNumber, vpns, p )
{ {
if( GAMESTATE->IsHumanPlayer(*p) ) if( GAMESTATE->IsHumanPlayer(*p) || SHARED_SELECTION )
m_sprCursor[*p]->SetXY( GetCursorX(*p), GetCursorY(*p) ); m_sprCursor[*p]->SetXY( GetCursorX(*p), GetCursorY(*p) );
} }
} }