Resolved merge conflicts. #17

Open
anomaly wants to merge 26 commits from anomaly/iw6-mod:master into master
Showing only changes of commit ea6da588c3 - Show all commits
+1 -1
View File
@@ -777,12 +777,12 @@ namespace demo_utils
if (player_name.empty()) if (player_name.empty())
{ {
player_name = get_dvar_string("name", true); player_name = get_dvar_string("name", true);
}
if (player_name.empty()) if (player_name.empty())
{ {
player_name = "unknown_player_name"; player_name = "unknown_player_name";
} }
}
write_general_header_internal(output, description, host_name, player_name); write_general_header_internal(output, description, host_name, player_name);
} }