Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r6347) Undo

Browse Source
This commit is contained in:
tron 2006-09-02 20:34:33 +00:00
parent 5f7d99fb6d
commit a286726fe9
4 changed files with 5 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gfx.c
View File

@ -190,7 +190,7 @@ void GfxDrawLine(int x, int y, int x2, int y2, int color)
// Check clipping first // Check clipping first
{ {
const DrawPixelInfo *dpi = _cur_dpi; DrawPixelInfo *dpi = _cur_dpi;
int t; int t;
if (x < dpi->left && x2 < dpi->left) return; if (x < dpi->left && x2 < dpi->left) return;
@ -560,7 +560,7 @@ int GetStringWidth(const char *str)
int DoDrawString(const char *string, int x, int y, uint16 real_color) int DoDrawString(const char *string, int x, int y, uint16 real_color)
{ {
const DrawPixelInfo *dpi = _cur_dpi; DrawPixelInfo *dpi = _cur_dpi;
FontSize size = _cur_fontsize; FontSize size = _cur_fontsize;
byte c; byte c;
byte color; byte color;
@ -753,47 +753,6 @@ static void GfxBlitTileZoomIn(BlitterParams *bp)
break; break;
default: default:
#if 0
src = src_o;
do {
int offs = bp->start_x;
dst = bp->dst;
for (src = src_o;; src += num + 2) {
skip = src[1];
if (skip >= offs) {
dst += skip;
break;
}
offs -= skip;
done = src[0];
num = done & 0x7F;
if (num > offs) {
src += offs;
dst += offs;
num -= offs;
break;
}
}
src += 2;
for (;;) {
do {
*dst++ = *src++;
} while (--num != 0);
if (done & 0x80) break;
done = *src++;
num = done & 0x7F;
dst += *src++;
}
bp->dst += bp->pitch;
} while (--bp->height != 0);
#else
do { do {
do { do {
done = src_o[0]; done = src_o[0];
@ -835,7 +794,6 @@ static void GfxBlitTileZoomIn(BlitterParams *bp)
bp->dst += bp->pitch; bp->dst += bp->pitch;
} while (--bp->height != 0); } while (--bp->height != 0);
#endif
break; break;
} }
} }

2
screenshot.c
View File

@ -460,7 +460,7 @@ static void CurrentScreenCallback(void *userdata, Pixel *buf, uint y, uint pitch
// generate a large piece of the world // generate a large piece of the world
static void LargeWorldCallback(void *userdata, Pixel *buf, uint y, uint pitch, uint n) static void LargeWorldCallback(void *userdata, Pixel *buf, uint y, uint pitch, uint n)
{ {
const ViewPort* vp = (const ViewPort*)userdata; ViewPort *vp = (ViewPort *)userdata;
DrawPixelInfo dpi, *old_dpi; DrawPixelInfo dpi, *old_dpi;
int wx, left; int wx, left;

24
spritecache.c
View File

@ -138,30 +138,6 @@ static void* ReadSprite(SpriteID id)
} }
} }
#if 1
if (sprite->info & 8) {
byte* src = sprite->data + sprite->height * 2;
uint height = sprite->height;
do {
uint offset;
uint len;
offset = 0;
do {
uint skip;
skip = src[1];
src[1] = skip - offset;
offset = skip;
len = src[0];
src += (len & 0x7F) + 2;
} while (!(len & 0x80));
} while (--height != 0);
}
#endif
return sprite; return sprite;
} }
} }

2
viewport.c
View File

@ -1177,6 +1177,8 @@ static void ViewportDrawStrings(DrawPixelInfo *dpi, const StringSpriteToDraw *ss
ss = ss->next; ss = ss->next;
} while (ss != NULL); } while (ss != NULL);
_cur_dpi = dpi;
} }
void ViewportDoDraw(const ViewPort *vp, int left, int top, int right, int bottom) void ViewportDoDraw(const ViewPort *vp, int left, int top, int right, int bottom)