Bug: Fix code for displaying funnames

[webhead]

3: Fix funnames so they don't screw with other characters output after it, such as in the scoreboard. - webhead, T3RR0R15T, Termin8oR

add plz.

[jitspoe]

I think we just need to phase out the old scoreboard completely.

[webhead]

in favor of what?

[jitspoe]

Just use the regular scoreboard (when you hit tab) at the end of the round instead of displaying the old one.  It just needs to be tweaked so it will stay up until the map change.

[webhead]

yah that sounds good. but i think there are also problems every once in a while with funnames messing with information text that shows up on the screen (and console). this usually involves italics and/or underlines affecting the entire line of text.

[Zorchenhimer]

Yea, I've seen that happen.

[jitspoe]

http://dplogin.com/dplogin/featurevote/feature.php?id=10032

[Herron]

Related to:
http://dplogin.com/forums/index.php?topic=11180.0

Bug:
When you use underline and/or italics in your name and do not:
   (1) terminate the underline/italics; or
   (2) use a char_endformat (ctrl+o) at the end of your name
it frequently messes up the formatting on the line of text appearing after your name (e.g., chat, scoreboard, event text).

Note:
Only the lines that have // herron format fix on them were changed, and the precise change is (listed in parentheses).  This does not fix the scoreboard that pops up at the end of the map, but it does fix the one that is brought up manually.

Fix:
1.  In cl_decode.h:

Code:

case 'n': // name
Q_strncpyz(out_str, name_from_index(index_array[current_element++]), max_len);
temp_len = strlen(out_str);
out_str[temp_len] = CHAR_ENDFORMAT; // herron format fix (new)
out_str += temp_len+1; // herron format fix (temp_len"+1")
max_len -= temp_len+1; // herron format fix (temp_len"+1")
break;

What it does:  Prevents underlined/italics in names from carrying over into event print messages (e.g., joins, grabs, kills, etc.)



2. In cl_scores.c:
Part A

Code:

if (len_noformat >= MAX_NAME_WIDTH) // name too long // herron format fix (">"=)

Part B

Code:

else if (format_diff)
{
// add spaces to compensate for format codes
memset(cl_scores_info[i]+len, ' ', MAX_NAME_WIDTH - len_noformat);
cl_scores_info[i][len] = CHAR_ENDFORMAT; // herron format fix (new)
cl_scores_info[i][MAX_NAME_WIDTH+format_diff+1] = '\0'; // herron format fix (format_diff"+1")
}

What it does:  Prevents underlined/italics in names from carrying over into other columns on the scoreboard (e.g., ping, kills, deaths, etc.)



3.  In cl_parse.c:

Code:

if (cl_timestamp->value)
Com_Printf("%c%c[%s] %c%s%s%s%c%c%c%s%s %s%s", // herron format fix (%s%s%s"%c")
CHAR_COLOR, isteam ? cl_scores_get_team_textcolor(idx) : COLOR_CHAT,
timestamp, cl_scores_get_team_splat(idx),
cl_scores_get_isalive(idx) ? "" : "[ELIM] ",
(isteam || isprivate) ? "(" : "", name_from_index(idx), CHAR_ENDFORMAT, // herron format fix ("CHAR_ENDFORMAT,")
CHAR_COLOR, isteam ? cl_scores_get_team_textcolor(idx) : COLOR_CHAT,
(isteam || isprivate) ? ")" : "",
level == PRINT_CHATN_ACTION ? "" : ":",
s, (s[strlen(s)-1] == '\n') ? "" : "\n");
else
Com_Printf("%c%c%c%s%s%s%c%c%c%s%s %s%s", cl_scores_get_team_splat(idx),
CHAR_COLOR, isteam ? cl_scores_get_team_textcolor(idx) : COLOR_CHAT,
cl_scores_get_isalive(idx) ? "" : "[ELIM] ", // jitodo - [OBS]
(isteam || isprivate) ? "(" : "", name_from_index(idx), CHAR_ENDFORMAT, // herron format fix ("CHAR_ENDFORMAT,")
CHAR_COLOR, isteam ? cl_scores_get_team_textcolor(idx) : COLOR_CHAT,
(isteam || isprivate) ? ")" : "",
level == PRINT_CHATN_ACTION ? "" : ":",
s, (s[strlen(s)-1] == '\n') ? "" : "\n");

What it does:  Prevents underlined/italics in names from carrying over into chat messages (e.g., say and say_team)

[ViciouZ]

Shreds talks to me in my sleep.

Not only is herron clever as hell at C, but he is also Andy Lewis Norm.

[Herron]

 

[i_am_a_pirate]

it's quite cool (...kamikazee)

[sk89q]

Can I add to this?

Can the length of a funname be calculated correctly so that it is drawn correctly? The invisible fun name characters cause lines to wrap too early and also sometimes causes extra spaces to appear.

[jitspoe]

The way the console system works is basically one big buffer with no concept of lines.  It just draws X number of characters, then it's at the next line. I'll probably look into rewriting this system if/when I add a variable-width font.

[i_am_a_pirate]

erm, that screen there. Is that a double bug? cos you're on the blue team, and you've just gone and picked up the flag and dropped it....

[webhead]

lol pirate, read the text at the top. he picked it up while he was on the red team.

[Rick]

Also look at the the bottom left, it indicates the dropping of a flag.

[i_am_a_pirate]

Also look at the the bottom left, it indicates the dropping of a flag.

you've [...] dropped it....

lol pirate, read the text at the top. he picked it up while he was on the red team.

oops...... Man I'm bad today....
I don't really care about the whole fixing it. It makes it stand out more and looks cool. It isn't a major priority. Now a new physics engine is a completely different matter.....

[webhead]

lol youre crazy
"stand out more"? uh as far as i know, thats not really the desired effect...
"looks cool"? well that's definitely subjective.

[Garrett]

oops...... Man I'm bad today....
I don't really care about the whole fixing it. It makes it stand out more and looks cool. It isn't a major priority. Now a new physics engine is a completely different matter.....

You have a very odd sense of cool.

[i_am_a_pirate]

You have a very odd sense of cool.

Okay, okay. Maybe not cool. It just looks different.

Man I'm bad today....