Permalink
Browse files

forgot to stage all the corrections for previous commit

today is not a good day :(
  • Loading branch information...
1 parent c14ba58 commit 5f14b95ea7a22c3d4448dc70d789e53c5fbbe444 @bradallred bradallred committed Jul 11, 2013
Showing with 7 additions and 8 deletions.
  1. +2 −2 gemrb/plugins/SDLVideo/SDL12Video.cpp
  2. +5 −6 gemrb/plugins/SDLVideo/SDLVideo.cpp
@@ -151,7 +151,7 @@ void SDL12VideoDriver::showFrame(unsigned char* buf, unsigned int bufw,
destRect.w = w;
destRect.h = h;
- SDL_Rect rect = RectFromReigon(subtitleregion);
+ SDL_Rect rect = RectFromRegion(subtitleregion);
SDL_FillRect(disp, &rect, 0);
SDL_BlitSurface( sprite, &srcRect, disp, &destRect );
if (titleref>0)
@@ -255,7 +255,7 @@ void SDL12VideoDriver::showYUVFrame(unsigned char** buf, unsigned int *strides,
destRect.y = dsty;
destRect.w = w;
destRect.h = h;
- SDL_Rect rect = RectFromReigon(subtitleregion);
+ SDL_Rect rect = RectFromRegion(subtitleregion);
SDL_FillRect(disp, &rect, 0);
SDL_DisplayYUVOverlay(overlay, &destRect);
if (titleref>0)
@@ -772,7 +772,6 @@ void SDLVideoDriver::BlitGameSprite(const Sprite2D* spr, int x, int y,
}
}
-
} else {
// non-BAM Blitting
@@ -868,7 +867,7 @@ Sprite2D* SDLVideoDriver::GetScreenshot( Region r )
void* pixels = malloc( Width * Height * 3 );
SDLSurfaceSprite2D* screenshot = new SDLSurfaceSprite2D(Width, Height, 24, pixels,
0x00ff0000, 0x0000ff00, 0x000000ff);
- SDL_Rect src = RectFromReigon(r);
+ SDL_Rect src = RectFromRegion(r);
SDL_BlitSurface( backBuf, (r.w && r.h) ? &src : NULL, screenshot->GetSurface(), NULL);
return screenshot;
@@ -877,7 +876,7 @@ Sprite2D* SDLVideoDriver::GetScreenshot( Region r )
/** This function Draws the Border of a Rectangle as described by the Region parameter. The Color used to draw the rectangle is passes via the Color parameter. */
void SDLVideoDriver::DrawRect(const Region& rgn, const Color& color, bool fill, bool clipped)
{
- SDL_Rect drect = RectFromReigon(rgn);
+ SDL_Rect drect = RectFromRegion(rgn);
if (fill) {
if ( SDL_ALPHA_TRANSPARENT == color.a ) {
return;
@@ -912,7 +911,7 @@ void SDLVideoDriver::DrawRectSprite(const Region& rgn, const Color& color, const
}
SDL_Surface* surf = ((SDLSurfaceSprite2D*)sprite)->GetSurface();
- SDL_Rect drect = RectFromReigon(rgn);
+ SDL_Rect drect = RectFromRegion(rgn);
if ( SDL_ALPHA_TRANSPARENT == color.a ) {
return;
} else if ( SDL_ALPHA_OPAQUE == color.a ) {
@@ -1397,7 +1396,7 @@ void SDLVideoDriver::SetFadePercent(int percent)
void SDLVideoDriver::SetClipRect(const Region* clip)
{
if (clip) {
- SDL_Rect tmp = RectFromReigon(*clip);
+ SDL_Rect tmp = RectFromRegion(*clip);
SDL_SetClipRect( backBuf, &tmp );
} else {
SDL_SetClipRect( backBuf, NULL );
@@ -1406,7 +1405,7 @@ void SDLVideoDriver::SetClipRect(const Region* clip)
void SDLVideoDriver::GetClipRect(Region& clip)
{
- SDL_Rect tmp = RectFromReigon(clip);
+ SDL_Rect tmp = RectFromRegion(clip);
SDL_GetClipRect( backBuf, &tmp );
}

0 comments on commit 5f14b95

Please sign in to comment.