AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-15 18:45:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix using scroll wheel on last column past last valid item crashing the client. (Thanks nyxzimus)

Browse Source
This commit is contained in:
UnknownShadow200 2015-12-22 19:10:54 +11:00
parent 31753e1f9e
commit a5d91ca5cb
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ClassicalSharp/2D/Screens/BlockSelectScreen.Scrolling.cs
View File

@ -23,16 +23,17 @@ namespace ClassicalSharp {
public override bool HandlesMouseScroll( int delta ) { public override bool HandlesMouseScroll( int delta ) {
bool bounds = Contains( TableX, TableY, TableWidth, TableHeight, bool bounds = Contains( TableX, TableY, TableWidth, TableHeight,
game.Mouse.X, game.Mouse.Y ); game.Mouse.X, game.Mouse.Y );
if( !bounds ) return false; if( !bounds || selIndex == -1 ) return false;
delta = -delta;
int startScrollY = scrollY; int startScrollY = scrollY;
scrollY -= delta; selIndex += delta * blocksPerRow;
ClampScrollY();
int diffY = scrollY - startScrollY; if( selIndex >= blocksTable.Length || selIndex < 0 )
if( selIndex >= 0 ) { selIndex -= delta * blocksPerRow;
selIndex += diffY * blocksPerRow; Utils.Clamp( ref selIndex, 0, blocksTable.Length - 1 );
RecreateBlockInfoTexture(); int endScrollY = selIndex / blocksPerRow;
}
UpdateSelectedState();
return true; return true;
} }
int scrollY; int scrollY;

2
ClassicalSharp/2D/Screens/BlockSelectScreen.cs
View File

@ -174,7 +174,7 @@ namespace ClassicalSharp {
lastCreatedIndex = selIndex; lastCreatedIndex = selIndex;
graphicsApi.DeleteTexture( ref blockInfoTexture ); graphicsApi.DeleteTexture( ref blockInfoTexture );
if( selIndex == -1 || selIndex >= blocksTable.Length ) return; if( selIndex == -1 ) return;
Block block = blocksTable[selIndex]; Block block = blocksTable[selIndex];
UpdateBlockInfoString( block ); UpdateBlockInfoString( block );