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

"Welcome back to <del>Celebrity Jeopardy</del> sm-ssc. I thought I was done with this, but <del>Regis Philbin</del> ScreenSelectMaster Cursor, that mongrel idiot, decided to <del>do a Celebrity Millionaire</del> crash, and <del>network</del> theming competition being what it is, I stand before you, a broken and miserable man."

Browse Source 
For people who hate comedy in their commit logs, this makes it so ScreenSelectMaster only runs commands on cursors for human players (hopefully avoiding Access Violation in the process).
This commit is contained in:
AJ Kelly
2011-01-30 16:37:47 -06:00
parent f889228af8
commit f60d27afb7
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Changelog_sm-ssc.txt
+4
View File
@@ -13,6 +13,10 @@ _____________________________________________________________________________
sm-ssc v1.2.1 | 2011011? sm-ssc v1.2.1 | 2011011?
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
20110130
--------
* [ScreenSelectMaster] Only run cursor commands on players if they exist. [AJ]
20110118 20110118
-------- --------
* [ScreenEdit] Move editing Timing Data to their own mini menu. [Wolfman2000] * [ScreenEdit] Move editing Timing Data to their own mini menu. [Wolfman2000]
src/ScreenSelectMaster.cpp
+16 -9
View File
@@ -551,14 +551,17 @@ bool ScreenSelectMaster::ChangePage( int iNewChoice )
FOREACH( PlayerNumber, vpns, p ) FOREACH( PlayerNumber, vpns, p )
{ {
if( SHOW_CURSOR ) if( GAMESTATE->IsHumanPlayer(*p) )
{ {
m_sprCursor[*p]->HandleMessage( msg ); if( SHOW_CURSOR )
m_sprCursor[*p]->SetXY( GetCursorX(*p), GetCursorY(*p) ); {
} m_sprCursor[*p]->HandleMessage( msg );
m_sprCursor[*p]->SetXY( GetCursorX(*p), GetCursorY(*p) );
}
if( SHOW_SCROLLER ) if( SHOW_SCROLLER )
m_vsprScroll[*p][m_iChoice[*p]]->HandleMessage( msg ); m_vsprScroll[*p][m_iChoice[*p]]->HandleMessage( msg );
}
} }
if( newPage == PAGE_2 ) if( newPage == PAGE_2 )
@@ -649,8 +652,11 @@ bool ScreenSelectMaster::ChangeSelection( PlayerNumber pn, MenuDir dir, int iNew
if( SHOW_CURSOR ) if( SHOW_CURSOR )
{ {
m_sprCursor[*p]->PlayCommand( "Change" ); if( GAMESTATE->IsHumanPlayer(*p) )
m_sprCursor[*p]->SetXY( GetCursorX(*p), GetCursorY(*p) ); {
m_sprCursor[*p]->PlayCommand( "Change" );
m_sprCursor[*p]->SetXY( GetCursorX(*p), GetCursorY(*p) );
}
} }
if( SHOW_SCROLLER ) if( SHOW_SCROLLER )
@@ -880,7 +886,8 @@ void ScreenSelectMaster::TweenOnScreen()
{ {
FOREACH( PlayerNumber, vpns, p ) FOREACH( PlayerNumber, vpns, p )
{ {
m_sprCursor[*p]->SetXY( GetCursorX(*p), GetCursorY(*p) ); if( GAMESTATE->IsHumanPlayer(*p) )
m_sprCursor[*p]->SetXY( GetCursorX(*p), GetCursorY(*p) );
} }
} }