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

(svn r9420) -Fix [FS#701]: crashes when the chatbox would be drawn outside of the main window.

Browse Source
This commit is contained in:
rubidium 2007-03-23 22:20:39 +00:00
parent f69549f1eb
commit 3e3f582d98
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/texteff.cpp
View File

@ -145,15 +145,27 @@ void UndrawTextMessage()
}
}
int x = _textmsg_box.x;
int y = _screen.height - _textmsg_box.y - _textmsg_box.height;
int width = _textmsg_box.width;
int height = _textmsg_box.height;
if (y < 0) {
height = max(height + y, min(_textmsg_box.height, _screen.height));
y = 0;
}
if (x + width >= _screen.width) {
width = _screen.width - x;
}
_textmessage_visible = false;
/* Put our 'shot' back to the screen */
memcpy_pitch(
_screen.dst_ptr + _textmsg_box.x + (_screen.height - _textmsg_box.y - _textmsg_box.height) * _screen.pitch,
_screen.dst_ptr + x + y * _screen.pitch,
_textmessage_backup,
_textmsg_box.width, _textmsg_box.height, _textmsg_box.width, _screen.pitch);
width, height, _textmsg_box.width, _screen.pitch);
/* And make sure it is updated next time */
_video_driver->make_dirty(_textmsg_box.x, _screen.height - _textmsg_box.y - _textmsg_box.height, _textmsg_box.width, _textmsg_box.height);
_video_driver->make_dirty(x, y, width, height);
_textmessage_dirty = true;
}
@ -186,8 +198,6 @@ void TextMessageDailyLoop()
/* Draw the textmessage-box */
void DrawTextMessage()
{
uint y, count;
if (!_textmessage_dirty) return;
/* First undraw if needed */
@ -196,14 +206,25 @@ void DrawTextMessage()
if (_iconsole_mode == ICONSOLE_FULL) return;
/* Check if we have anything to draw at all */
count = GetTextMessageCount();
uint count = GetTextMessageCount();
if (count == 0) return;
int x = _textmsg_box.x;
int y = _screen.height - _textmsg_box.y - _textmsg_box.height;
int width = _textmsg_box.width;
int height = _textmsg_box.height;
if (y < 0) {
height = max(height + y, min(_textmsg_box.height, _screen.height));
y = 0;
}
if (x + width >= _screen.width) {
width = _screen.width - x;
}
/* Make a copy of the screen as it is before painting (for undraw) */
memcpy_pitch(
_textmessage_backup,
_screen.dst_ptr + _textmsg_box.x + (_screen.height - _textmsg_box.y - _textmsg_box.height) * _screen.pitch,
_textmsg_box.width, _textmsg_box.height, _screen.pitch, _textmsg_box.width);
_screen.dst_ptr + x + y * _screen.pitch,
width, height, _screen.pitch, _textmsg_box.width);
_cur_dpi = &_screen; // switch to _screen painting
@ -217,12 +238,12 @@ void DrawTextMessage()
);
/* Paint the messages starting with the lowest at the bottom */
for (y = 13; count-- != 0; y += 13) {
for (uint y = 13; count-- != 0; y += 13) {
DoDrawString(_textmsg_list[count].message, _textmsg_box.x + 3, _screen.height - _textmsg_box.y - y + 1, _textmsg_list[count].color);
}
/* Make sure the data is updated next flush */
_video_driver->make_dirty(_textmsg_box.x, _screen.height - _textmsg_box.y - _textmsg_box.height, _textmsg_box.width, _textmsg_box.height);
_video_driver->make_dirty(x, y, width, height);
_textmessage_visible = true;
_textmessage_dirty = false;