|
@@ -1554,14 +1554,14 @@ void Bild::drawBild90( int x, int y, int br, int hi, Bild & zBild )
|
|
y += drawOff[ doa ].y;
|
|
y += drawOff[ doa ].y;
|
|
if( x + hi < dpx || y + br < dpy || x > dgx || y > dgy )
|
|
if( x + hi < dpx || y + br < dpy || x > dgx || y > dgy )
|
|
return;
|
|
return;
|
|
- br = minInt( br, zBild.getBreite() );
|
|
+ br = minInt( br, zBild.getHeight() );
|
|
- hi = minInt( hi, zBild.getHeight() );
|
|
+ hi = minInt( hi, zBild.getBreite() );
|
|
int xst = maxInt( dpx - x, 0 );
|
|
int xst = maxInt( dpx - x, 0 );
|
|
int yst = maxInt( dpy - y, 0 );
|
|
int yst = maxInt( dpy - y, 0 );
|
|
int xst2 = maxInt( x, dpx );
|
|
int xst2 = maxInt( x, dpx );
|
|
int yst2 = maxInt( y, dpy );
|
|
int yst2 = maxInt( y, dpy );
|
|
- dgx = minInt( x + hi, dgx );
|
|
+ dgx = minInt( x + br, dgx );
|
|
- dgy = minInt( y + br, dgy );
|
|
+ dgy = minInt( y + hi, dgy );
|
|
int bb = zBild.getBreite();
|
|
int bb = zBild.getBreite();
|
|
int *ff = zBild.getBuffer();
|
|
int *ff = zBild.getBuffer();
|
|
int yy, xbb;
|
|
int yy, xbb;
|
|
@@ -1586,14 +1586,14 @@ void Bild::alphaBild90( int x, int y, int br, int hi, Bild & zBild )
|
|
y += drawOff[ doa ].y;
|
|
y += drawOff[ doa ].y;
|
|
if( x + hi < dpx || y + br < dpy || x > dgx || y > dgy )
|
|
if( x + hi < dpx || y + br < dpy || x > dgx || y > dgy )
|
|
return;
|
|
return;
|
|
- br = minInt( br, zBild.getBreite() );
|
|
+ br = minInt( br, zBild.getHeight() );
|
|
- hi = minInt( hi, zBild.getHeight() );
|
|
+ hi = minInt( hi, zBild.getBreite() );
|
|
int xst = maxInt( dpx - x, 0 );
|
|
int xst = maxInt( dpx - x, 0 );
|
|
int yst = maxInt( dpy - y, 0 );
|
|
int yst = maxInt( dpy - y, 0 );
|
|
int xst2 = maxInt( x, dpx );
|
|
int xst2 = maxInt( x, dpx );
|
|
int yst2 = maxInt( y, dpy );
|
|
int yst2 = maxInt( y, dpy );
|
|
- dgx = minInt( x + hi, dgx );
|
|
+ dgx = minInt( x + br, dgx );
|
|
- dgy = minInt( y + br, dgy );
|
|
+ dgy = minInt( y + hi, dgy );
|
|
int bb = zBild.getBreite();
|
|
int bb = zBild.getBreite();
|
|
int *ff = zBild.getBuffer();
|
|
int *ff = zBild.getBuffer();
|
|
if( !alpha[ alphaAnzahl ] )
|
|
if( !alpha[ alphaAnzahl ] )
|
|
@@ -1823,14 +1823,14 @@ void Bild::alphaBild270( int x, int y, int br, int hi, Bild & zBild )
|
|
y += drawOff[ doa ].y;
|
|
y += drawOff[ doa ].y;
|
|
if( x + hi < dpx || y + br < dpy || x > dgx || y > dgy )
|
|
if( x + hi < dpx || y + br < dpy || x > dgx || y > dgy )
|
|
return;
|
|
return;
|
|
- br = minInt( br, zBild.getBreite() );
|
|
+ br = minInt( br, zBild.getHeight() );
|
|
hi = minInt( hi, zBild.getBreite() );
|
|
hi = minInt( hi, zBild.getBreite() );
|
|
int xst = maxInt( dpx - x, 0 );
|
|
int xst = maxInt( dpx - x, 0 );
|
|
int yst = maxInt( dpy - y, 0 );
|
|
int yst = maxInt( dpy - y, 0 );
|
|
int xst2 = maxInt( x, dpx );
|
|
int xst2 = maxInt( x, dpx );
|
|
int yst2 = maxInt( y, dpy );
|
|
int yst2 = maxInt( y, dpy );
|
|
- dgx = minInt( x + hi, dgx );
|
|
+ dgx = minInt( x + br, dgx );
|
|
- dgy = minInt( y + br, dgy );
|
|
+ dgy = minInt( y + hi, dgy );
|
|
int bb = zBild.getBreite();
|
|
int bb = zBild.getBreite();
|
|
int *ff = zBild.getBuffer();
|
|
int *ff = zBild.getBuffer();
|
|
if( !alpha[ alphaAnzahl ] )
|
|
if( !alpha[ alphaAnzahl ] )
|