BuildFontEffect fix for #338
(FRAMEs from fonts don't have parent Drawables) git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@945 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
@@ -293,7 +293,6 @@ void getpixelarray(Uint32 *map, FRAMEPTR FramePtr, int width, int height)
|
|||||||
|
|
||||||
FRAMEPTR Build_Font_Effect (FRAMEPTR FramePtr, Uint32 from, Uint32 to, BYTE type)
|
FRAMEPTR Build_Font_Effect (FRAMEPTR FramePtr, Uint32 from, Uint32 to, BYTE type)
|
||||||
{
|
{
|
||||||
UBYTE FrameType;
|
|
||||||
FRAMEPTR NewFrame;
|
FRAMEPTR NewFrame;
|
||||||
int x, y;
|
int x, y;
|
||||||
int width, height;
|
int width, height;
|
||||||
@@ -307,10 +306,7 @@ FRAMEPTR Build_Font_Effect (FRAMEPTR FramePtr, Uint32 from, Uint32 to, BYTE type
|
|||||||
|
|
||||||
width = GetFrameWidth (FramePtr);
|
width = GetFrameWidth (FramePtr);
|
||||||
height = GetFrameHeight (FramePtr);
|
height = GetFrameHeight (FramePtr);
|
||||||
FrameType = (UBYTE)TYPE_GET (GetFrameParentDrawable (FramePtr)
|
NewFrame = CaptureDrawable (CreateDrawable (RAM_DRAWABLE, (SIZE)width, (SIZE)height, 1));
|
||||||
->FlagsAndIndex) >> FTYPE_SHIFT;
|
|
||||||
NewFrame = CaptureDrawable (
|
|
||||||
CreateDrawable (FrameType, (SIZE)width, (SIZE)height, 1));
|
|
||||||
tfbOrigImg = FramePtr->image;
|
tfbOrigImg = FramePtr->image;
|
||||||
OrigImg = (SDL_Surface *)tfbOrigImg->NormalImg;
|
OrigImg = (SDL_Surface *)tfbOrigImg->NormalImg;
|
||||||
SDL_LockSurface (OrigImg);
|
SDL_LockSurface (OrigImg);
|
||||||
|
|||||||
Reference in New Issue
Block a user