TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix crash playing credits with poison enabled

Browse source
This commit is contained in:
Kp 2014-12-13 04:11:41 +00:00
parent 7c98dea8be
commit 6b56a3020a
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
similar/main/credits.cpp
View file

@ -81,8 +81,6 @@ struct credits : ignore_window_pointer_t
static window_event_result credits_handler(window *wind,const d_event &event, credits *cr) static window_event_result credits_handler(window *wind,const d_event &event, credits *cr)
{ {
int l, y; int l, y;
char * tempp;
switch (event.type) switch (event.type)
{ {
case EVENT_KEY_COMMAND: case EVENT_KEY_COMMAND:
@ -171,11 +169,12 @@ static window_event_result credits_handler(window *wind,const d_event &event, cr
y = cr->first_line_offset - cr->row; y = cr->first_line_offset - cr->row;
show_fullscr(cr->backdrop); show_fullscr(cr->backdrop);
for (int j=0; j<NUM_LINES; j++ ) { for (uint_fast32_t j=0; j != NUM_LINES; ++j, y += ROW_SPACING)
char *s; {
l = (cr->buffer_line + j + 1 ) % NUM_LINES; l = (cr->buffer_line + j + 1 ) % NUM_LINES;
s = cr->buffer[l]; const char *s = cr->buffer[l];
if (!s)
continue;
if ( s[0] == '!' ) { if ( s[0] == '!' ) {
s++; s++;
@ -188,7 +187,7 @@ static window_event_result credits_handler(window *wind,const d_event &event, cr
} else } else
gr_set_curfont( MEDIUM2_FONT ); gr_set_curfont( MEDIUM2_FONT );
tempp = strchr( s, '\t' ); const auto tempp = strchr( s, '\t' );
if ( !tempp ) { if ( !tempp ) {
// Wacky Fast Credits thing // Wacky Fast Credits thing
int w, h, aw; int w, h, aw;
@ -196,7 +195,6 @@ static window_event_result credits_handler(window *wind,const d_event &event, cr
gr_get_string_size( s, &w, &h, &aw); gr_get_string_size( s, &w, &h, &aw);
gr_string( 0x8000, y, s ); gr_string( 0x8000, y, s );
} }
y += ROW_SPACING;
} }
cr->row += SHEIGHT/200; cr->row += SHEIGHT/200;