Update: Merge branch 'jgrpp_master_cmake' into jgrpp_cmake

This commit is contained in:
TechGeekNZ
2020-06-27 20:46:53 +12:00
committed by Jonathan G Rennison
329 changed files with 4044 additions and 32403 deletions

View File

@@ -894,6 +894,7 @@ void DrawCharCentered(WChar c, int x, int y, TextColour colour)
* Get the size of a sprite.
* @param sprid Sprite to examine.
* @param[out] offset Optionally returns the sprite position offset.
* @param zoom The zoom level applicable to the sprite.
* @return Sprite size in pixels.
* @note The size assumes (0, 0) as top-left coordinate and ignores any part of the sprite drawn at the left or above that position.
*/
@@ -1408,6 +1409,16 @@ void DrawMouseCursor()
_cursor.dirty = false;
}
/**
* Repaints a specific rectangle of the screen.
*
* @param left,top,right,bottom The area of the screen that needs repainting
* @pre The rectangle is assumed to have been previously marked dirty with \c SetDirtyBlocks.
* @see SetDirtyBlocks
* @see DrawDirtyBlocks
* @ingroup dirty
*
*/
void RedrawScreenRect(int left, int top, int right, int bottom)
{
assert(right <= _screen.width && bottom <= _screen.height);
@@ -1487,6 +1498,8 @@ static void DrawDirtyViewport(uint occlusion, int left, int top, int right, int
* Repaints the rectangle blocks which are marked as 'dirty'.
*
* @see SetDirtyBlocks
*
* @ingroup dirty
*/
void DrawDirtyBlocks()
{
@@ -1817,6 +1830,8 @@ static void AddDirtyBlocks(uint start, int left, int top, int right, int bottom)
}
/**
* Add the specified rectangle to the collection of screen areas to be
* invalidated and redrawn.
* Note the point (0,0) is top left.
*
* @param left The left edge of the rectangle
@@ -1825,9 +1840,7 @@ static void AddDirtyBlocks(uint start, int left, int top, int right, int bottom)
* @param bottom The bottom edge of the rectangle
* @see DrawDirtyBlocks
*
* @todo The name of the function should be called like @c AddDirtyBlock as
* it neither set a dirty rect nor add several dirty rects although
* the function name is in plural. (Progman)
* @ingroup dirty
*/
void SetDirtyBlocks(int left, int top, int right, int bottom)
{