diff options
| author | Max Horn | 2002-07-25 20:57:55 +0000 |
|---|---|---|
| committer | Max Horn | 2002-07-25 20:57:55 +0000 |
| commit | 703ed2267e01c795cafc122b157730bdc5097543 (patch) | |
| tree | 052203cde6e4b0d9b02c6e226242feb77908a58d /simon | |
| parent | 22791d33bd0d72e6367e113d47c79b4c1142678e (diff) | |
| download | scummvm-rg350-703ed2267e01c795cafc122b157730bdc5097543.tar.gz scummvm-rg350-703ed2267e01c795cafc122b157730bdc5097543.tar.bz2 scummvm-rg350-703ed2267e01c795cafc122b157730bdc5097543.zip | |
patch #585725 - fix for overlapping text in simon
svn-id: r4628
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index 66df761a0d..eeb7f8343c 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -3587,9 +3587,6 @@ void SimonState::talk_with_text(uint num_1, uint num_2, const char *string_ptr, height += 10; threeval_b -= 10; - - if (threeval_b < 2) - threeval_b = 2; j = -1; } else { /* else_1 */ @@ -3645,9 +3642,6 @@ void SimonState::talk_with_text(uint num_1, uint num_2, const char *string_ptr, *char_buf++ = 10; height += 20; threeval_b -= 20; - - if (threeval_b < 2) - threeval_b = 2; j = -1; } else { /* else_6 */ @@ -3685,7 +3679,7 @@ void SimonState::talk_with_text(uint num_1, uint num_2, const char *string_ptr, } strncpy(char_buf, string_ptr, m); char_buf += m; - *char_buf++ = ' '; + *char_buf++ = '\n'; string_ptr = string_ptr_2; string_ptr_2 += m; while (*string_ptr_2-- != ' ' && m > 0) @@ -3718,11 +3712,9 @@ void SimonState::talk_with_text(uint num_1, uint num_2, const char *string_ptr, } strncpy(char_buf, string_ptr, m); char_buf += m; - *char_buf++ = ' '; + *char_buf++ = '\n'; height += 30; threeval_b -= 30; - if (threeval_b < 2) - threeval_b = 2; j = -1; } else { /* else_15 */ @@ -3765,8 +3757,6 @@ void SimonState::talk_with_text(uint num_1, uint num_2, const char *string_ptr, *char_buf++ = 10; height += 10; threeval_b -= 10; - if (threeval_b < 2) - threeval_b = 2; string_ptr = string_ptr_2; } } |