From f934b2c5771b8d509fb1114b4dd89d74776f248d Mon Sep 17 00:00:00 2001 From: TimePath Date: Sun, 27 Aug 2017 13:24:58 +1000 Subject: [PATCH] LOG_INFO: remove 'extra' newlines --- qcsrc/client/commands/cl_cmd.qc | 106 ++--- qcsrc/client/hud/panel/quickmenu.qc | 2 +- qcsrc/client/hud/panel/scoreboard.qc | 97 ++-- qcsrc/client/hud/panel/vote.qc | 2 +- qcsrc/client/mapvoting.qc | 6 +- qcsrc/client/miscfunctions.qc | 2 +- qcsrc/common/command/generic.qc | 58 +-- qcsrc/common/command/rpn.qc | 102 ++--- qcsrc/common/debug.qh | 12 +- qcsrc/common/effects/effectinfo.qc | 6 +- qcsrc/common/items/item.qh | 2 +- qcsrc/common/mapinfo.qc | 4 +- qcsrc/common/minigames/minigame/bd.qc | 10 +- qcsrc/common/mutators/base.qh | 2 +- .../mutators/mutator/new_toys/sv_new_toys.qc | 2 +- .../physical_items/sv_physical_items.qc | 2 +- .../mutators/mutator/sandbox/sv_sandbox.qc | 16 +- qcsrc/common/notifications/all.qh | 8 +- qcsrc/common/physics/player.qc | 2 +- qcsrc/common/playerstats.qc | 10 +- qcsrc/common/triggers/target/spawn.qc | 12 +- qcsrc/common/triggers/teleporters.qc | 6 +- qcsrc/common/triggers/trigger/disablerelay.qc | 2 +- qcsrc/common/triggers/trigger/viewloc.qc | 4 +- qcsrc/common/turrets/all.qh | 8 +- qcsrc/common/util.qc | 2 +- qcsrc/common/weapons/all.qc | 4 +- qcsrc/common/weapons/all.qh | 8 +- qcsrc/lib/csqcmodel/cl_player.qc | 2 +- qcsrc/lib/test.qc | 2 +- qcsrc/lib/urllib.qc | 20 +- qcsrc/lib/warpzone/server.qc | 20 +- qcsrc/menu/command/menu_cmd.qc | 12 +- qcsrc/menu/xonotic/maplist.qc | 4 +- qcsrc/menu/xonotic/skinlist.qc | 2 +- qcsrc/menu/xonotic/util.qc | 2 +- qcsrc/server/bot/default/scripting.qc | 20 +- qcsrc/server/bot/default/waypoints.qc | 12 +- qcsrc/server/campaign.qc | 2 +- qcsrc/server/cheats.qc | 2 +- qcsrc/server/command/banning.qc | 62 +-- qcsrc/server/command/radarmap.qc | 16 +- qcsrc/server/command/radarmap.qh | 2 +- qcsrc/server/command/sv_cmd.qc | 422 +++++++++--------- qcsrc/server/command/vote.qc | 2 +- qcsrc/server/g_world.qc | 38 +- qcsrc/server/impulse.qc | 12 +- qcsrc/server/ipban.qc | 28 +- qcsrc/server/miscfunctions.qc | 2 +- qcsrc/server/player.qc | 2 +- qcsrc/server/playerdemo.qc | 8 +- qcsrc/server/portals.qc | 6 +- qcsrc/server/spawnpoints.qc | 2 +- qcsrc/server/teamplay.qc | 2 +- qcsrc/server/weapons/tracing.qc | 4 +- qcsrc/server/weapons/weaponstats.qc | 10 +- 56 files changed, 608 insertions(+), 607 deletions(-) diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc index 2a2f19ef5..8faf0f387 100644 --- a/qcsrc/client/commands/cl_cmd.qc +++ b/qcsrc/client/commands/cl_cmd.qc @@ -52,22 +52,22 @@ void LocalCommand_blurtest(int request) blurtest_time1 = time + stof(argv(1)); blurtest_radius = stof(argv(2)); blurtest_power = stof(argv(3)); - LOG_INFO("Enabled blurtest\n"); + LOG_INFO("Enabled blurtest"); return; } default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd blurtest\n"); - LOG_INFO(" No arguments required.\n"); + LOG_INFO("Usage:^3 cl_cmd blurtest"); + LOG_INFO(" No arguments required."); return; } } #else if (request) { - LOG_INFO("Blurtest is not enabled on this client.\n"); + LOG_INFO("Blurtest is not enabled on this client."); return; } #endif @@ -105,23 +105,25 @@ void LocalCommand_boxparticles(int request, int argc) default: { - LOG_INFO("Incorrect parameters for ^2boxparticles^7\n"); + LOG_INFO("Incorrect parameters for ^2boxparticles^7"); } case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 lv_cmd boxparticles effectname own org_from org_to, dir_from, dir_to, countmultiplier, flags\n"); - LOG_INFO(" 'effectname' is the name of a particle effect in effectinfo.txt\n"); - LOG_INFO(" 'own' is the entity number of the owner (negative for csqc ent, positive for svqc ent)\n"); - LOG_INFO(" 'org_from' is the starting origin of the box\n"); - LOG_INFO(" 'org_to' is the ending origin of the box\n"); - LOG_INFO(" 'dir_from' is the minimum velocity\n"); - LOG_INFO(" 'dir_to' is the maximum velocity\n"); - LOG_INFO(" 'countmultiplier' defines a multiplier for the particle count (affects count only, not countabsolute or trailspacing)\n"); - LOG_INFO(" 'flags' can contain:\n"); - LOG_INFO(" 1 to respect globals particles_alphamin, particles_alphamax (set right before via prvm_globalset client)\n"); - LOG_INFO(" 2 to respect globals particles_colormin, particles_colormax (set right before via prvm_globalset client)\n"); - LOG_INFO(" 4 to respect globals particles_fade (set right before via prvm_globalset client)\n"); - LOG_INFO(" 128 to draw a trail, not a box\n"); + LOG_INFO( + "Usage:^3 lv_cmd boxparticles effectname own org_from org_to, dir_from, dir_to, countmultiplier, flags\n" + " 'effectname' is the name of a particle effect in effectinfo.txt\n" + " 'own' is the entity number of the owner (negative for csqc ent, positive for svqc ent)\n" + " 'org_from' is the starting origin of the box\n" + " 'org_to' is the ending origin of the box\n" + " 'dir_from' is the minimum velocity\n" + " 'dir_to' is the maximum velocity\n" + " 'countmultiplier' defines a multiplier for the particle count (affects count only, not countabsolute or trailspacing)\n" + " 'flags' can contain:\n" + " 1 to respect globals particles_alphamin, particles_alphamax (set right before via prvm_globalset client)\n" + " 2 to respect globals particles_colormin, particles_colormax (set right before via prvm_globalset client)\n" + " 4 to respect globals particles_fade (set right before via prvm_globalset client)\n" + " 128 to draw a trail, not a box\n" + ); return; } } @@ -146,13 +148,13 @@ void LocalCommand_create_scrshot_ent(int request) fputs(fh, strcat("\"angles\" \"", strcat(ftos(view_angles.x), " ", ftos(view_angles.y), " ", ftos(view_angles.z)), "\"\n")); fputs(fh, "}\n"); - LOG_INFO("Completed screenshot entity dump in ^2data/data/", path, MapInfo_Map_bspname, "_scrshot_ent.txt^7.\n"); + LOG_INFO("Completed screenshot entity dump in ^2data/data/", path, MapInfo_Map_bspname, "_scrshot_ent.txt^7."); fclose(fh); } else { - LOG_INFO("^1Error: ^7Could not dump to file!\n"); + LOG_INFO("^1Error: ^7Could not dump to file!"); } return; } @@ -160,8 +162,8 @@ void LocalCommand_create_scrshot_ent(int request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd create_scrshot_ent [path]\n"); - LOG_INFO(" Where 'path' can be the subdirectory of data/data in which the file is saved.\n"); + LOG_INFO("Usage:^3 cl_cmd create_scrshot_ent [path]"); + LOG_INFO(" Where 'path' can be the subdirectory of data/data in which the file is saved."); return; } } @@ -190,8 +192,8 @@ void LocalCommand_debugmodel(int request, int argc) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd debugmodel model\n"); - LOG_INFO(" Where 'model' is a string of the model name to use for the debug model.\n"); + LOG_INFO("Usage:^3 cl_cmd debugmodel model"); + LOG_INFO(" Where 'model' is a string of the model name to use for the debug model."); return; } } @@ -236,12 +238,12 @@ void LocalCommand_handlevote(int request, int argc) default: { - LOG_INFO("Incorrect parameters for ^2handlevote^7\n"); + LOG_INFO("Incorrect parameters for ^2handlevote^7"); } case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd handlevote vote\n"); - LOG_INFO(" Where 'vote' is the selection for either the current poll or uid2name.\n"); + LOG_INFO("Usage:^3 cl_cmd handlevote vote"); + LOG_INFO(" Where 'vote' is the selection for either the current poll or uid2name."); return; } } @@ -279,10 +281,10 @@ void LocalCommand_hud(int request, int argc) { if (argv(2) == "help") { - LOG_INFO(" quickmenu [[default | file | \"\"] submenu file]\n"); - LOG_INFO("Called without options (or with \"\") loads either the default quickmenu or a quickmenu file if hud_panel_quickmenu_file is set to a valid filename.\n"); - LOG_INFO("A submenu name can be given to open the quickmenu directly in a submenu; it requires to specify 'default', 'file' or '\"\"' option.\n"); - LOG_INFO("A file name can also be given to open a different quickmenu\n"); + LOG_INFO(" quickmenu [[default | file | \"\"] submenu file]"); + LOG_INFO("Called without options (or with \"\") loads either the default quickmenu or a quickmenu file if hud_panel_quickmenu_file is set to a valid filename."); + LOG_INFO("A submenu name can be given to open the quickmenu directly in a submenu; it requires to specify 'default', 'file' or '\"\"' option."); + LOG_INFO("A file name can also be given to open a different quickmenu"); return; } string file = ((argv(4) == "") ? autocvar_hud_panel_quickmenu_file : argv(4)); @@ -337,16 +339,16 @@ void LocalCommand_hud(int request, int argc) default: { - LOG_INFO("Incorrect parameters for ^2hud^7\n"); + LOG_INFO("Incorrect parameters for ^2hud^7"); } case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd hud action [configname | radartoggle | layout]\n"); - LOG_INFO(" Where 'action' is the command to complete,\n"); - LOG_INFO(" 'configname' is the name to save to for \"save\" action,\n"); - LOG_INFO(" 'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action,\n"); - LOG_INFO(" and 'layout' is how to organize the scoreboard columns for the set action.\n"); - LOG_INFO(" Full list of commands here: \"configure, quickmenu, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\"\n"); + LOG_INFO("Usage:^3 cl_cmd hud action [configname | radartoggle | layout]"); + LOG_INFO(" Where 'action' is the command to complete,"); + LOG_INFO(" 'configname' is the name to save to for \"save\" action,"); + LOG_INFO(" 'radartoggle' is to control hud_panel_radar_maximized for \"radar\" action,"); + LOG_INFO(" and 'layout' is how to organize the scoreboard columns for the set action."); + LOG_INFO(" Full list of commands here: \"configure, quickmenu, minigame, save, scoreboard_columns_help, scoreboard_columns_set, radar.\""); return; } } @@ -368,12 +370,12 @@ void LocalCommand_localprint(int request, int argc) default: { - LOG_INFO("Incorrect parameters for ^2localprint^7\n"); + LOG_INFO("Incorrect parameters for ^2localprint^7"); } case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd localprint \"message\"\n"); - LOG_INFO(" 'message' is the centerprint message to send to yourself.\n"); + LOG_INFO("Usage:^3 cl_cmd localprint \"message\""); + LOG_INFO(" 'message' is the centerprint message to send to yourself."); return; } } @@ -395,12 +397,12 @@ void LocalCommand_mv_download(int request, int argc) default: { - LOG_INFO("Incorrect parameters for ^2mv_download^7\n"); + LOG_INFO("Incorrect parameters for ^2mv_download^7"); } case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd mv_download mapid\n"); - LOG_INFO(" Where 'mapid' is the id number of the map to request an image of on the map vote selection menu.\n"); + LOG_INFO("Usage:^3 cl_cmd mv_download mapid"); + LOG_INFO(" Where 'mapid' is the id number of the map to request an image of on the map vote selection menu."); return; } } @@ -432,12 +434,12 @@ void LocalCommand_sendcvar(int request, int argc) default: { - LOG_INFO("Incorrect parameters for ^2sendcvar^7\n"); + LOG_INFO("Incorrect parameters for ^2sendcvar^7"); } case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd sendcvar \n"); - LOG_INFO(" Where 'cvar' is the cvar plus arguments to send to the server.\n"); + LOG_INFO("Usage:^3 cl_cmd sendcvar "); + LOG_INFO(" Where 'cvar' is the cvar plus arguments to send to the server."); return; } } @@ -531,14 +533,14 @@ void GameCommand(string command) { if (argc == 1) { - LOG_INFO("Client console commands:\n"); + LOG_INFO("Client console commands:"); LocalCommand_macro_help(); - LOG_INFO("\nGeneric commands shared by all programs:\n"); + LOG_INFO("\nGeneric commands shared by all programs:"); GenericCommand_macro_help(); - LOG_INFO("\nUsage:^3 cl_cmd COMMAND...^7, where possible commands are listed above.\n"); - LOG_INFO("For help about a specific command, type cl_cmd help COMMAND\n"); + LOG_INFO("\nUsage:^3 cl_cmd COMMAND...^7, where possible commands are listed above."); + LOG_INFO("For help about a specific command, type cl_cmd help COMMAND"); return; } @@ -558,7 +560,7 @@ void GameCommand(string command) ) return; // nothing above caught the command, must be invalid - LOG_INFO(((command != "") ? strcat("Unknown client command \"", command, "\"") : "No command provided"), ". For a list of supported commands, try cl_cmd help.\n"); + LOG_INFO(((command != "") ? strcat("Unknown client command \"", command, "\"") : "No command provided"), ". For a list of supported commands, try cl_cmd help."); } diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc index 2b2f8ad0d..9af8673da 100644 --- a/qcsrc/client/hud/panel/quickmenu.qc +++ b/qcsrc/client/hud/panel/quickmenu.qc @@ -83,7 +83,7 @@ bool QuickMenu_Open(string mode, string submenu, string file) if(mode == "file") { if(file == "" || file == "0") - LOG_INFO("No file name is set in hud_panel_quickmenu_file, loading default quickmenu\n"); + LOG_INFO("No file name is set in hud_panel_quickmenu_file, loading default quickmenu"); else { fh = fopen(file, FILE_READ); diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index d0e97ba47..8e0d0f057 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -295,48 +295,48 @@ void Scoreboard_UpdateTeamPos(entity Team) void Cmd_Scoreboard_Help() { - LOG_INFO(_("You can modify the scoreboard using the ^2scoreboard_columns_set command.\n")); - LOG_INFO(_("^3|---------------------------------------------------------------|\n")); - LOG_INFO(_("Usage:\n")); - LOG_INFO(_("^2scoreboard_columns_set default\n")); - LOG_INFO(_("^2scoreboard_columns_set ^7field1 field2 ...\n")); - LOG_INFO(_("The following field names are recognized (case insensitive):\n")); - LOG_INFO(_("You can use a ^3|^7 to start the right-aligned fields.\n")); - LOG_INFO("\n"); - - LOG_INFO(_("^3name^7 or ^3nick^7 Name of a player\n")); - LOG_INFO(_("^3ping^7 Ping time\n")); - LOG_INFO(_("^3pl^7 Packet loss\n")); - LOG_INFO(_("^3elo^7 Player ELO\n")); - LOG_INFO(_("^3kills^7 Number of kills\n")); - LOG_INFO(_("^3deaths^7 Number of deaths\n")); - LOG_INFO(_("^3suicides^7 Number of suicides\n")); - LOG_INFO(_("^3frags^7 kills - suicides\n")); - LOG_INFO(_("^3kd^7 The kill-death ratio\n")); - LOG_INFO(_("^3dmg^7 The total damage done\n")); - LOG_INFO(_("^3dmgtaken^7 The total damage taken\n")); - LOG_INFO(_("^3sum^7 frags - deaths\n")); - LOG_INFO(_("^3caps^7 How often a flag (CTF) or a key (KeyHunt) was captured\n")); - LOG_INFO(_("^3pickups^7 How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up\n")); - LOG_INFO(_("^3captime^7 Time of fastest cap (CTF)\n")); - LOG_INFO(_("^3fckills^7 Number of flag carrier kills\n")); - LOG_INFO(_("^3returns^7 Number of flag returns\n")); - LOG_INFO(_("^3drops^7 Number of flag drops\n")); - LOG_INFO(_("^3lives^7 Number of lives (LMS)\n")); - LOG_INFO(_("^3rank^7 Player rank\n")); - LOG_INFO(_("^3pushes^7 Number of players pushed into void\n")); - LOG_INFO(_("^3destroyed^7 Number of keys destroyed by pushing them into void\n")); - LOG_INFO(_("^3kckills^7 Number of keys carrier kills\n")); - LOG_INFO(_("^3losses^7 Number of times a key was lost\n")); - LOG_INFO(_("^3laps^7 Number of laps finished (race/cts)\n")); - LOG_INFO(_("^3time^7 Total time raced (race/cts)\n")); - LOG_INFO(_("^3fastest^7 Time of fastest lap (race/cts)\n")); - LOG_INFO(_("^3ticks^7 Number of ticks (DOM)\n")); - LOG_INFO(_("^3takes^7 Number of domination points taken (DOM)\n")); - LOG_INFO(_("^3bckills^7 Number of ball carrier kills\n")); - LOG_INFO(_("^3bctime^7 Total amount of time holding the ball in Keepaway\n")); - LOG_INFO(_("^3score^7 Total score\n")); - LOG_INFO("\n"); + LOG_INFO(_("You can modify the scoreboard using the ^2scoreboard_columns_set command.")); + LOG_INFO(_("^3|---------------------------------------------------------------|")); + LOG_INFO(_("Usage:")); + LOG_INFO(_("^2scoreboard_columns_set default")); + LOG_INFO(_("^2scoreboard_columns_set ^7field1 field2 ...")); + LOG_INFO(_("The following field names are recognized (case insensitive):")); + LOG_INFO(_("You can use a ^3|^7 to start the right-aligned fields.")); + LOG_INFO(""); + + LOG_INFO(_("^3name^7 or ^3nick^7 Name of a player")); + LOG_INFO(_("^3ping^7 Ping time")); + LOG_INFO(_("^3pl^7 Packet loss")); + LOG_INFO(_("^3elo^7 Player ELO")); + LOG_INFO(_("^3kills^7 Number of kills")); + LOG_INFO(_("^3deaths^7 Number of deaths")); + LOG_INFO(_("^3suicides^7 Number of suicides")); + LOG_INFO(_("^3frags^7 kills - suicides")); + LOG_INFO(_("^3kd^7 The kill-death ratio")); + LOG_INFO(_("^3dmg^7 The total damage done")); + LOG_INFO(_("^3dmgtaken^7 The total damage taken")); + LOG_INFO(_("^3sum^7 frags - deaths")); + LOG_INFO(_("^3caps^7 How often a flag (CTF) or a key (KeyHunt) was captured")); + LOG_INFO(_("^3pickups^7 How often a flag (CTF) or a key (KeyHunt) or a ball (Keepaway) was picked up")); + LOG_INFO(_("^3captime^7 Time of fastest cap (CTF)")); + LOG_INFO(_("^3fckills^7 Number of flag carrier kills")); + LOG_INFO(_("^3returns^7 Number of flag returns")); + LOG_INFO(_("^3drops^7 Number of flag drops")); + LOG_INFO(_("^3lives^7 Number of lives (LMS)")); + LOG_INFO(_("^3rank^7 Player rank")); + LOG_INFO(_("^3pushes^7 Number of players pushed into void")); + LOG_INFO(_("^3destroyed^7 Number of keys destroyed by pushing them into void")); + LOG_INFO(_("^3kckills^7 Number of keys carrier kills")); + LOG_INFO(_("^3losses^7 Number of times a key was lost")); + LOG_INFO(_("^3laps^7 Number of laps finished (race/cts)")); + LOG_INFO(_("^3time^7 Total time raced (race/cts)")); + LOG_INFO(_("^3fastest^7 Time of fastest lap (race/cts)")); + LOG_INFO(_("^3ticks^7 Number of ticks (DOM)")); + LOG_INFO(_("^3takes^7 Number of domination points taken (DOM)")); + LOG_INFO(_("^3bckills^7 Number of ball carrier kills")); + LOG_INFO(_("^3bctime^7 Total amount of time holding the ball in Keepaway")); + LOG_INFO(_("^3score^7 Total score")); + LOG_INFO(""); LOG_INFO(_("Before a field you can put a + or - sign, then a comma separated list\n" "of game types, then a slash, to make the field show up only in these\n" @@ -346,11 +346,10 @@ void Cmd_Scoreboard_Help() LOG_INFO(_("The special game type names 'teams' and 'noteams' can be used to\n" "include/exclude ALL teams/noteams game modes.\n\n")); - LOG_INFO(_("Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4\n")); - LOG_INFO(_("will display name, ping and pl aligned to the left, and the fields\n" + LOG_INFO(_("Example: scoreboard_columns_set name ping pl | +ctf/field3 -dm/field4")); + LOG_INFO(_("will display name, ping and pl aligned to the left, and the fields" "right of the vertical bar aligned to the right.\n")); - LOG_INFO(_("'field3' will only be shown in CTF, and 'field4' will be shown in all\n" - "other gamemodes except DM.\n")); + LOG_INFO(_("'field3' will only be shown in CTF, and 'field4' will be shown in all\nother gamemodes except DM.\n")); } // NOTE: adding a gametype with ? to not warn for an optional field @@ -514,7 +513,7 @@ LABEL(found) sbt_field_title[0] = strzone(TranslateScoresLabel("name")); sbt_field[0] = SP_NAME; ++sbt_num_fields; - LOG_INFO("fixed missing field 'name'\n"); + LOG_INFO("fixed missing field 'name'"); if(!have_separator) { @@ -529,7 +528,7 @@ LABEL(found) sbt_field[1] = SP_SEPARATOR; sbt_field_size[1] = stringwidth("|", false, hud_fontsize); ++sbt_num_fields; - LOG_INFO("fixed missing field '|'\n"); + LOG_INFO("fixed missing field '|'"); } } else if(!have_separator) @@ -539,7 +538,7 @@ LABEL(found) sbt_field_size[sbt_num_fields] = stringwidth("|", false, hud_fontsize); sbt_field[sbt_num_fields] = SP_SEPARATOR; ++sbt_num_fields; - LOG_INFO("fixed missing field '|'\n"); + LOG_INFO("fixed missing field '|'"); } if(!have_secondary) { diff --git a/qcsrc/client/hud/panel/vote.qc b/qcsrc/client/hud/panel/vote.qc index 750e62ef8..15e18e8f4 100644 --- a/qcsrc/client/hud/panel/vote.qc +++ b/qcsrc/client/hud/panel/vote.qc @@ -24,7 +24,7 @@ void HUD_Vote() { vote_yescount = 0; vote_nocount = 0; - LOG_INFO(_("^1You must answer before entering hud configure mode\n")); + LOG_INFO(_("^1You must answer before entering hud configure mode")); cvar_set("_hud_configure", "0"); } if(vote_called_vote) diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index 9e783d306..b34bd0f3a 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -497,7 +497,7 @@ void Cmd_MapVote_MapDownload(int argc) if(argc != 2 || !mv_pk3list) { - LOG_INFO(_("mv_mapdownload: ^3You're not supposed to use this command on your own!\n")); + LOG_INFO(_("mv_mapdownload: ^3You're not supposed to use this command on your own!")); return; } @@ -507,7 +507,7 @@ void Cmd_MapVote_MapDownload(int argc) break; if(!pak || pak.sv_entnum != id) { - LOG_INFO(_("^1Error:^7 Couldn't find pak index.\n")); + LOG_INFO(_("^1Error:^7 Couldn't find pak index.")); return; } @@ -516,7 +516,7 @@ void Cmd_MapVote_MapDownload(int argc) mv_preview[id] = true; return; } else { - LOG_INFO(_("Requesting preview...\n")); + LOG_INFO(_("Requesting preview...")); localcmd(strcat("\ncmd mv_getpicture ", ftos(id), "\n")); } } diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index 9fc8a1563..fd1647ddc 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -584,7 +584,7 @@ void Accuracy_LoadLevels() if(acc_levels > MAX_ACCURACY_LEVELS) acc_levels = MAX_ACCURACY_LEVELS; if(acc_levels < 2) - LOG_INFO("Warning: accuracy_color_levels must contain at least 2 values\n"); + LOG_INFO("Warning: accuracy_color_levels must contain at least 2 values"); int i; for(i = 0; i < acc_levels; ++i) diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc index c500e7d2e..c58a3df75 100644 --- a/qcsrc/common/command/generic.qc +++ b/qcsrc/common/command/generic.qc @@ -86,12 +86,12 @@ void GenericCommand_addtolist(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2addtolist^7\n"); + LOG_INFO("Incorrect parameters for ^2addtolist^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " addtolist variable value\n"); - LOG_INFO(" Where 'variable' is what to add 'value' to.\n"); - LOG_INFO("See also: ^2removefromlist^7\n"); + LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " addtolist variable value"); + LOG_INFO(" Where 'variable' is what to add 'value' to."); + LOG_INFO("See also: ^2removefromlist^7"); return; } } @@ -153,7 +153,7 @@ void GenericCommand_qc_curl(float request, float argc) curl_uri_get_pos = (curl_uri_get_pos + 1) % (URI_GET_CURL_END - URI_GET_CURL + 1); } else - LOG_INFO(_("error creating curl handle\n")); + LOG_INFO(_("error creating curl handle")); buf_del(buf); @@ -203,13 +203,13 @@ GENERIC_COMMAND(dumpcommands, "Dump all commands on the program to *_cmd_dump.tx CMD_Write("\ndump of generic commands:\n"); GenericCommand_macro_write_aliases(fh); - LOG_INFO("Completed dump of aliases in ^2data/data/", GetProgramCommandPrefix(), "_dump.txt^7.\n"); + LOG_INFO("Completed dump of aliases in ^2data/data/", GetProgramCommandPrefix(), "_dump.txt^7."); fclose(fh); } else { - LOG_INFO("^1Error: ^7Could not dump to file!\n"); + LOG_INFO("^1Error: ^7Could not dump to file!"); } return; } @@ -218,7 +218,7 @@ GENERIC_COMMAND(dumpcommands, "Dump all commands on the program to *_cmd_dump.tx case CMD_REQUEST_USAGE: { LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " dumpcommands"); - LOG_INFO(" No arguments required.\n"); + LOG_INFO(" No arguments required."); return; } } @@ -241,7 +241,7 @@ void GenericCommand_maplist(float request, float argc) { if (!fexists(strcat("maps/", argv(2), ".bsp"))) { - LOG_INFO("maplist: ERROR: ", argv(2), " does not exist!\n"); + LOG_INFO("maplist: ERROR: ", argv(2), " does not exist!"); break; } @@ -295,13 +295,13 @@ void GenericCommand_maplist(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2maplist^7\n"); + LOG_INFO("Incorrect parameters for ^2maplist^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " maplist action [map]\n"); - LOG_INFO(" Where 'action' is the command to complete,\n"); - LOG_INFO(" and 'map' is what it acts upon (if required).\n"); - LOG_INFO(" Full list of commands here: \"add, cleanup, remove, shuffle.\"\n"); + LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " maplist action [map]"); + LOG_INFO(" Where 'action' is the command to complete,"); + LOG_INFO(" and 'map' is what it acts upon (if required)."); + LOG_INFO(" Full list of commands here: \"add, cleanup, remove, shuffle.\""); return; } } @@ -320,8 +320,8 @@ void GenericCommand_nextframe(float request, float arguments, string command) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " nextframe command...\n"); - LOG_INFO(" Where command will be executed next frame of this VM\n"); + LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " nextframe command..."); + LOG_INFO(" Where command will be executed next frame of this VM"); return; } } @@ -351,12 +351,12 @@ void GenericCommand_removefromlist(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2removefromlist^7\n"); + LOG_INFO("Incorrect parameters for ^2removefromlist^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " removefromlist variable value\n"); - LOG_INFO(" Where 'variable' is what cvar to remove 'value' from.\n"); - LOG_INFO("See also: ^2addtolist^7\n"); + LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " removefromlist variable value"); + LOG_INFO(" Where 'variable' is what cvar to remove 'value' from."); + LOG_INFO("See also: ^2addtolist^7"); return; } } @@ -395,7 +395,7 @@ void GenericCommand_restartnotifs(float request) Destroy_All_Notifications(); CALL_ACCUMULATED_FUNCTION(RegisterNotifications); #else - LOG_INFO(_("Notification restart command only works with cl_cmd and sv_cmd.\n")); + LOG_INFO(_("Notification restart command only works with cl_cmd and sv_cmd.")); #endif return; } @@ -404,7 +404,7 @@ void GenericCommand_restartnotifs(float request) case CMD_REQUEST_USAGE: { LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " restartnotifs"); - LOG_INFO(" No arguments required.\n"); + LOG_INFO(" No arguments required."); return; } } @@ -430,12 +430,12 @@ void GenericCommand_settemp(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2settemp^7\n"); + LOG_INFO("Incorrect parameters for ^2settemp^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " settemp \"cvar\" \"arguments\"\n"); - LOG_INFO(" Where 'cvar' is the cvar you want to temporarily set with 'arguments'.\n"); - LOG_INFO("See also: ^2settemp_restore^7\n"); + LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " settemp \"cvar\" \"arguments\""); + LOG_INFO(" Where 'cvar' is the cvar you want to temporarily set with 'arguments'."); + LOG_INFO("See also: ^2settemp_restore^7"); return; } } @@ -460,9 +460,9 @@ void GenericCommand_settemp_restore(float request, float argc) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " settemp_restore\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2settemp^7\n"); + LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " settemp_restore"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2settemp^7"); return; } } diff --git a/qcsrc/common/command/rpn.qc b/qcsrc/common/command/rpn.qc index 257972fac..7e1c4f52e 100644 --- a/qcsrc/common/command/rpn.qc +++ b/qcsrc/common/command/rpn.qc @@ -13,7 +13,7 @@ string rpn_pop() --rpn_sp; return rpn_stack[rpn_sp]; } else { - LOG_INFO("rpn: stack underflow\n"); + LOG_INFO("rpn: stack underflow"); rpn_error = true; return ""; } @@ -24,7 +24,7 @@ void rpn_push(string s) rpn_stack[rpn_sp] = s; ++rpn_sp; } else { - LOG_INFO("rpn: stack overflow\n"); + LOG_INFO("rpn: stack overflow"); rpn_error = true; } } @@ -33,7 +33,7 @@ string rpn_get() if(rpn_sp > 0) { return rpn_stack[rpn_sp - 1]; } else { - LOG_INFO("rpn: empty stack\n"); + LOG_INFO("rpn: empty stack"); rpn_error = true; return ""; } @@ -43,7 +43,7 @@ void rpn_set(string s) if(rpn_sp > 0) { rpn_stack[rpn_sp - 1] = s; } else { - LOG_INFO("rpn: empty stack\n"); + LOG_INFO("rpn: empty stack"); rpn_error = true; } } @@ -107,7 +107,7 @@ void GenericCommand_rpn(float request, float argc, string command) } else { - LOG_INFO("rpn: empty cvar name for 'def'\n"); + LOG_INFO("rpn: empty cvar name for 'def'"); rpn_error = true; } } else if(rpncmd == "defs" || rpncmd == "@") { @@ -132,7 +132,7 @@ void GenericCommand_rpn(float request, float argc, string command) } else { - LOG_INFO("rpn: empty cvar name for 'defs'\n"); + LOG_INFO("rpn: empty cvar name for 'defs'"); rpn_error = true; } } else if(rpncmd == "load") { @@ -288,7 +288,7 @@ void GenericCommand_rpn(float request, float argc, string command) db_put(rpn_db, "stack.pos", ftos(i-2)); } else { rpn_error = 1; - LOG_INFO("rpn: database underflow\n"); + LOG_INFO("rpn: database underflow"); } } else if(rpncmd == "dbget") { @@ -298,7 +298,7 @@ void GenericCommand_rpn(float request, float argc, string command) rpn_push(db_get(rpn_db, strcat("stack.", ftos(i-1)))); } else { rpn_error = 1; - LOG_INFO("rpn: database empty\n"); + LOG_INFO("rpn: database empty"); } } else if(rpncmd == "dblen") { rpn_push(db_get(rpn_db, "stack.pointer")); @@ -347,7 +347,7 @@ void GenericCommand_rpn(float request, float argc, string command) if(!j) { rpn_error = true; - LOG_INFO("rpn: empty database\n"); + LOG_INFO("rpn: empty database"); } else { --j; rpn_push(db_get(rpn_db, strcat("stack.", ftos(i)))); @@ -372,7 +372,7 @@ void GenericCommand_rpn(float request, float argc, string command) rpn_push(db_get(rpn_db, strcat("stack.", s))); } else { rpn_error = 1; - LOG_INFO("rpn: empty database\n"); + LOG_INFO("rpn: empty database"); } } else if(rpncmd == "dbat") { rpn_push(db_get(rpn_db, "stack.pos")); @@ -384,7 +384,7 @@ void GenericCommand_rpn(float request, float argc, string command) { if(i < 0 || i >= j) { - LOG_INFO("rpn: database cursor out of bounds\n"); + LOG_INFO("rpn: database cursor out of bounds"); rpn_error = true; } if(!rpn_error) @@ -398,7 +398,7 @@ void GenericCommand_rpn(float request, float argc, string command) if(!j) { rpn_error = true; - LOG_INFO("rpn: empty database, cannot move cursor\n"); + LOG_INFO("rpn: empty database, cannot move cursor"); } if(!rpn_error) { @@ -412,7 +412,7 @@ void GenericCommand_rpn(float request, float argc, string command) j = stof(db_get(rpn_db, "stack.pointer")); if(i < 0 || i >= j) { - LOG_INFO("rpn: database cursor destination out of bounds\n"); + LOG_INFO("rpn: database cursor destination out of bounds"); rpn_error = true; } if(!rpn_error) @@ -514,7 +514,7 @@ LABEL(skip_difference) { if (!fexists(s)) { - LOG_INFO("rpn: ERROR: ", s, " does not exist!\n"); + LOG_INFO("rpn: ERROR: ", s, " does not exist!"); rpn_error = true; } } @@ -553,7 +553,7 @@ LABEL(skip_difference) while(rpn_sp > 0) { s = rpn_pop(); - LOG_INFO("rpn: still on stack: ", s, "\n"); + LOG_INFO("rpn: still on stack: ", s); } } @@ -563,42 +563,42 @@ LABEL(skip_difference) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " rpn EXPRESSION...\n"); - LOG_INFO(" Operator description (x: string, s: set, f: float):\n"); - LOG_INFO(" x pop -----------------------------> : removes the top\n"); - LOG_INFO(" x dup -----------------------------> x x : duplicates the top\n"); - LOG_INFO(" x x exch --------------------------> x x : swap the top two\n"); - LOG_INFO(" /cvarname load --------------------> x : loads a cvar\n"); - LOG_INFO(" /cvarname x def -------------------> : writes to a cvar\n"); - LOG_INFO(" f f add|sub|mul|div|mod|pow -------> f : adds/... two numbers\n"); - LOG_INFO(" f f and|or|xor|bitand|bitor|bitxor > f : logical and bitwise operations\n"); - LOG_INFO(" f f eq|ne|gt|ge|lt|le|max|min -----> f : compares two numbers\n"); - LOG_INFO(" f neg|abs|sgn|rand|floor|ceil------> f : negates/... a number\n"); - LOG_INFO(" f not|bitnot ----------------------> f : logical and bitwise negation\n"); - LOG_INFO(" f exp|log|sin|cos -----------------> f : exponential function & Co.\n"); - LOG_INFO(" f f f bound -----------------------> f : bounds the middle number\n"); - LOG_INFO(" f1 f2 b when ----------------------> f : f1 if b, f2 otherwise\n"); - LOG_INFO(" s s union|intersection|difference -> s : set operations\n"); - LOG_INFO(" s shuffle -------------------------> s : randomly arrange elements\n"); - LOG_INFO(" /key /value put -------------------> : set a database key\n"); - LOG_INFO(" /key get --------------------------> s : get a database value\n"); - LOG_INFO(" x dbpush --------------------------> : pushes the top onto the database\n"); - LOG_INFO(" dbpop|dbget -----------------------> x : removes/reads DB's top\n"); - LOG_INFO(" dblen|dbat ------------------------> f : gets the DB's size/cursor pos\n"); - LOG_INFO(" dbclr -----------------------------> : clear the DB\n"); - LOG_INFO(" s dbsave|dbload--------------------> : save/load the DB to/from a file\n"); - LOG_INFO(" x dbins ---------------------------> : moves the top into the DB\n"); - LOG_INFO(" dbext|dbread ----------------------> x : extract/get from the DB's cursor\n"); - LOG_INFO(" f dbmov|dbgoto --------------------> : move or set the DB's cursor\n"); - LOG_INFO(" s localtime -----------------------> s : formats the current local time\n"); - LOG_INFO(" s gmtime --------------------------> s : formats the current UTC time\n"); - LOG_INFO(" time ------------------------------> f : seconds since VM start\n"); - LOG_INFO(" s /MD4 digest ---------------------> s : MD4 digest\n"); - LOG_INFO(" s /SHA256 digest ------------------> s : SHA256 digest\n"); - LOG_INFO(" s /formatstring sprintf1s ---------> s : sprintf with 1 string (pad, cut)\n"); - LOG_INFO(" s eval ----------------------------> : does something eval\n"); - LOG_INFO(" Set operations operate on 'such''strings'.\n"); - LOG_INFO(" Unknown tokens insert their cvar value.\n"); + LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " rpn EXPRESSION..."); + LOG_INFO(" Operator description (x: string, s: set, f: float):"); + LOG_INFO(" x pop -----------------------------> : removes the top"); + LOG_INFO(" x dup -----------------------------> x x : duplicates the top"); + LOG_INFO(" x x exch --------------------------> x x : swap the top two"); + LOG_INFO(" /cvarname load --------------------> x : loads a cvar"); + LOG_INFO(" /cvarname x def -------------------> : writes to a cvar"); + LOG_INFO(" f f add|sub|mul|div|mod|pow -------> f : adds/... two numbers"); + LOG_INFO(" f f and|or|xor|bitand|bitor|bitxor > f : logical and bitwise operations"); + LOG_INFO(" f f eq|ne|gt|ge|lt|le|max|min -----> f : compares two numbers"); + LOG_INFO(" f neg|abs|sgn|rand|floor|ceil------> f : negates/... a number"); + LOG_INFO(" f not|bitnot ----------------------> f : logical and bitwise negation"); + LOG_INFO(" f exp|log|sin|cos -----------------> f : exponential function & Co."); + LOG_INFO(" f f f bound -----------------------> f : bounds the middle number"); + LOG_INFO(" f1 f2 b when ----------------------> f : f1 if b, f2 otherwise"); + LOG_INFO(" s s union|intersection|difference -> s : set operations"); + LOG_INFO(" s shuffle -------------------------> s : randomly arrange elements"); + LOG_INFO(" /key /value put -------------------> : set a database key"); + LOG_INFO(" /key get --------------------------> s : get a database value"); + LOG_INFO(" x dbpush --------------------------> : pushes the top onto the database"); + LOG_INFO(" dbpop|dbget -----------------------> x : removes/reads DB's top"); + LOG_INFO(" dblen|dbat ------------------------> f : gets the DB's size/cursor pos"); + LOG_INFO(" dbclr -----------------------------> : clear the DB"); + LOG_INFO(" s dbsave|dbload--------------------> : save/load the DB to/from a file"); + LOG_INFO(" x dbins ---------------------------> : moves the top into the DB"); + LOG_INFO(" dbext|dbread ----------------------> x : extract/get from the DB's cursor"); + LOG_INFO(" f dbmov|dbgoto --------------------> : move or set the DB's cursor"); + LOG_INFO(" s localtime -----------------------> s : formats the current local time"); + LOG_INFO(" s gmtime --------------------------> s : formats the current UTC time"); + LOG_INFO(" time ------------------------------> f : seconds since VM start"); + LOG_INFO(" s /MD4 digest ---------------------> s : MD4 digest"); + LOG_INFO(" s /SHA256 digest ------------------> s : SHA256 digest"); + LOG_INFO(" s /formatstring sprintf1s ---------> s : sprintf with 1 string (pad, cut)"); + LOG_INFO(" s eval ----------------------------> : does something eval"); + LOG_INFO(" Set operations operate on 'such''strings'."); + LOG_INFO(" Unknown tokens insert their cvar value."); return; } } diff --git a/qcsrc/common/debug.qh b/qcsrc/common/debug.qh index 8bcea523d..0200883b8 100644 --- a/qcsrc/common/debug.qh +++ b/qcsrc/common/debug.qh @@ -213,7 +213,7 @@ GENERIC_COMMAND(version, "Print the current version") { case CMD_REQUEST_COMMAND: { - LOG_INFO(WATERMARK "\n"); + LOG_INFO(WATERMARK); return; } default: @@ -336,12 +336,12 @@ GENERIC_COMMAND(find, "Search through entities for matching classname") default: { - LOG_INFO("Incorrect parameters for ^2find^7\n"); + LOG_INFO("Incorrect parameters for ^2find^7"); } case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 " GetProgramCommandPrefix() " find classname\n"); - LOG_INFO(" Where 'classname' is the classname to search for.\n"); + LOG_INFO("Usage:^3 " GetProgramCommandPrefix() " find classname"); + LOG_INFO(" Where 'classname' is the classname to search for."); return; } } @@ -359,10 +359,10 @@ GENERIC_COMMAND(findat, "Search through entities for matching origin") } default: - LOG_INFO("Incorrect parameters for ^2findat^7\n"); + LOG_INFO("Incorrect parameters for ^2findat^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 " GetProgramCommandPrefix() " findat \"0 0 0\"\n"); + LOG_INFO("Usage:^3 " GetProgramCommandPrefix() " findat \"0 0 0\""); return; } } diff --git a/qcsrc/common/effects/effectinfo.qc b/qcsrc/common/effects/effectinfo.qc index bd83b3e66..71260eb3d 100644 --- a/qcsrc/common/effects/effectinfo.qc +++ b/qcsrc/common/effects/effectinfo.qc @@ -314,9 +314,9 @@ GENERIC_COMMAND(dumpeffectinfo, "Dump all effectinfo to effectinfo_dump.txt") default: case CMD_REQUEST_USAGE: { LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " dumpeffectinfo [filename]"); - LOG_INFO(" Where 'filename' is the file to write (default is effectinfo_dump.txt),\n"); - LOG_INFO(" if supplied with '-' output to console as well as default,\n"); - LOG_INFO(" if left blank, it will only write to default.\n"); + LOG_INFO(" Where 'filename' is the file to write (default is effectinfo_dump.txt),"); + LOG_INFO(" if supplied with '-' output to console as well as default,"); + LOG_INFO(" if left blank, it will only write to default."); return; } } diff --git a/qcsrc/common/items/item.qh b/qcsrc/common/items/item.qh index 7072261b7..c302ae402 100644 --- a/qcsrc/common/items/item.qh +++ b/qcsrc/common/items/item.qh @@ -67,7 +67,7 @@ CLASS(GameItem, Object) METHOD(GameItem, show, void(GameItem this)) { TC(GameItem, this); - LOG_INFO("A game item\n"); + LOG_INFO("A game item"); } void ITEM_HANDLE(Show, GameItem this) { this.show(this); } ENDCLASS(GameItem) diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc index f6a14814b..62600a9c4 100644 --- a/qcsrc/common/mapinfo.qc +++ b/qcsrc/common/mapinfo.qc @@ -283,7 +283,7 @@ float _MapInfo_Generate(string pFilename) // 0: failure, 1: ok ent, 2: ok bsp } if(fh < 0) return 0; - LOG_INFO("Analyzing ", fn, " to generate initial mapinfo\n"); + LOG_INFO("Analyzing ", fn, " to generate initial mapinfo"); inWorldspawn = 2; MapInfo_Map_flags = 0; @@ -1190,7 +1190,7 @@ void MapInfo_LoadMap(string s, float reinit) // MapInfo_SwitchGameType(MAPINFO_TYPE_DEATHMATCH.m_flags); //} - LOG_INFO("Switching to map ", s, "\n"); + LOG_INFO("Switching to map ", s); cvar_settemp_restore(); if(reinit) diff --git a/qcsrc/common/minigames/minigame/bd.qc b/qcsrc/common/minigames/minigame/bd.qc index cda2e5d26..4790f1f1f 100644 --- a/qcsrc/common/minigames/minigame/bd.qc +++ b/qcsrc/common/minigames/minigame/bd.qc @@ -348,7 +348,7 @@ void bd_move(entity minigame, entity player, string dir) entity dozer = bd_find_dozer(minigame); if(!dozer) { - LOG_INFO("Dozer wasn't found!\n"); + LOG_INFO("Dozer wasn't found!"); return; // should not happen... TODO: end match? } @@ -740,7 +740,7 @@ bool bd_save_level(entity minigame) if(boulder_count != target_count) { - LOG_INFO("Not enough targets or boulders, fix your level!\n"); + LOG_INFO("Not enough targets or boulders, fix your level!"); return false; } @@ -791,7 +791,7 @@ void bd_load_level(entity minigame) file_get = fopen(file_name, FILE_READ); if(file_get < 0) { - LOG_INFO("^3BULLDOZER: ^7could not find storage file ^3", file_name, "^7, no items were loaded\n"); + LOG_INFO("^3BULLDOZER: ^7could not find storage file ^3", file_name, "^7, no items were loaded"); } else { @@ -829,7 +829,7 @@ void bd_close_editor(entity minigame, entity player) entity dozer = bd_find_dozer(minigame); if(!dozer) { - LOG_INFO("You need to place a bulldozer on the level to save it!\n"); + LOG_INFO("You need to place a bulldozer on the level to save it!"); return; } @@ -840,7 +840,7 @@ void bd_close_editor(entity minigame, entity player) } else { - LOG_INFO("You need to set the level name!\n"); + LOG_INFO("You need to set the level name!"); return; } } diff --git a/qcsrc/common/mutators/base.qh b/qcsrc/common/mutators/base.qh index 2b932b275..7fc47ff9e 100644 --- a/qcsrc/common/mutators/base.qh +++ b/qcsrc/common/mutators/base.qh @@ -305,7 +305,7 @@ STATIC_INIT_LATE(Mutators) { #define MUTATOR_HOOK(cb, func, order) MACRO_BEGIN { \ MUTATOR_ONADD { \ if (!CallbackChain_Add(HOOK_##cb, CALLBACK_##func, order)) { \ - LOG_INFO("HOOK FAILED: ", #cb, ":", #func, "\n"); \ + LOG_INFO("HOOK FAILED: ", #cb, ":", #func); \ return true; \ } \ } \ diff --git a/qcsrc/common/mutators/mutator/new_toys/sv_new_toys.qc b/qcsrc/common/mutators/mutator/new_toys/sv_new_toys.qc index 277a4e7db..288c2d5c8 100644 --- a/qcsrc/common/mutators/mutator/new_toys/sv_new_toys.qc +++ b/qcsrc/common/mutators/mutator/new_toys/sv_new_toys.qc @@ -94,7 +94,7 @@ REGISTER_MUTATOR(nt, cvar("g_new_toys") && !cvar("g_instagib") && !cvar("g_overk MUTATOR_ONREMOVE { - LOG_INFO("This cannot be removed at runtime\n"); + LOG_INFO("This cannot be removed at runtime"); return -1; } diff --git a/qcsrc/common/mutators/mutator/physical_items/sv_physical_items.qc b/qcsrc/common/mutators/mutator/physical_items/sv_physical_items.qc index 62b30e2d1..62781c920 100644 --- a/qcsrc/common/mutators/mutator/physical_items/sv_physical_items.qc +++ b/qcsrc/common/mutators/mutator/physical_items/sv_physical_items.qc @@ -23,7 +23,7 @@ REGISTER_MUTATOR(physical_items, cvar("g_physical_items")) MUTATOR_ONREMOVE { - LOG_INFO("This cannot be removed at runtime\n"); + LOG_INFO("This cannot be removed at runtime"); return -1; } diff --git a/qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc b/qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc index 883a01ef0..93dc602f0 100644 --- a/qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc +++ b/qcsrc/common/mutators/mutator/sandbox/sv_sandbox.qc @@ -407,7 +407,7 @@ void sandbox_Database_Load() if(file_get < 0) { if(autocvar_g_sandbox_info > 0) - LOG_INFO("^3SANDBOX - SERVER: ^7could not find storage file ^3", file_name, "^7, no objects were loaded\n"); + LOG_INFO("^3SANDBOX - SERVER: ^7could not find storage file ^3", file_name, "^7, no objects were loaded"); } else { @@ -432,7 +432,7 @@ void sandbox_Database_Load() } } if(autocvar_g_sandbox_info > 0) - LOG_INFO("^3SANDBOX - SERVER: ^7successfully loaded storage file ^3", file_name, "\n"); + LOG_INFO("^3SANDBOX - SERVER: ^7successfully loaded storage file ^3", file_name); } fclose(file_get); } @@ -524,7 +524,7 @@ MUTATOR_HOOKFUNCTION(sandbox, SV_ParseClientCommand) _setmodel(e, argv(2)); if(autocvar_g_sandbox_info > 0) - LOG_INFO("^3SANDBOX - SERVER: ^7", player.netname, " spawned an object at origin ^3", vtos(e.origin), "\n"); + LOG_INFO("^3SANDBOX - SERVER: ^7", player.netname, " spawned an object at origin ^3", vtos(e.origin)); return true; // ---------------- COMMAND: OBJECT, REMOVE ---------------- @@ -533,7 +533,7 @@ MUTATOR_HOOKFUNCTION(sandbox, SV_ParseClientCommand) if(e != NULL) { if(autocvar_g_sandbox_info > 0) - LOG_INFO("^3SANDBOX - SERVER: ^7", player.netname, " removed an object at origin ^3", vtos(e.origin), "\n"); + LOG_INFO("^3SANDBOX - SERVER: ^7", player.netname, " removed an object at origin ^3", vtos(e.origin)); sandbox_ObjectRemove(e); return true; } @@ -582,7 +582,7 @@ MUTATOR_HOOKFUNCTION(sandbox, SV_ParseClientCommand) print_to(player, "^2SANDBOX - INFO: ^7Object pasted successfully"); if(autocvar_g_sandbox_info > 0) - LOG_INFO("^3SANDBOX - SERVER: ^7", player.netname, " pasted an object at origin ^3", vtos(e.origin), "\n"); + LOG_INFO("^3SANDBOX - SERVER: ^7", player.netname, " pasted an object at origin ^3", vtos(e.origin)); return true; } return true; @@ -617,7 +617,7 @@ MUTATOR_HOOKFUNCTION(sandbox, SV_ParseClientCommand) player.object_attach = NULL; // object was attached, no longer keep it scheduled for attachment print_to(player, "^2SANDBOX - INFO: ^7Object attached successfully"); if(autocvar_g_sandbox_info > 1) - LOG_INFO("^3SANDBOX - SERVER: ^7", player.netname, " attached objects at origin ^3", vtos(e.origin), "\n"); + LOG_INFO("^3SANDBOX - SERVER: ^7", player.netname, " attached objects at origin ^3", vtos(e.origin)); return true; } print_to(player, "^1SANDBOX - WARNING: ^7Object could not be attached to the parent. Make sure you are facing an object that you have edit rights over"); @@ -630,7 +630,7 @@ MUTATOR_HOOKFUNCTION(sandbox, SV_ParseClientCommand) sandbox_ObjectAttach_Remove(e); print_to(player, "^2SANDBOX - INFO: ^7Child objects detached successfully"); if(autocvar_g_sandbox_info > 1) - LOG_INFO("^3SANDBOX - SERVER: ^7", player.netname, " detached objects at origin ^3", vtos(e.origin), "\n"); + LOG_INFO("^3SANDBOX - SERVER: ^7", player.netname, " detached objects at origin ^3", vtos(e.origin)); return true; } print_to(player, "^1SANDBOX - WARNING: ^7Child objects could not be detached. Make sure you are facing an object that you have edit rights over"); @@ -721,7 +721,7 @@ MUTATOR_HOOKFUNCTION(sandbox, SV_ParseClientCommand) e.message2 = strzone(strftime(true, "%d-%m-%Y %H:%M:%S")); if(autocvar_g_sandbox_info > 1) - LOG_INFO("^3SANDBOX - SERVER: ^7", player.netname, " edited property ^3", argv(2), " ^7of an object at origin ^3", vtos(e.origin), "\n"); + LOG_INFO("^3SANDBOX - SERVER: ^7", player.netname, " edited property ^3", argv(2), " ^7of an object at origin ^3", vtos(e.origin)); return true; } diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh index 42ac1e607..1721303ab 100644 --- a/qcsrc/common/notifications/all.qh +++ b/qcsrc/common/notifications/all.qh @@ -189,7 +189,7 @@ GENERIC_COMMAND(dumpnotifs, "Dump all notifications into notifications_dump.txt" LOG_INFOF("^1Error: ^7Could not open file '%s'!", filename); } #else - LOG_INFO(_("Notification dump command only works with cl_cmd and sv_cmd.\n")); + LOG_INFO(_("Notification dump command only works with cl_cmd and sv_cmd.")); #endif return; } @@ -197,9 +197,9 @@ GENERIC_COMMAND(dumpnotifs, "Dump all notifications into notifications_dump.txt" case CMD_REQUEST_USAGE: { LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " dumpnotifs [filename]"); - LOG_INFO(" Where 'filename' is the file to write (default is notifications_dump.cfg),\n"); - LOG_INFO(" if supplied with '-' output to console as well as default,\n"); - LOG_INFO(" if left blank, it will only write to default.\n"); + LOG_INFO(" Where 'filename' is the file to write (default is notifications_dump.cfg),"); + LOG_INFO(" if supplied with '-' output to console as well as default,"); + LOG_INFO(" if left blank, it will only write to default."); return; } } diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc index 34518bda5..20e2d4cc3 100644 --- a/qcsrc/common/physics/player.qc +++ b/qcsrc/common/physics/player.qc @@ -491,7 +491,7 @@ void SpecialCommand(entity this) if(autocvar_sv_cheats || this.maycheat) { if (!CheatImpulse(this, CHIMPULSE_GIVE_ALL.impulse)) - LOG_INFO("A hollow voice says \"Plugh\".\n"); + LOG_INFO("A hollow voice says \"Plugh\"."); } else STAT(MOVEVARS_SPECIALCOMMAND, this) = true; diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc index b511710f5..a9fc135d3 100644 --- a/qcsrc/common/playerstats.qc +++ b/qcsrc/common/playerstats.qc @@ -420,7 +420,7 @@ void PlayerStats_GameReport_Handler(entity fh, entity pass, float status) case URL_READY_ERROR: default: { - LOG_INFO("Player stats writing failed: ", ftos(status), "\n"); + LOG_INFO("Player stats writing failed: ", ftos(status)); PlayerStats_GameReport_DelayMapVote = false; if(PS_GR_OUT_DB >= 0) { @@ -590,14 +590,14 @@ void PlayerStats_PlayerBasic_Handler(entity fh, entity p, float status) case URL_READY_CLOSED: { // url_fclose has finished - LOG_INFO("Player stats synchronized with server\n"); + LOG_INFO("Player stats synchronized with server"); return; } case URL_READY_ERROR: default: { - LOG_INFO("Receiving player stats failed: ", ftos(status), "\n"); + LOG_INFO("Receiving player stats failed: ", ftos(status)); break; } } @@ -811,14 +811,14 @@ void PlayerStats_PlayerDetail_Handler(entity fh, entity unused, float status) case URL_READY_CLOSED: { // url_fclose has finished - LOG_INFO("PlayerStats_PlayerDetail_Handler(): Player stats synchronized with server.\n"); + LOG_INFO("PlayerStats_PlayerDetail_Handler(): Player stats synchronized with server."); break; } case URL_READY_ERROR: default: { - LOG_INFO("PlayerStats_PlayerDetail_Handler(): Receiving player stats failed: ", ftos(status), "\n"); + LOG_INFO("PlayerStats_PlayerDetail_Handler(): Receiving player stats failed: ", ftos(status)); PlayerStats_PlayerDetail_Status = PS_D_STATUS_ERROR; if(PS_D_IN_DB >= 0) { diff --git a/qcsrc/common/triggers/target/spawn.qc b/qcsrc/common/triggers/target/spawn.qc index 4eed8ef34..1464da955 100644 --- a/qcsrc/common/triggers/target/spawn.qc +++ b/qcsrc/common/triggers/target/spawn.qc @@ -55,7 +55,7 @@ void target_spawn_edit_entity(entity this, entity e, string msg, entity kt, enti data = stov(db_get(TemporaryDB, strcat("/target_spawn/field/", key))); if(data.y == 0) // undefined field, i.e., invalid type { - LOG_INFO("target_spawn: invalid/unknown entity key ", key, " specified, ignored!\n"); + LOG_INFO("target_spawn: invalid/unknown entity key ", key, " specified, ignored!"); continue; } } @@ -150,7 +150,7 @@ void target_spawn_edit_entity(entity this, entity e, string msg, entity kt, enti } else { - LOG_INFO("target_spawn: invalid/unknown variable replacement ", value, " specified, ignored!\n"); + LOG_INFO("target_spawn: invalid/unknown variable replacement ", value, " specified, ignored!"); continue; } @@ -163,13 +163,13 @@ void target_spawn_edit_entity(entity this, entity e, string msg, entity kt, enti { if(value != "") { - LOG_INFO("target_spawn: try to get a field of a non-entity, ignored!\n"); + LOG_INFO("target_spawn: try to get a field of a non-entity, ignored!"); continue; } data2 = stov(db_get(TemporaryDB, strcat("/target_spawn/field/", valuefield))); if(data2_y == 0) // undefined field, i.e., invalid type { - LOG_INFO("target_spawn: invalid/unknown entity key replacement ", valuefield, " specified, ignored!\n"); + LOG_INFO("target_spawn: invalid/unknown entity key replacement ", valuefield, " specified, ignored!"); continue; } value = getentityfieldstring(data2_x, valueent); @@ -189,7 +189,7 @@ void target_spawn_edit_entity(entity this, entity e, string msg, entity kt, enti value = vtos(stov(value) + stov(valueoffset)); break; default: - LOG_INFO("target_spawn: only string, float and vector fields can do calculations, calculation ignored!\n"); + LOG_INFO("target_spawn: only string, float and vector fields can do calculations, calculation ignored!"); break; } } @@ -206,7 +206,7 @@ void target_spawn_edit_entity(entity this, entity e, string msg, entity kt, enti value = vtos(stov(value) + random() * data2_x * '1 0 0' + random() * data2_y * '0 1 0' + random() * data2_z * '0 0 1'); break; default: - LOG_INFO("target_spawn: only float and vector fields can do random calculations, calculation ignored!\n"); + LOG_INFO("target_spawn: only float and vector fields can do random calculations, calculation ignored!"); break; } } diff --git a/qcsrc/common/triggers/teleporters.qc b/qcsrc/common/triggers/teleporters.qc index 451afa95b..8e9936b2e 100644 --- a/qcsrc/common/triggers/teleporters.qc +++ b/qcsrc/common/triggers/teleporters.qc @@ -206,7 +206,7 @@ entity Simple_TeleportPlayer(entity teleporter, entity player) #ifdef SVQC if(!e) { sprint(player, "Teleport destination vanished. Sorry... please complain to the mapper.\n"); } #elif defined(CSQC) - if(!e) { LOG_INFO("Teleport destination could not be found from CSQC.\n"); } + if(!e) { LOG_INFO("Teleport destination could not be found from CSQC."); } #endif makevectors(e.mangle); @@ -237,7 +237,7 @@ void teleport_findtarget(entity this) if(e.move_movetype == MOVETYPE_NONE) waypoint_spawnforteleporter(this, e.origin, 0); if(e.classname != "info_teleport_destination") - LOG_INFO("^3MAPPER ERROR: teleporter does target an invalid teleport destination entity. Angles will not work.\n"); + LOG_INFO("^3MAPPER ERROR: teleporter does target an invalid teleport destination entity. Angles will not work."); #endif } @@ -292,7 +292,7 @@ void WarpZone_PostTeleportPlayer_Callback(entity pl) #elif defined(CSQC) if(!(pl.flags & BIT(15))) // FL_PROJECTILE #endif - LOG_INFO("A non-projectile got through a warpzone and its owner cleared. It's a ", pl.classname, ".\n"); + LOG_INFO("A non-projectile got through a warpzone and its owner cleared. It's a ", pl.classname, "."); pl.owner = NULL; } if(IS_PLAYER(pl)) diff --git a/qcsrc/common/triggers/trigger/disablerelay.qc b/qcsrc/common/triggers/trigger/disablerelay.qc index 6154f6bf0..eee61c993 100644 --- a/qcsrc/common/triggers/trigger/disablerelay.qc +++ b/qcsrc/common/triggers/trigger/disablerelay.qc @@ -19,7 +19,7 @@ void trigger_disablerelay_use(entity this, entity actor, entity trigger) } if((!a) == (!b)) - LOG_INFO("Invalid use of trigger_disablerelay: ", ftos(a), " relays were on, ", ftos(b), " relays were off!\n"); + LOG_INFO("Invalid use of trigger_disablerelay: ", ftos(a), " relays were on, ", ftos(b), " relays were off!"); } spawnfunc(trigger_disablerelay) diff --git a/qcsrc/common/triggers/trigger/viewloc.qc b/qcsrc/common/triggers/trigger/viewloc.qc index a60026354..ffc04a078 100644 --- a/qcsrc/common/triggers/trigger/viewloc.qc +++ b/qcsrc/common/triggers/trigger/viewloc.qc @@ -72,7 +72,7 @@ void viewloc_init(entity this) break; } - if(!this.enemy) { LOG_INFO("^1FAIL!\n"); delete(this); return; } + if(!this.enemy) { LOG_INFO("^1FAIL!"); delete(this); return; } if(!this.goalentity) this.goalentity = this.enemy; // make them match so CSQC knows what to do @@ -86,7 +86,7 @@ void viewloc_init(entity this) spawnfunc(trigger_viewlocation) { // we won't check target2 here yet, as it may not even need to exist - if(this.target == "") { LOG_INFO("^1FAIL!\n"); delete(this); return; } + if(this.target == "") { LOG_INFO("^1FAIL!"); delete(this); return; } EXACTTRIGGER_INIT; InitializeEntity(this, viewloc_init, INITPRIO_FINDTARGET); diff --git a/qcsrc/common/turrets/all.qh b/qcsrc/common/turrets/all.qh index fc3d5a7bc..e63a931a6 100644 --- a/qcsrc/common/turrets/all.qh +++ b/qcsrc/common/turrets/all.qh @@ -48,7 +48,7 @@ GENERIC_COMMAND(dumpturrets, "Dump all turrets into turrets_dump.txt") LOG_INFOF("^1Error: ^7Could not open file '%s'!", filename); } #else - LOG_INFO(_("Turrets dump command only works with sv_cmd.\n")); + LOG_INFO(_("Turrets dump command only works with sv_cmd.")); #endif return; } @@ -57,9 +57,9 @@ GENERIC_COMMAND(dumpturrets, "Dump all turrets into turrets_dump.txt") case CMD_REQUEST_USAGE: { LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " dumpturrets [filename]"); - LOG_INFO(" Where 'filename' is the file to write (default is turrets_dump.cfg),\n"); - LOG_INFO(" if supplied with '-' output to console as well as default,\n"); - LOG_INFO(" if left blank, it will only write to default.\n"); + LOG_INFO(" Where 'filename' is the file to write (default is turrets_dump.cfg),"); + LOG_INFO(" if supplied with '-' output to console as well as default,"); + LOG_INFO(" if left blank, it will only write to default."); return; } } diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc index c545aaa88..deba86c28 100644 --- a/qcsrc/common/util.qc +++ b/qcsrc/common/util.qc @@ -1364,7 +1364,7 @@ void m_shutdown() { if(shutdown_running) { - LOG_INFO("Recursive shutdown detected! Only restoring cvars...\n"); + LOG_INFO("Recursive shutdown detected! Only restoring cvars..."); } else { diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index fb060df8a..afbf79eb5 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -643,8 +643,8 @@ CLIENT_COMMAND(weapon_find, "Show spawn locations of a weapon") } case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 cl_cmd weapon_find weapon\n"); - LOG_INFO(" Where 'weapon' is the lowercase weapon name, 'all' or 'unowned'.\n"); + LOG_INFO("Usage:^3 cl_cmd weapon_find weapon"); + LOG_INFO(" Where 'weapon' is the lowercase weapon name, 'all' or 'unowned'."); return; } } diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index bdd8c8d6f..beaa6cb48 100644 --- a/qcsrc/common/weapons/all.qh +++ b/qcsrc/common/weapons/all.qh @@ -74,7 +74,7 @@ GENERIC_COMMAND(dumpweapons, "Dump all weapons into weapons_dump.txt") // WEAPON LOG_INFOF("^1Error: ^7Could not open file '%s'!", filename); } #else - LOG_INFO(_("Weapons dump command only works with sv_cmd.\n")); + LOG_INFO(_("Weapons dump command only works with sv_cmd.")); #endif return; } @@ -83,9 +83,9 @@ GENERIC_COMMAND(dumpweapons, "Dump all weapons into weapons_dump.txt") // WEAPON case CMD_REQUEST_USAGE: { LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " dumpweapons [filename]"); - LOG_INFO(" Where 'filename' is the file to write (default is weapons_dump.cfg),\n"); - LOG_INFO(" if supplied with '-' output to console as well as default,\n"); - LOG_INFO(" if left blank, it will only write to default.\n"); + LOG_INFO(" Where 'filename' is the file to write (default is weapons_dump.cfg),"); + LOG_INFO(" if supplied with '-' output to console as well as default,"); + LOG_INFO(" if left blank, it will only write to default."); return; } } diff --git a/qcsrc/lib/csqcmodel/cl_player.qc b/qcsrc/lib/csqcmodel/cl_player.qc index faefdcad4..225c7307d 100644 --- a/qcsrc/lib/csqcmodel/cl_player.qc +++ b/qcsrc/lib/csqcmodel/cl_player.qc @@ -168,7 +168,7 @@ void CSQCPlayer_PredictTo(entity this, float endframe, bool apply_error) { csqcplayer_moveframe = clientcommandframe; getinputstate(csqcplayer_moveframe-1); - LOG_INFO("the Weird code path got hit\n"); + LOG_INFO("the Weird code path got hit"); return; } #endif diff --git a/qcsrc/lib/test.qc b/qcsrc/lib/test.qc index 3fbf7924c..86b0e6187 100644 --- a/qcsrc/lib/test.qc +++ b/qcsrc/lib/test.qc @@ -11,7 +11,7 @@ bool RUN_ALL_TESTS() } else { - LOG_INFO("All tests OK\n"); + LOG_INFO("All tests OK"); return false; } } diff --git a/qcsrc/lib/urllib.qc b/qcsrc/lib/urllib.qc index 3a206ca56..1572fec07 100644 --- a/qcsrc/lib/urllib.qc +++ b/qcsrc/lib/urllib.qc @@ -53,7 +53,7 @@ float url_URI_Get_Callback(int id, float status, string data) e.url_rbuf = buf_create(); if (e.url_rbuf < 0) { - LOG_INFO("url_URI_Get_Callback: out of memory in buf_create\n"); + LOG_INFO("url_URI_Get_Callback: out of memory in buf_create"); e.url_ready(e, e.url_ready_pass, URL_READY_ERROR); strunzone(e.url_url); delete(e); @@ -62,7 +62,7 @@ float url_URI_Get_Callback(int id, float status, string data) e.url_rbufpos = 0; if (e.url_rbuf < 0) { - LOG_INFO("url_URI_Get_Callback: out of memory in buf_create\n"); + LOG_INFO("url_URI_Get_Callback: out of memory in buf_create"); e.url_ready(e, e.url_ready_pass, URL_READY_ERROR); strunzone(e.url_url); delete(e); @@ -106,7 +106,7 @@ void url_single_fopen(string url, int mode, url_ready_func rdy, entity pass) e.url_wbuf = buf_create(); if (e.url_wbuf < 0) { - LOG_INFO("url_single_fopen: out of memory in buf_create\n"); + LOG_INFO("url_single_fopen: out of memory in buf_create"); rdy(e, pass, URL_READY_ERROR); strunzone(e.url_url); delete(e); @@ -131,7 +131,7 @@ void url_single_fopen(string url, int mode, url_ready_func rdy, entity pass) if (url_fromid[i] == NULL) break; if (i >= autocvar__urllib_nextslot) { - LOG_INFO("url_single_fopen: too many concurrent requests\n"); + LOG_INFO("url_single_fopen: too many concurrent requests"); rdy(NULL, pass, URL_READY_ERROR); return; } @@ -140,7 +140,7 @@ void url_single_fopen(string url, int mode, url_ready_func rdy, entity pass) // GET the data if (!crypto_uri_postbuf(url, i + MIN_URL_ID, string_null, string_null, -1, 0)) { - LOG_INFO("url_single_fopen: failure in crypto_uri_postbuf\n"); + LOG_INFO("url_single_fopen: failure in crypto_uri_postbuf"); rdy(NULL, pass, URL_READY_ERROR); return; } @@ -176,7 +176,7 @@ void url_single_fopen(string url, int mode, url_ready_func rdy, entity pass) rdy(e, pass, URL_READY_CANWRITE); break; case FILE_READ: - LOG_INFO("url_single_fopen: cannot open '-' for reading\n"); + LOG_INFO("url_single_fopen: cannot open '-' for reading"); rdy(NULL, pass, URL_READY_ERROR); break; } @@ -228,7 +228,7 @@ void url_fclose(entity e) if (url_fromid[i] == NULL) break; if (i >= autocvar__urllib_nextslot) { - LOG_INFO("url_fclose: too many concurrent requests\n"); + LOG_INFO("url_fclose: too many concurrent requests"); e.url_ready(e, e.url_ready_pass, URL_READY_ERROR); buf_del(e.url_wbuf); strunzone(e.url_url); @@ -240,7 +240,7 @@ void url_fclose(entity e) // POST the data if (!crypto_uri_postbuf(e.url_url, i + MIN_URL_ID, e.url_content_type, e.url_verb, e.url_wbuf, 0)) { - LOG_INFO("url_fclose: failure in crypto_uri_postbuf\n"); + LOG_INFO("url_fclose: failure in crypto_uri_postbuf"); e.url_ready(e, e.url_ready_pass, URL_READY_ERROR); buf_del(e.url_wbuf); strunzone(e.url_url); @@ -339,7 +339,7 @@ void url_multi_ready(entity fh, entity me, float status) { if (status == -422) // Unprocessable Entity { - LOG_INFO("uri_multi_ready: got HTTP error 422, data is in unusable format - not continuing\n"); + LOG_INFO("uri_multi_ready: got HTTP error 422, data is in unusable format - not continuing"); me.url_ready(fh, me.url_ready_pass, status); strunzone(me.url_url); delete(me); @@ -367,7 +367,7 @@ void url_multi_fopen(string url, int mode, url_ready_func rdy, entity pass) n = tokenize_console(url); if (n <= 0) { - LOG_INFO("url_multi_fopen: need at least one URL\n"); + LOG_INFO("url_multi_fopen: need at least one URL"); rdy(NULL, pass, URL_READY_ERROR); return; } diff --git a/qcsrc/lib/warpzone/server.qc b/qcsrc/lib/warpzone/server.qc index fa2478967..6db612235 100644 --- a/qcsrc/lib/warpzone/server.qc +++ b/qcsrc/lib/warpzone/server.qc @@ -114,7 +114,7 @@ float WarpZone_Teleport(entity wz, entity player, float f0, float f1) } else { - LOG_INFO("would have to put player in solid, won't do that\n"); + LOG_INFO("would have to put player in solid, won't do that"); setorigin(player, o0 - player.view_ofs); return 0; } @@ -348,13 +348,13 @@ float WarpZone_CheckProjectileImpact(entity player) return 0; #ifdef WARPZONELIB_REMOVEHACK - LOG_INFO("impactfilter found something - and it no longer gets handled correctly - please tell divVerent whether anything behaves broken now\n"); + LOG_INFO("impactfilter found something - and it no longer gets handled correctly - please tell divVerent whether anything behaves broken now"); #else - LOG_INFO("impactfilter found something - and it even gets handled correctly - please tell divVerent that this code apparently gets triggered again\n"); + LOG_INFO("impactfilter found something - and it even gets handled correctly - please tell divVerent that this code apparently gets triggered again"); #endif - LOG_INFO("Entity type: ", player.classname, "\n"); - LOG_INFO("Origin: ", vtos(player.origin), "\n"); - LOG_INFO("Velocity: ", vtos(player.velocity), "\n"); + LOG_INFO("Entity type: ", player.classname); + LOG_INFO("Origin: ", vtos(player.origin)); + LOG_INFO("Velocity: ", vtos(player.velocity)); #ifdef WARPZONELIB_REMOVEHACK return 0; @@ -583,7 +583,7 @@ void WarpZone_InitStep_UpdateTransform(entity this) point = point * (1 / (3 * area)); if(vdist(norm, <, 0.99)) { - LOG_INFO("trigger_warpzone near ", vtos(this.aiment.origin), " is nonplanar. BEWARE.\n"); + LOG_INFO("trigger_warpzone near ", vtos(this.aiment.origin), " is nonplanar. BEWARE."); area = 0; // no autofixing in this case } norm = normalize(norm); @@ -600,15 +600,15 @@ void WarpZone_InitStep_UpdateTransform(entity this) makevectors(ang); if(norm * v_forward < 0) { - LOG_INFO("Position target of trigger_warpzone near ", vtos(this.aiment.origin), " points into trigger_warpzone. BEWARE.\n"); + LOG_INFO("Position target of trigger_warpzone near ", vtos(this.aiment.origin), " points into trigger_warpzone. BEWARE."); norm = -1 * norm; } ang = vectoangles2(norm, v_up); // keep rotation, but turn exactly against plane ang.x = -ang.x; if(norm * v_forward < 0.99) - LOG_INFO("trigger_warpzone near ", vtos(this.aiment.origin), " has been turned to match plane orientation (", vtos(this.aiment.angles), " -> ", vtos(ang), "\n"); + LOG_INFO("trigger_warpzone near ", vtos(this.aiment.origin), " has been turned to match plane orientation (", vtos(this.aiment.angles), " -> ", vtos(ang)); if(vdist(org - this.aiment.origin, >, 0.5)) - LOG_INFO("trigger_warpzone near ", vtos(this.aiment.origin), " has been moved to match the plane (", vtos(this.aiment.origin), " -> ", vtos(org), ").\n"); + LOG_INFO("trigger_warpzone near ", vtos(this.aiment.origin), " has been moved to match the plane (", vtos(this.aiment.origin), " -> ", vtos(org), ")."); } } else if(area > 0) diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc index 4b2046faf..18e5ae081 100644 --- a/qcsrc/menu/command/menu_cmd.qc +++ b/qcsrc/menu/command/menu_cmd.qc @@ -45,11 +45,11 @@ void GameCommand(string theCommand) if (argv(0) == "help" || argc == 0) { - LOG_INFO(_("Usage: menu_cmd command..., where possible commands are:\n")); - LOG_INFO(_(" sync - reloads all cvars on the current menu page\n")); - LOG_INFO(_(" directmenu ITEM - select a menu item as main item\n")); + LOG_INFO(_("Usage: menu_cmd command..., where possible commands are:")); + LOG_INFO(_(" sync - reloads all cvars on the current menu page")); + LOG_INFO(_(" directmenu ITEM - select a menu item as main item")); - LOG_INFO("Generic commands shared by all programs:\n"); + LOG_INFO("Generic commands shared by all programs:"); GenericCommand_macro_help(); return; @@ -76,7 +76,7 @@ void GameCommand(string theCommand) if (argc == 1) { - LOG_INFO(_("Available options:\n")); + LOG_INFO(_("Available options:")); FOREACH_ENTITY_ORDERED(it.name != "", { if (it.classname == "vtbl") continue; @@ -125,5 +125,5 @@ void GameCommand(string theCommand) if(MUTATOR_CALLHOOK(Menu_ConsoleCommand, ss, argc, theCommand)) // handled by a mutator return; - LOG_INFO(_("Invalid command. For a list of supported commands, try menu_cmd help.\n")); + LOG_INFO(_("Invalid command. For a list of supported commands, try menu_cmd help.")); } diff --git a/qcsrc/menu/xonotic/maplist.qc b/qcsrc/menu/xonotic/maplist.qc index 8feee96ed..111744e96 100644 --- a/qcsrc/menu/xonotic/maplist.qc +++ b/qcsrc/menu/xonotic/maplist.qc @@ -288,7 +288,7 @@ void MapList_LoadMap(entity btn, entity me) m = MapInfo_BSPName_ByID(i); if (!m) { - LOG_INFO(_("Huh? Can't play this (m is NULL). Refiltering so this won't happen again.\n")); + LOG_INFO(_("Huh? Can't play this (m is NULL). Refiltering so this won't happen again.")); me.refilter(me); return; } @@ -301,7 +301,7 @@ void MapList_LoadMap(entity btn, entity me) } else { - LOG_INFO(_("Huh? Can't play this (invalid game type). Refiltering so this won't happen again.\n")); + LOG_INFO(_("Huh? Can't play this (invalid game type). Refiltering so this won't happen again.")); me.refilter(me); return; } diff --git a/qcsrc/menu/xonotic/skinlist.qc b/qcsrc/menu/xonotic/skinlist.qc index 6e3f8a033..e72ca12e2 100644 --- a/qcsrc/menu/xonotic/skinlist.qc +++ b/qcsrc/menu/xonotic/skinlist.qc @@ -76,7 +76,7 @@ void XonoticSkinList_getSkins(entity me) fh = fopen(s, FILE_READ); if(fh < 0) { - LOG_INFO("Warning: can't open skinvalues.txt file\n"); + LOG_INFO("Warning: can't open skinvalues.txt file"); continue; } while((s = fgets(fh))) diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc index 03a4073df..7b381b544 100644 --- a/qcsrc/menu/xonotic/util.qc +++ b/qcsrc/menu/xonotic/util.qc @@ -659,7 +659,7 @@ float updateCompression() cvar_set("gl_texturecompression", "1"); cvar_set("r_texture_dds_load", "1"); if(!can_dds) - LOG_INFO(_("^1ERROR: Texture compression is required but not supported.\n^1Expect visual problems.\n")); + LOG_INFO(_("^1ERROR: Texture compression is required but not supported.\n^1Expect visual problems.")); return 0; } else diff --git a/qcsrc/server/bot/default/scripting.qc b/qcsrc/server/bot/default/scripting.qc index 27fb0a234..e69050beb 100644 --- a/qcsrc/server/bot/default/scripting.qc +++ b/qcsrc/server/bot/default/scripting.qc @@ -132,7 +132,7 @@ entity bot_getplace(entity this, string placename) } e = find(NULL, targetname, s); if(!e) - LOG_INFO("invalid place ", s, "\n"); + LOG_INFO("invalid place ", s); if(i < MAX_BOT_PLACES) { this.(bot_placenames[i]) = strzone(placename); @@ -145,7 +145,7 @@ entity bot_getplace(entity this, string placename) { e = find(NULL, targetname, placename); if(!e) - LOG_INFO("invalid place ", placename, "\n"); + LOG_INFO("invalid place ", placename); return e; } } @@ -294,7 +294,7 @@ float bot_decodecommand(string cmdstring) if(cmd_parm_type!=BOT_CMD_PARAMETER_NONE&&parm=="") { - LOG_INFO("ERROR: A parameter is required for this command\n"); + LOG_INFO("ERROR: A parameter is required for this command"); return 0; } @@ -325,7 +325,7 @@ float bot_decodecommand(string cmdstring) } return 1; } - LOG_INFO("ERROR: No such command '", cmdstring, "'\n"); + LOG_INFO("ERROR: No such command '", cmdstring, "'"); return 0; } @@ -427,7 +427,7 @@ void bot_cmdhelp(string scmd) LOG_INFO(prelude, "Points the aim to given target"); break; case BOT_CMD_PRESSKEY: - LOG_INFO(prelude, "Press one of the following keys: forward, backward, left, right, jump, crouch, attack1, attack2, use\n"); + LOG_INFO(prelude, "Press one of the following keys: forward, backward, left, right, jump, crouch, attack1, attack2, use"); LOG_INFO("Multiple keys can be pressed at time (with many presskey calls) and it will remain pressed until the command \"releasekey\" is called"); LOG_INFO("Note: The script will not return the control to the bot ai until all keys are released"); break; @@ -1082,7 +1082,7 @@ float bot_cmd_debug_assert_canfire(entity this) if(f) { this.colormod = '0 8 8'; - LOG_INFO("Bot ", this.netname, " using ", this.(weaponentity).weaponname, " wants to fire, inhibited by weaponentity state\n"); + LOG_INFO("Bot ", this.netname, " using ", this.(weaponentity).weaponname, " wants to fire, inhibited by weaponentity state"); } } else if(ATTACK_FINISHED(this, slot) > time) @@ -1090,7 +1090,7 @@ float bot_cmd_debug_assert_canfire(entity this) if(f) { this.colormod = '8 0 8'; - LOG_INFO("Bot ", this.netname, " using ", this.(weaponentity).weaponname, " wants to fire, inhibited by ATTACK_FINISHED (", ftos(ATTACK_FINISHED(this, slot) - time), " seconds left)\n"); + LOG_INFO("Bot ", this.netname, " using ", this.(weaponentity).weaponname, " wants to fire, inhibited by ATTACK_FINISHED (", ftos(ATTACK_FINISHED(this, slot) - time), " seconds left)"); } } else if(this.(weaponentity).tuba_note) @@ -1098,7 +1098,7 @@ float bot_cmd_debug_assert_canfire(entity this) if(f) { this.colormod = '8 0 0'; - LOG_INFO("Bot ", this.netname, " using ", this.(weaponentity).weaponname, " wants to fire, bot still has an active tuba note\n"); + LOG_INFO("Bot ", this.netname, " using ", this.(weaponentity).weaponname, " wants to fire, bot still has an active tuba note"); } } else @@ -1106,7 +1106,7 @@ float bot_cmd_debug_assert_canfire(entity this) if(!f) { this.colormod = '8 8 0'; - LOG_INFO("Bot ", this.netname, " using ", this.(weaponentity).weaponname, " thinks it has fired, but apparently did not; ATTACK_FINISHED says ", ftos(ATTACK_FINISHED(this, slot) - time), " seconds left\n"); + LOG_INFO("Bot ", this.netname, " using ", this.(weaponentity).weaponname, " thinks it has fired, but apparently did not; ATTACK_FINISHED says ", ftos(ATTACK_FINISHED(this, slot) - time), " seconds left"); } } @@ -1203,7 +1203,7 @@ float bot_execute_commands_once(entity this) if(bot_cmd.bot_cmd_type!=BOT_CMD_NULL) { bot_command_executed(this, true); - LOG_INFO("WARNING: Commands are ignored while the bot is paused. Use the command 'continue' instead.\n"); + LOG_INFO("WARNING: Commands are ignored while the bot is paused. Use the command 'continue' instead."); } return 1; } diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc index 2066e7154..b1ff75db7 100644 --- a/qcsrc/server/bot/default/waypoints.qc +++ b/qcsrc/server/bot/default/waypoints.qc @@ -76,7 +76,7 @@ entity waypoint_spawn(vector m1, vector m2, float f) { if(autocvar_developer) { - LOG_INFO("A generated waypoint is stuck in solid at ", vtos(w.origin), "\n"); + LOG_INFO("A generated waypoint is stuck in solid at ", vtos(w.origin)); backtrace("Waypoint stuck"); } } @@ -518,7 +518,7 @@ void waypoint_load_or_remove_links_hardwired(bool removal_mode) if(!found) { if(!removal_mode) - LOG_INFO("NOTICE: Can not find waypoint at ", vtos(wp_from_pos), ". Path skipped\n"); + LOG_INFO("NOTICE: Can not find waypoint at ", vtos(wp_from_pos), ". Path skipped"); continue; } } @@ -540,7 +540,7 @@ void waypoint_load_or_remove_links_hardwired(bool removal_mode) if(!found) { if(!removal_mode) - LOG_INFO("NOTICE: Can not find waypoint at ", vtos(wp_to_pos), ". Path skipped\n"); + LOG_INFO("NOTICE: Can not find waypoint at ", vtos(wp_to_pos), ". Path skipped"); continue; } @@ -952,7 +952,7 @@ float botframe_autowaypoints_fix_from(entity p, float walkfromwp, entity wp, .en }); if(bestdist < maxdist) { - LOG_INFO("update chain to new nearest WP ", etos(p.(fld)), "\n"); + LOG_INFO("update chain to new nearest WP ", etos(p.(fld))); return 0; } @@ -1031,7 +1031,7 @@ float botframe_autowaypoints_fix_from(entity p, float walkfromwp, entity wp, .en tmax = t; } - LOG_INFO("spawning a waypoint for connecting to ", etos(wp), "\n"); + LOG_INFO("spawning a waypoint for connecting to ", etos(wp)); botframe_autowaypoints_createwp(o, p, fld, 0); return 1; } @@ -1047,7 +1047,7 @@ void botframe_autowaypoints_fix(entity p, float walkfromwp, .entity fld) if(r != -1) return; - LOG_INFO("emergency: got no good nearby WP to build a link from, starting a new chain\n"); + LOG_INFO("emergency: got no good nearby WP to build a link from, starting a new chain"); if(!botframe_autowaypoints_fixdown(p.origin)) return; // shouldn't happen, caught above botframe_autowaypoints_createwp(trace_endpos, p, fld, WAYPOINTFLAG_PROTECTED); diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc index ec8990de2..e80769cc2 100644 --- a/qcsrc/server/campaign.qc +++ b/qcsrc/server/campaign.qc @@ -25,7 +25,7 @@ float CampaignBailout(string s) cvar_string = cvar_string_normal; cvar_set = cvar_set_normal; cvar_set("g_campaign", "0"); - LOG_INFO("^4campaign initialization failed: ", s, "\n"); + LOG_INFO("^4campaign initialization failed: ", s); if(autocvar__campaign_testrun) error("CAMPAIGN FAIL AHAHAHAHAHAHAHAHAH))"); return 1; diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc index ee1e76760..3233a141d 100644 --- a/qcsrc/server/cheats.qc +++ b/qcsrc/server/cheats.qc @@ -282,7 +282,7 @@ float CheatImpulse(entity this, int imp) RadiusDamage(e2, this, 1000, 0, 128, NULL, NULL, 500, DEATH_CHEAT.m_id, e); delete(e2); - LOG_INFO("404 Sportsmanship not found.\n"); + LOG_INFO("404 Sportsmanship not found."); DID_CHEAT(); break; } diff --git a/qcsrc/server/command/banning.qc b/qcsrc/server/command/banning.qc index 55a5749e2..da495f796 100644 --- a/qcsrc/server/command/banning.qc +++ b/qcsrc/server/command/banning.qc @@ -41,14 +41,14 @@ void BanCommand_ban(float request, float argc, string command) } default: - LOG_INFO("Incorrect parameters for ^2ban^7\n"); + LOG_INFO("Incorrect parameters for ^2ban^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd ban address [bantime] [reason]\n"); - LOG_INFO(" 'address' is the IP address or range of the player to ban,\n"); - LOG_INFO(" 'bantime' is the amount of time that the ban is active (default if not provided),\n"); - LOG_INFO(" and 'reason' is the string to label the ban with as reason for banning.\n"); - LOG_INFO("See also: ^2banlist, kickban, unban^7\n"); + LOG_INFO("Usage:^3 sv_cmd ban address [bantime] [reason]"); + LOG_INFO(" 'address' is the IP address or range of the player to ban,"); + LOG_INFO(" 'bantime' is the amount of time that the ban is active (default if not provided),"); + LOG_INFO(" and 'reason' is the string to label the ban with as reason for banning."); + LOG_INFO("See also: ^2banlist, kickban, unban^7"); return; } } @@ -67,9 +67,9 @@ void BanCommand_banlist(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd banlist\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2ban, kickban, unban^7\n"); + LOG_INFO("Usage:^3 sv_cmd banlist"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2ban, kickban, unban^7"); return; } } @@ -102,21 +102,21 @@ void BanCommand_kickban(float request, float argc, string command) } else { - LOG_INFO("kickban: ", GetClientErrorString(accepted, argv(1)), ".\n"); + LOG_INFO("kickban: ", GetClientErrorString(accepted, argv(1)), "."); } } } default: - LOG_INFO("Incorrect parameters for ^2kickban^7\n"); + LOG_INFO("Incorrect parameters for ^2kickban^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd kickban client [bantime] [masksize] [reason]\n"); - LOG_INFO(" 'client' is the entity number or name of the player to ban,\n"); - LOG_INFO(" 'bantime' is the amount of time that the ban is active (default if not provided),\n"); - LOG_INFO(" 'masksize' is the range of the IP address (1-thru-4, default if not provided),\n"); - LOG_INFO(" and 'reason' is the string to label the ban with as reason for banning.\n"); - LOG_INFO("See also: ^2ban, banlist, unban^7\n"); + LOG_INFO("Usage:^3 sv_cmd kickban client [bantime] [masksize] [reason]"); + LOG_INFO(" 'client' is the entity number or name of the player to ban,"); + LOG_INFO(" 'bantime' is the amount of time that the ban is active (default if not provided),"); + LOG_INFO(" 'masksize' is the range of the IP address (1-thru-4, default if not provided),"); + LOG_INFO(" and 'reason' is the string to label the ban with as reason for banning."); + LOG_INFO("See also: ^2ban, banlist, unban^7"); return; } } @@ -140,18 +140,18 @@ void BanCommand_mute(float request, float argc, string command) // TODO: Add a } else { - LOG_INFO("mute: ", GetClientErrorString(accepted, argv(1)), ".\n"); + LOG_INFO("mute: ", GetClientErrorString(accepted, argv(1)), "."); } } } default: - LOG_INFO("Incorrect parameters for ^2mute^7\n"); + LOG_INFO("Incorrect parameters for ^2mute^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd mute client\n"); - LOG_INFO(" 'client' is the entity number or name of the player to mute.\n"); - LOG_INFO("See also: ^2unmute^7\n"); + LOG_INFO("Usage:^3 sv_cmd mute client"); + LOG_INFO(" 'client' is the entity number or name of the player to mute."); + LOG_INFO("See also: ^2unmute^7"); return; } } @@ -195,9 +195,9 @@ void BanCommand_unban(float request, float argc) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd unban banid\n"); - LOG_INFO(" Where 'banid' is the ID of the ban of which to remove.\n"); - LOG_INFO("See also: ^2ban, banlist, kickban^7\n"); + LOG_INFO("Usage:^3 sv_cmd unban banid"); + LOG_INFO(" Where 'banid' is the ID of the ban of which to remove."); + LOG_INFO("See also: ^2ban, banlist, kickban^7"); return; } } @@ -221,18 +221,18 @@ void BanCommand_unmute(float request, float argc) } else { - LOG_INFO("unmute: ", GetClientErrorString(accepted, argv(1)), ".\n"); + LOG_INFO("unmute: ", GetClientErrorString(accepted, argv(1)), "."); } } } default: - LOG_INFO("Incorrect parameters for ^2mute^7\n"); + LOG_INFO("Incorrect parameters for ^2mute^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd unmute client\n"); - LOG_INFO(" 'client' is the entity number or name of the player to unmute.\n"); - LOG_INFO("See also: ^2mute^7\n"); + LOG_INFO("Usage:^3 sv_cmd unmute client"); + LOG_INFO(" 'client' is the entity number or name of the player to unmute."); + LOG_INFO("See also: ^2mute^7"); return; } } @@ -279,7 +279,7 @@ void BanCommand_(float request) void BanCommand_macro_help() { #define BAN_COMMAND(name, function, description) \ - { if (strtolower(description) != "") { LOG_INFO(" ^2", name, "^7: ", description, "\n"); } } + { if (strtolower(description) != "") { LOG_INFO(" ^2", name, "^7: ", description); } } BAN_COMMANDS(0, 0, ""); #undef BAN_COMMAND diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc index a04274ed2..6c31af72c 100644 --- a/qcsrc/server/command/radarmap.qc +++ b/qcsrc/server/command/radarmap.qc @@ -230,7 +230,7 @@ void RadarMap_Think(entity this) this.maxs_x = (mi_picmax.x - mi_picmin.x) / this.size.x; this.maxs_y = (mi_picmax.y - mi_picmin.y) / this.size.y; this.maxs_z = mi_max.z - mi_min.z; - LOG_INFO("Picture mins/maxs: ", ftos(this.maxs.x), " and ", ftos(this.maxs.y), " should match\n"); + LOG_INFO("Picture mins/maxs: ", ftos(this.maxs.x), " and ", ftos(this.maxs.y), " should match"); this.netname = strzone(strcat("gfx/", mi_shortname, "_radar.xpm")); if (!(this.count & 1)) { @@ -245,7 +245,7 @@ void RadarMap_Think(entity this) { fclose(this.cnt); - LOG_INFO(this.netname, " already exists, aborting (you may want to specify --force)\n"); + LOG_INFO(this.netname, " already exists, aborting (you may want to specify --force)"); RadarMap_Next(); return; } @@ -253,12 +253,12 @@ void RadarMap_Think(entity this) this.cnt = fopen(this.netname, FILE_WRITE); if (this.cnt < 0) { - LOG_INFO("Error writing ", this.netname, "\n"); + LOG_INFO("Error writing ", this.netname); delete(this); radarmapper = NULL; return; } - LOG_INFO("Writing to ", this.netname, "...\n"); + LOG_INFO("Writing to ", this.netname, "..."); fputs(this.cnt, "/* XPM */\n"); fputs(this.cnt, "static char *RadarMap[] = {\n"); fputs(this.cnt, "/* columns rows colors chars-per-pixel */\n"); @@ -328,7 +328,7 @@ void RadarMap_Think(entity this) else { fputs(this.cnt, "\",\n"); - LOG_INFO(ftos(this.size.y - this.frame), " lines left\n"); + LOG_INFO(ftos(this.size.y - this.frame), " lines left"); } } @@ -350,7 +350,7 @@ void RadarMap_Think(entity this) else { fputs(this.cnt, "\",\n"); - LOG_INFO(ftos(this.size.y - this.frame), " lines left\n"); + LOG_INFO(ftos(this.size.y - this.frame), " lines left"); } } @@ -362,7 +362,7 @@ void RadarMap_Think(entity this) // close the file fputs(this.cnt, "};\n"); fclose(this.cnt); - LOG_INFO("Finished. Please edit data/", this.netname, " with an image editing application and place it in the TGA format in the gfx folder.\n"); + LOG_INFO("Finished. Please edit data/", this.netname, " with an image editing application and place it in the TGA format in the gfx folder."); RadarMap_Next(); } } @@ -448,7 +448,7 @@ bool RadarMap_Make(float argc) if (radarmapper) // after doing the arguments, see if we successfully went forward. { - LOG_INFO("Radarmap entity spawned.\n"); + LOG_INFO("Radarmap entity spawned."); return true; // if so, don't print usage. } } diff --git a/qcsrc/server/command/radarmap.qh b/qcsrc/server/command/radarmap.qh index 520884b32..ffa82e5c0 100644 --- a/qcsrc/server/command/radarmap.qh +++ b/qcsrc/server/command/radarmap.qh @@ -1,6 +1,6 @@ #pragma once #ifndef RADARMAP -bool RadarMap_Make(float argc) { LOG_INFO("radarmap is disabled, compile with -DRADARMAP to enable it.\n"); return true; } +bool RadarMap_Make(float argc) { LOG_INFO("radarmap is disabled, compile with -DRADARMAP to enable it."); return true; } #else // =========================================== diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index 35a3c73aa..2bb0f1365 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -43,7 +43,7 @@ void make_mapinfo_Think(entity this) { if (_MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, 0, 1)) { - LOG_INFO("Done rebuiling mapinfos.\n"); + LOG_INFO("Done rebuiling mapinfos."); MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0); delete(this); } @@ -125,7 +125,7 @@ void GameCommand_adminmsg(float request, float argc) if (accepted <= 0) { - LOG_INFO("adminmsg: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : ".\n")); + LOG_INFO("adminmsg: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : ".")); continue; } @@ -146,22 +146,22 @@ void GameCommand_adminmsg(float request, float argc) } if (successful) bprint("Successfully sent message '", admin_message, "' to ", successful, ".\n"); - else LOG_INFO("No players given (", original_targets, ") could receive the message.\n"); + else LOG_INFO("No players given (", original_targets, ") could receive the message."); return; } } default: - LOG_INFO("Incorrect parameters for ^2adminmsg^7\n"); + LOG_INFO("Incorrect parameters for ^2adminmsg^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd adminmsg clients \"message\" [infobartime]\n"); - LOG_INFO(" 'clients' is a list (separated by commas) of player entity ID's or nicknames\n"); - LOG_INFO(" If infobartime is provided, the message will be sent to infobar.\n"); - LOG_INFO(" Otherwise, it will just be sent as a centerprint message.\n"); - LOG_INFO("Examples: adminmsg 2,4 \"this infomessage will last for ten seconds\" 10\n"); - LOG_INFO(" adminmsg 2,5 \"this message will be a centerprint\"\n"); + LOG_INFO("Usage:^3 sv_cmd adminmsg clients \"message\" [infobartime]"); + LOG_INFO(" 'clients' is a list (separated by commas) of player entity ID's or nicknames"); + LOG_INFO(" If infobartime is provided, the message will be sent to infobar."); + LOG_INFO(" Otherwise, it will just be sent as a centerprint message."); + LOG_INFO("Examples: adminmsg 2,4 \"this infomessage will last for ten seconds\" 10"); + LOG_INFO(" adminmsg 2,5 \"this message will be a centerprint\""); return; } } @@ -180,8 +180,8 @@ void GameCommand_allready(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd allready\n"); - LOG_INFO(" No arguments required.\n"); + LOG_INFO("Usage:^3 sv_cmd allready"); + LOG_INFO(" No arguments required."); return; } } @@ -201,16 +201,16 @@ void GameCommand_allspec(float request, float argc) ++n; }); if (n) bprint(strcat("Successfully forced all (", ftos(n), ") players to spectate", (reason ? strcat(" for reason: '", reason, "'") : ""), ".\n")); - else LOG_INFO("No players found to spectate.\n"); + else LOG_INFO("No players found to spectate."); return; } default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd allspec [reason]\n"); - LOG_INFO(" Where 'reason' is an optional argument for explanation of allspec command.\n"); - LOG_INFO("See also: ^2moveplayer, shuffleteams^7\n"); + LOG_INFO("Usage:^3 sv_cmd allspec [reason]"); + LOG_INFO(" Where 'reason' is an optional argument for explanation of allspec command."); + LOG_INFO("See also: ^2moveplayer, shuffleteams^7"); return; } } @@ -232,16 +232,16 @@ void GameCommand_anticheat(float request, float argc) } else { - LOG_INFO("anticheat: ", GetClientErrorString(accepted, argv(1)), ".\n"); + LOG_INFO("anticheat: ", GetClientErrorString(accepted, argv(1)), "."); } } default: - LOG_INFO("Incorrect parameters for ^2anticheat^7\n"); + LOG_INFO("Incorrect parameters for ^2anticheat^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd anticheat client\n"); - LOG_INFO(" 'client' is the entity number or name of the player.\n"); + LOG_INFO("Usage:^3 sv_cmd anticheat client"); + LOG_INFO(" 'client' is the entity number or name of the player."); return; } } @@ -312,9 +312,9 @@ void GameCommand_bbox(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd bbox\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2gettaginfo, trace^7\n"); + LOG_INFO("Usage:^3 sv_cmd bbox"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2gettaginfo, trace^7"); return; } } @@ -340,7 +340,7 @@ void GameCommand_bot_cmd(float request, float argc, string command) cvar_settemp("bot_number", "0"); bot_fixcount(); cvar_settemp("bot_number", argv(2)); - if (!bot_fixcount()) LOG_INFO("Sorry, could not set requested bot count\n"); + if (!bot_fixcount()) LOG_INFO("Sorry, could not set requested bot count"); return; } else if (argv(1) == "load" && argc == 3) @@ -350,7 +350,7 @@ void GameCommand_bot_cmd(float request, float argc, string command) fh = fopen(argv(2), FILE_READ); if (fh < 0) { - LOG_INFO("cannot open the file\n"); + LOG_INFO("cannot open the file"); return; } @@ -372,7 +372,7 @@ void GameCommand_bot_cmd(float request, float argc, string command) cvar_settemp("bot_number", "0"); bot_fixcount(); cvar_settemp("bot_number", argv(3)); - if (!bot_fixcount()) LOG_INFO("Sorry, could not set requested bot count\n"); + if (!bot_fixcount()) LOG_INFO("Sorry, could not set requested bot count"); } else { @@ -395,7 +395,7 @@ void GameCommand_bot_cmd(float request, float argc, string command) ++i; } - LOG_INFO(ftos(i), " commands read\n"); + LOG_INFO(ftos(i), " commands read"); fclose(fh); return; } @@ -415,7 +415,7 @@ void GameCommand_bot_cmd(float request, float argc, string command) bot_num++; }); if(bot_num) - LOG_INFO("Command '", substring(command, argv_start_index(2), -1), "' sent to all bots (", ftos(bot_num), ")\n"); + LOG_INFO("Command '", substring(command, argv_start_index(2), -1), "' sent to all bots (", ftos(bot_num), ")"); return; } else @@ -424,29 +424,29 @@ void GameCommand_bot_cmd(float request, float argc, string command) if (bot == NULL) bot = find_bot_by_name(argv(1)); if (bot) { - LOG_INFO("Command '", substring(command, argv_start_index(2), -1), "' sent to bot ", bot.netname, "\n"); + LOG_INFO("Command '", substring(command, argv_start_index(2), -1), "' sent to bot ", bot.netname); bot_queuecommand(bot, substring(command, argv_start_index(2), -1)); return; } else { - LOG_INFO("Error: Can't find bot with the name or id '", argv(1), "' - Did you mistype the command?\n"); // don't return so that usage is shown + LOG_INFO("Error: Can't find bot with the name or id '", argv(1), "' - Did you mistype the command?"); // don't return so that usage is shown } } } } default: - LOG_INFO("Incorrect parameters for ^2bot_cmd^7\n"); + LOG_INFO("Incorrect parameters for ^2bot_cmd^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd bot_cmd client command [argument]\n"); - LOG_INFO(" 'client' can be either the name of the bot or a progressive number (not the entity number!)\n"); - LOG_INFO(" can also be '*' or 'all' to allow sending the command to all the bots\n"); - LOG_INFO(" For full list of commands, see bot_cmd help [command].\n"); - LOG_INFO("Examples: sv_cmd bot_cmd 1 cc \"say something\"\n"); - LOG_INFO(" sv_cmd bot_cmd 1 presskey jump\n"); - LOG_INFO(" sv_cmd bot_cmd * pause\n"); + LOG_INFO("Usage:^3 sv_cmd bot_cmd client command [argument]"); + LOG_INFO(" 'client' can be either the name of the bot or a progressive number (not the entity number!)"); + LOG_INFO(" can also be '*' or 'all' to allow sending the command to all the bots"); + LOG_INFO(" For full list of commands, see bot_cmd help [command]."); + LOG_INFO("Examples: sv_cmd bot_cmd 1 cc \"say something\""); + LOG_INFO(" sv_cmd bot_cmd 1 presskey jump"); + LOG_INFO(" sv_cmd bot_cmd * pause"); return; } } @@ -469,8 +469,8 @@ void GameCommand_cointoss(float request, float argc) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd cointoss [result1 result2]\n"); - LOG_INFO(" Where 'result1' and 'result2' are user created options.\n"); + LOG_INFO("Usage:^3 sv_cmd cointoss [result1 result2]"); + LOG_INFO(" Where 'result1' and 'result2' are user created options."); return; } } @@ -487,33 +487,33 @@ void GameCommand_database(float request, float argc) if (argv(1) == "save") { db_save(ServerProgsDB, argv(2)); - LOG_INFO("Copied serverprogs database to '", argv(2), "' in the data directory.\n"); + LOG_INFO("Copied serverprogs database to '", argv(2), "' in the data directory."); return; } else if (argv(1) == "dump") { db_dump(ServerProgsDB, argv(2)); - LOG_INFO("DB dumped.\n"); // wtf does this do? + LOG_INFO("DB dumped."); // wtf does this do? return; } else if (argv(1) == "load") { db_close(ServerProgsDB); ServerProgsDB = db_load(argv(2)); - LOG_INFO("Loaded '", argv(2), "' as new serverprogs database.\n"); + LOG_INFO("Loaded '", argv(2), "' as new serverprogs database."); return; } } } default: - LOG_INFO("Incorrect parameters for ^2database^7\n"); + LOG_INFO("Incorrect parameters for ^2database^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd database action filename\n"); - LOG_INFO(" Where 'action' is the command to complete,\n"); - LOG_INFO(" and 'filename' is what it acts upon.\n"); - LOG_INFO(" Full list of commands here: \"save, dump, load.\"\n"); + LOG_INFO("Usage:^3 sv_cmd database action filename"); + LOG_INFO(" Where 'action' is the command to complete,"); + LOG_INFO(" and 'filename' is what it acts upon."); + LOG_INFO(" Full list of commands here: \"save, dump, load.\""); return; } } @@ -536,21 +536,21 @@ void GameCommand_defer_clear(float request, float argc) if (accepted > 0) { stuffcmd(client, "defer clear\n"); - LOG_INFO("defer clear stuffed to ", playername(client, false), "\n"); + LOG_INFO("defer clear stuffed to ", playername(client, false)); } - else { LOG_INFO("defer_clear: ", GetClientErrorString(accepted, argv(1)), ".\n"); } + else { LOG_INFO("defer_clear: ", GetClientErrorString(accepted, argv(1)), "."); } return; } } default: - LOG_INFO("Incorrect parameters for ^2defer_clear^7\n"); + LOG_INFO("Incorrect parameters for ^2defer_clear^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd defer_clear client\n"); - LOG_INFO(" 'client' is the entity number or name of the player.\n"); - LOG_INFO("See also: ^2defer_clear_all^7\n"); + LOG_INFO("Usage:^3 sv_cmd defer_clear client"); + LOG_INFO(" 'client' is the entity number or name of the player."); + LOG_INFO("See also: ^2defer_clear_all^7"); return; } } @@ -570,16 +570,16 @@ void GameCommand_defer_clear_all(float request) GameCommand_defer_clear(CMD_REQUEST_COMMAND, argc); ++n; }); - if (n) LOG_INFO("Successfully stuffed defer clear to all clients (", ftos(n), ")\n"); // should a message be added if no players were found? + if (n) LOG_INFO("Successfully stuffed defer clear to all clients (", ftos(n), ")"); // should a message be added if no players were found? return; } default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd defer_clear_all\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2defer_clear^7\n"); + LOG_INFO("Usage:^3 sv_cmd defer_clear_all"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2defer_clear^7"); return; } } @@ -600,13 +600,13 @@ void GameCommand_delrec(float request, float argc) // perhaps merge later with } default: - LOG_INFO("Incorrect parameters for ^2delrec^7\n"); + LOG_INFO("Incorrect parameters for ^2delrec^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd delrec ranking [map]\n"); - LOG_INFO(" 'ranking' is which ranking level to clear up to, \n"); - LOG_INFO(" it will clear all records up to nth place.\n"); - LOG_INFO(" if 'map' is not provided it will use current map.\n"); + LOG_INFO("Usage:^3 sv_cmd delrec ranking [map]"); + LOG_INFO(" 'ranking' is which ranking level to clear up to, "); + LOG_INFO(" it will clear all records up to nth place."); + LOG_INFO(" if 'map' is not provided it will use current map."); return; } } @@ -622,79 +622,79 @@ void GameCommand_effectindexdump(float request) string s; d = db_create(); - LOG_INFO("begin of effects list\n"); + LOG_INFO("begin of effects list"); db_put(d, "TE_GUNSHOT", "1"); - LOG_INFO("effect TE_GUNSHOT is ", ftos(_particleeffectnum("TE_GUNSHOT")), "\n"); + LOG_INFO("effect TE_GUNSHOT is ", ftos(_particleeffectnum("TE_GUNSHOT"))); db_put(d, "TE_GUNSHOTQUAD", "1"); - LOG_INFO("effect TE_GUNSHOTQUAD is ", ftos(_particleeffectnum("TE_GUNSHOTQUAD")), "\n"); + LOG_INFO("effect TE_GUNSHOTQUAD is ", ftos(_particleeffectnum("TE_GUNSHOTQUAD"))); db_put(d, "TE_SPIKE", "1"); - LOG_INFO("effect TE_SPIKE is ", ftos(_particleeffectnum("TE_SPIKE")), "\n"); + LOG_INFO("effect TE_SPIKE is ", ftos(_particleeffectnum("TE_SPIKE"))); db_put(d, "TE_SPIKEQUAD", "1"); - LOG_INFO("effect TE_SPIKEQUAD is ", ftos(_particleeffectnum("TE_SPIKEQUAD")), "\n"); + LOG_INFO("effect TE_SPIKEQUAD is ", ftos(_particleeffectnum("TE_SPIKEQUAD"))); db_put(d, "TE_SUPERSPIKE", "1"); - LOG_INFO("effect TE_SUPERSPIKE is ", ftos(_particleeffectnum("TE_SUPERSPIKE")), "\n"); + LOG_INFO("effect TE_SUPERSPIKE is ", ftos(_particleeffectnum("TE_SUPERSPIKE"))); db_put(d, "TE_SUPERSPIKEQUAD", "1"); - LOG_INFO("effect TE_SUPERSPIKEQUAD is ", ftos(_particleeffectnum("TE_SUPERSPIKEQUAD")), "\n"); + LOG_INFO("effect TE_SUPERSPIKEQUAD is ", ftos(_particleeffectnum("TE_SUPERSPIKEQUAD"))); db_put(d, "TE_WIZSPIKE", "1"); - LOG_INFO("effect TE_WIZSPIKE is ", ftos(_particleeffectnum("TE_WIZSPIKE")), "\n"); + LOG_INFO("effect TE_WIZSPIKE is ", ftos(_particleeffectnum("TE_WIZSPIKE"))); db_put(d, "TE_KNIGHTSPIKE", "1"); - LOG_INFO("effect TE_KNIGHTSPIKE is ", ftos(_particleeffectnum("TE_KNIGHTSPIKE")), "\n"); + LOG_INFO("effect TE_KNIGHTSPIKE is ", ftos(_particleeffectnum("TE_KNIGHTSPIKE"))); db_put(d, "TE_EXPLOSION", "1"); - LOG_INFO("effect TE_EXPLOSION is ", ftos(_particleeffectnum("TE_EXPLOSION")), "\n"); + LOG_INFO("effect TE_EXPLOSION is ", ftos(_particleeffectnum("TE_EXPLOSION"))); db_put(d, "TE_EXPLOSIONQUAD", "1"); - LOG_INFO("effect TE_EXPLOSIONQUAD is ", ftos(_particleeffectnum("TE_EXPLOSIONQUAD")), "\n"); + LOG_INFO("effect TE_EXPLOSIONQUAD is ", ftos(_particleeffectnum("TE_EXPLOSIONQUAD"))); db_put(d, "TE_TAREXPLOSION", "1"); - LOG_INFO("effect TE_TAREXPLOSION is ", ftos(_particleeffectnum("TE_TAREXPLOSION")), "\n"); + LOG_INFO("effect TE_TAREXPLOSION is ", ftos(_particleeffectnum("TE_TAREXPLOSION"))); db_put(d, "TE_TELEPORT", "1"); - LOG_INFO("effect TE_TELEPORT is ", ftos(_particleeffectnum("TE_TELEPORT")), "\n"); + LOG_INFO("effect TE_TELEPORT is ", ftos(_particleeffectnum("TE_TELEPORT"))); db_put(d, "TE_LAVASPLASH", "1"); - LOG_INFO("effect TE_LAVASPLASH is ", ftos(_particleeffectnum("TE_LAVASPLASH")), "\n"); + LOG_INFO("effect TE_LAVASPLASH is ", ftos(_particleeffectnum("TE_LAVASPLASH"))); db_put(d, "TE_SMALLFLASH", "1"); - LOG_INFO("effect TE_SMALLFLASH is ", ftos(_particleeffectnum("TE_SMALLFLASH")), "\n"); + LOG_INFO("effect TE_SMALLFLASH is ", ftos(_particleeffectnum("TE_SMALLFLASH"))); db_put(d, "TE_FLAMEJET", "1"); - LOG_INFO("effect TE_FLAMEJET is ", ftos(_particleeffectnum("TE_FLAMEJET")), "\n"); + LOG_INFO("effect TE_FLAMEJET is ", ftos(_particleeffectnum("TE_FLAMEJET"))); db_put(d, "EF_FLAME", "1"); - LOG_INFO("effect EF_FLAME is ", ftos(_particleeffectnum("EF_FLAME")), "\n"); + LOG_INFO("effect EF_FLAME is ", ftos(_particleeffectnum("EF_FLAME"))); db_put(d, "TE_BLOOD", "1"); - LOG_INFO("effect TE_BLOOD is ", ftos(_particleeffectnum("TE_BLOOD")), "\n"); + LOG_INFO("effect TE_BLOOD is ", ftos(_particleeffectnum("TE_BLOOD"))); db_put(d, "TE_SPARK", "1"); - LOG_INFO("effect TE_SPARK is ", ftos(_particleeffectnum("TE_SPARK")), "\n"); + LOG_INFO("effect TE_SPARK is ", ftos(_particleeffectnum("TE_SPARK"))); db_put(d, "TE_PLASMABURN", "1"); - LOG_INFO("effect TE_PLASMABURN is ", ftos(_particleeffectnum("TE_PLASMABURN")), "\n"); + LOG_INFO("effect TE_PLASMABURN is ", ftos(_particleeffectnum("TE_PLASMABURN"))); db_put(d, "TE_TEI_G3", "1"); - LOG_INFO("effect TE_TEI_G3 is ", ftos(_particleeffectnum("TE_TEI_G3")), "\n"); + LOG_INFO("effect TE_TEI_G3 is ", ftos(_particleeffectnum("TE_TEI_G3"))); db_put(d, "TE_TEI_SMOKE", "1"); - LOG_INFO("effect TE_TEI_SMOKE is ", ftos(_particleeffectnum("TE_TEI_SMOKE")), "\n"); + LOG_INFO("effect TE_TEI_SMOKE is ", ftos(_particleeffectnum("TE_TEI_SMOKE"))); db_put(d, "TE_TEI_BIGEXPLOSION", "1"); - LOG_INFO("effect TE_TEI_BIGEXPLOSION is ", ftos(_particleeffectnum("TE_TEI_BIGEXPLOSION")), "\n"); + LOG_INFO("effect TE_TEI_BIGEXPLOSION is ", ftos(_particleeffectnum("TE_TEI_BIGEXPLOSION"))); db_put(d, "TE_TEI_PLASMAHIT", "1"); - LOG_INFO("effect TE_TEI_PLASMAHIT is ", ftos(_particleeffectnum("TE_TEI_PLASMAHIT")), "\n"); + LOG_INFO("effect TE_TEI_PLASMAHIT is ", ftos(_particleeffectnum("TE_TEI_PLASMAHIT"))); db_put(d, "EF_STARDUST", "1"); - LOG_INFO("effect EF_STARDUST is ", ftos(_particleeffectnum("EF_STARDUST")), "\n"); + LOG_INFO("effect EF_STARDUST is ", ftos(_particleeffectnum("EF_STARDUST"))); db_put(d, "TR_ROCKET", "1"); - LOG_INFO("effect TR_ROCKET is ", ftos(_particleeffectnum("TR_ROCKET")), "\n"); + LOG_INFO("effect TR_ROCKET is ", ftos(_particleeffectnum("TR_ROCKET"))); db_put(d, "TR_GRENADE", "1"); - LOG_INFO("effect TR_GRENADE is ", ftos(_particleeffectnum("TR_GRENADE")), "\n"); + LOG_INFO("effect TR_GRENADE is ", ftos(_particleeffectnum("TR_GRENADE"))); db_put(d, "TR_BLOOD", "1"); - LOG_INFO("effect TR_BLOOD is ", ftos(_particleeffectnum("TR_BLOOD")), "\n"); + LOG_INFO("effect TR_BLOOD is ", ftos(_particleeffectnum("TR_BLOOD"))); db_put(d, "TR_WIZSPIKE", "1"); - LOG_INFO("effect TR_WIZSPIKE is ", ftos(_particleeffectnum("TR_WIZSPIKE")), "\n"); + LOG_INFO("effect TR_WIZSPIKE is ", ftos(_particleeffectnum("TR_WIZSPIKE"))); db_put(d, "TR_SLIGHTBLOOD", "1"); - LOG_INFO("effect TR_SLIGHTBLOOD is ", ftos(_particleeffectnum("TR_SLIGHTBLOOD")), "\n"); + LOG_INFO("effect TR_SLIGHTBLOOD is ", ftos(_particleeffectnum("TR_SLIGHTBLOOD"))); db_put(d, "TR_KNIGHTSPIKE", "1"); - LOG_INFO("effect TR_KNIGHTSPIKE is ", ftos(_particleeffectnum("TR_KNIGHTSPIKE")), "\n"); + LOG_INFO("effect TR_KNIGHTSPIKE is ", ftos(_particleeffectnum("TR_KNIGHTSPIKE"))); db_put(d, "TR_VORESPIKE", "1"); - LOG_INFO("effect TR_VORESPIKE is ", ftos(_particleeffectnum("TR_VORESPIKE")), "\n"); + LOG_INFO("effect TR_VORESPIKE is ", ftos(_particleeffectnum("TR_VORESPIKE"))); db_put(d, "TR_NEHAHRASMOKE", "1"); - LOG_INFO("effect TR_NEHAHRASMOKE is ", ftos(_particleeffectnum("TR_NEHAHRASMOKE")), "\n"); + LOG_INFO("effect TR_NEHAHRASMOKE is ", ftos(_particleeffectnum("TR_NEHAHRASMOKE"))); db_put(d, "TR_NEXUIZPLASMA", "1"); - LOG_INFO("effect TR_NEXUIZPLASMA is ", ftos(_particleeffectnum("TR_NEXUIZPLASMA")), "\n"); + LOG_INFO("effect TR_NEXUIZPLASMA is ", ftos(_particleeffectnum("TR_NEXUIZPLASMA"))); db_put(d, "TR_GLOWTRAIL", "1"); - LOG_INFO("effect TR_GLOWTRAIL is ", ftos(_particleeffectnum("TR_GLOWTRAIL")), "\n"); + LOG_INFO("effect TR_GLOWTRAIL is ", ftos(_particleeffectnum("TR_GLOWTRAIL"))); db_put(d, "TR_SEEKER", "1"); - LOG_INFO("effect TR_SEEKER is ", ftos(_particleeffectnum("TR_SEEKER")), "\n"); + LOG_INFO("effect TR_SEEKER is ", ftos(_particleeffectnum("TR_SEEKER"))); db_put(d, "SVC_PARTICLE", "1"); - LOG_INFO("effect SVC_PARTICLE is ", ftos(_particleeffectnum("SVC_PARTICLE")), "\n"); + LOG_INFO("effect SVC_PARTICLE is ", ftos(_particleeffectnum("SVC_PARTICLE"))); fh = fopen("effectinfo.txt", FILE_READ); while ((s = fgets(fh))) @@ -705,12 +705,12 @@ void GameCommand_effectindexdump(float request) if (db_get(d, argv(1)) != "1") { int i = _particleeffectnum(argv(1)); - if (i >= 0) LOG_INFO("effect ", argv(1), " is ", ftos(i), "\n"); + if (i >= 0) LOG_INFO("effect ", argv(1), " is ", ftos(i)); db_put(d, argv(1), "1"); } } } - LOG_INFO("end of effects list\n"); + LOG_INFO("end of effects list"); db_close(d); return; @@ -719,8 +719,8 @@ void GameCommand_effectindexdump(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd effectindexdump\n"); - LOG_INFO(" No arguments required.\n"); + LOG_INFO("Usage:^3 sv_cmd effectindexdump"); + LOG_INFO(" No arguments required."); return; } } @@ -739,9 +739,9 @@ void GameCommand_extendmatchtime(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd extendmatchtime\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2reducematchtime^7\n"); + LOG_INFO("Usage:^3 sv_cmd extendmatchtime"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2reducematchtime^7"); return; } } @@ -786,12 +786,12 @@ void GameCommand_gametype(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2gametype^7\n"); + LOG_INFO("Incorrect parameters for ^2gametype^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd gametype mode\n"); - LOG_INFO(" Where 'mode' is the gametype mode to switch to.\n"); - LOG_INFO("See also: ^2gotomap^7\n"); + LOG_INFO("Usage:^3 sv_cmd gametype mode"); + LOG_INFO(" Where 'mode' is the gametype mode to switch to."); + LOG_INFO("See also: ^2gotomap^7"); return; } } @@ -843,7 +843,7 @@ void GameCommand_gettaginfo(float request, float argc) } else { - LOG_INFO("bone not found\n"); + LOG_INFO("bone not found"); } delete(tmp_entity); @@ -852,11 +852,11 @@ void GameCommand_gettaginfo(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2gettaginfo^7\n"); + LOG_INFO("Incorrect parameters for ^2gettaginfo^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd gettaginfo model frame index [command one] [command two]\n"); - LOG_INFO("See also: ^2bbox, trace^7\n"); + LOG_INFO("Usage:^3 sv_cmd gettaginfo model frame index [command one] [command two]"); + LOG_INFO("See also: ^2bbox, trace^7"); return; } } @@ -902,8 +902,8 @@ void GameCommand_animbench(float request, float argc) t2 += gettime(GETTIME_HIRES) - t0; n += 1; } - LOG_INFO("model ", tmp_entity.model, " frame ", ftos(f1), " animtime ", ftos(n / t1), "/s\n"); - LOG_INFO("model ", tmp_entity.model, " frame ", ftos(f2), " animtime ", ftos(n / t2), "/s\n"); + LOG_INFO("model ", tmp_entity.model, " frame ", ftos(f1), " animtime ", ftos(n / t1), "/s"); + LOG_INFO("model ", tmp_entity.model, " frame ", ftos(f2), " animtime ", ftos(n / t2), "/s"); delete(tmp_entity); return; @@ -911,11 +911,11 @@ void GameCommand_animbench(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2gettaginfo^7\n"); + LOG_INFO("Incorrect parameters for ^2gettaginfo^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd gettaginfo model frame index [command one] [command two]\n"); - LOG_INFO("See also: ^2bbox, trace^7\n"); + LOG_INFO("Usage:^3 sv_cmd gettaginfo model frame index [command one] [command two]"); + LOG_INFO("See also: ^2bbox, trace^7"); return; } } @@ -929,18 +929,18 @@ void GameCommand_gotomap(float request, float argc) { if (argv(1)) { - LOG_INFO(GotoMap(argv(1)), "\n"); + LOG_INFO(GotoMap(argv(1))); return; } } default: - LOG_INFO("Incorrect parameters for ^2gotomap^7\n"); + LOG_INFO("Incorrect parameters for ^2gotomap^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd gotomap map\n"); - LOG_INFO(" Where 'map' is the *.bsp file to change to.\n"); - LOG_INFO("See also: ^2gametype^7\n"); + LOG_INFO("Usage:^3 sv_cmd gotomap map"); + LOG_INFO(" Where 'map' is the *.bsp file to change to."); + LOG_INFO("See also: ^2gametype^7"); return; } } @@ -967,9 +967,9 @@ void GameCommand_lockteams(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd lockteams\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2unlockteams^7\n"); + LOG_INFO("Usage:^3 sv_cmd lockteams"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2unlockteams^7"); return; } } @@ -993,9 +993,9 @@ void GameCommand_make_mapinfo(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd make_mapinfo\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2radarmap^7\n"); + LOG_INFO("Usage:^3 sv_cmd make_mapinfo"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2radarmap^7"); return; } } @@ -1031,7 +1031,7 @@ void GameCommand_moveplayer(float request, float argc) if (accepted <= 0) { - LOG_INFO("moveplayer: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : ".\n")); + LOG_INFO("moveplayer: ", GetClientErrorString(accepted, t), (targets ? ", skipping to next player.\n" : ".")); continue; } @@ -1047,7 +1047,7 @@ void GameCommand_moveplayer(float request, float argc) } else { - LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") is already spectating.\n"); + LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") is already spectating."); } continue; } @@ -1067,7 +1067,7 @@ void GameCommand_moveplayer(float request, float argc) if (team_id == client.team) // already on the destination team { // keep the forcing undone - LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") is already on the ", Team_ColoredFullName(client.team), (targets ? "^7, skipping to next player.\n" : "^7.\n")); + LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") is already on the ", Team_ColoredFullName(client.team), (targets ? "^7, skipping to next player.\n" : "^7.")); continue; } else if (team_id == 0) // auto team @@ -1084,12 +1084,12 @@ void GameCommand_moveplayer(float request, float argc) // Check to see if the destination team is even available switch (team_id) { - case NUM_TEAM_1: if (c1 == -1) { LOG_INFO("Sorry, can't move player to red team if it doesn't exist.\n"); return; } break; - case NUM_TEAM_2: if (c2 == -1) { LOG_INFO("Sorry, can't move player to blue team if it doesn't exist.\n"); return; } break; - case NUM_TEAM_3: if (c3 == -1) { LOG_INFO("Sorry, can't move player to yellow team if it doesn't exist.\n"); return; } break; - case NUM_TEAM_4: if (c4 == -1) { LOG_INFO("Sorry, can't move player to pink team if it doesn't exist.\n"); return; } break; + case NUM_TEAM_1: if (c1 == -1) { LOG_INFO("Sorry, can't move player to red team if it doesn't exist."); return; } break; + case NUM_TEAM_2: if (c2 == -1) { LOG_INFO("Sorry, can't move player to blue team if it doesn't exist."); return; } break; + case NUM_TEAM_3: if (c3 == -1) { LOG_INFO("Sorry, can't move player to yellow team if it doesn't exist."); return; } break; + case NUM_TEAM_4: if (c4 == -1) { LOG_INFO("Sorry, can't move player to pink team if it doesn't exist."); return; } break; - default: LOG_INFO("Sorry, can't move player here if team ", destination, " doesn't exist.\n"); + default: LOG_INFO("Sorry, can't move player here if team ", destination, " doesn't exist."); return; } @@ -1097,41 +1097,41 @@ void GameCommand_moveplayer(float request, float argc) client.team_forced = 0; MoveToTeam(client, team_id, 6); successful = strcat(successful, (successful ? ", " : ""), playername(client, false)); - LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") has been moved to the ", Team_ColoredFullName(team_id), "^7.\n"); + LOG_INFO("Player ", ftos(GetFilteredNumber(t)), " (", playername(client, false), ") has been moved to the ", Team_ColoredFullName(team_id), "^7."); continue; } else { - LOG_INFO("Can't change teams when currently not playing a team game.\n"); + LOG_INFO("Can't change teams when currently not playing a team game."); return; } } else { - LOG_INFO("Can't change teams if the player isn't in the game.\n"); // well technically we could, but should we allow that? :P + LOG_INFO("Can't change teams if the player isn't in the game."); // well technically we could, but should we allow that? :P return; } } } if (successful) bprint("Successfully moved players ", successful, " to destination ", destination, ".\n"); - else LOG_INFO("No players given (", original_targets, ") are able to move.\n"); + else LOG_INFO("No players given (", original_targets, ") are able to move."); return; // still correct parameters so return to avoid usage print } } default: - LOG_INFO("Incorrect parameters for ^2moveplayer^7\n"); + LOG_INFO("Incorrect parameters for ^2moveplayer^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd moveplayer clients destination\n"); - LOG_INFO(" 'clients' is a list (separated by commas) of player entity ID's or nicknames\n"); - LOG_INFO(" 'destination' is what to send the player to, be it team or spectating\n"); - LOG_INFO(" Full list of destinations here: \"spec, spectator, red, blue, yellow, pink, auto.\"\n"); - LOG_INFO("Examples: sv_cmd moveplayer 1,3,5 red 3\n"); - LOG_INFO(" sv_cmd moveplayer 2 spec \n"); - LOG_INFO("See also: ^2allspec, shuffleteams^7\n"); + LOG_INFO("Usage:^3 sv_cmd moveplayer clients destination"); + LOG_INFO(" 'clients' is a list (separated by commas) of player entity ID's or nicknames"); + LOG_INFO(" 'destination' is what to send the player to, be it team or spectating"); + LOG_INFO(" Full list of destinations here: \"spec, spectator, red, blue, yellow, pink, auto.\""); + LOG_INFO("Examples: sv_cmd moveplayer 1,3,5 red 3"); + LOG_INFO(" sv_cmd moveplayer 2 spec "); + LOG_INFO("See also: ^2allspec, shuffleteams^7"); return; } } @@ -1159,8 +1159,8 @@ void GameCommand_nospectators(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd nospectators\n"); - LOG_INFO(" No arguments required.\n"); + LOG_INFO("Usage:^3 sv_cmd nospectators"); + LOG_INFO(" No arguments required."); return; } } @@ -1186,7 +1186,7 @@ void GameCommand_playerdemo(float request, float argc) if (accepted <= 0) { - LOG_INFO("playerdemo: read: ", GetClientErrorString(accepted, argv(2)), ".\n"); + LOG_INFO("playerdemo: read: ", GetClientErrorString(accepted, argv(2)), "."); return; } @@ -1201,7 +1201,7 @@ void GameCommand_playerdemo(float request, float argc) if (accepted <= 0) { - LOG_INFO("playerdemo: write: ", GetClientErrorString(accepted, argv(2)), ".\n"); + LOG_INFO("playerdemo: write: ", GetClientErrorString(accepted, argv(2)), "."); return; } @@ -1236,11 +1236,11 @@ void GameCommand_playerdemo(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2playerdemo^7\n"); + LOG_INFO("Incorrect parameters for ^2playerdemo^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd playerdemo command (entitynumber filename | entitynumber botnumber)\n"); - LOG_INFO(" Full list of commands here: \"read, write, auto_read_and_write, auto_read.\"\n"); + LOG_INFO("Usage:^3 sv_cmd playerdemo command (entitynumber filename | entitynumber botnumber)"); + LOG_INFO(" Full list of commands here: \"read, write, auto_read_and_write, auto_read.\""); return; } } @@ -1253,15 +1253,15 @@ void GameCommand_printstats(float request) case CMD_REQUEST_COMMAND: { DumpStats(false); - LOG_INFO("stats dumped.\n"); + LOG_INFO("stats dumped."); return; } default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd printstats\n"); - LOG_INFO(" No arguments required.\n"); + LOG_INFO("Usage:^3 sv_cmd printstats"); + LOG_INFO(" No arguments required."); return; } } @@ -1277,13 +1277,13 @@ void GameCommand_radarmap(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2radarmap^7\n"); + LOG_INFO("Incorrect parameters for ^2radarmap^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd radarmap [--force] [--loop] [--quit] [--block | --trace | --sample | --lineblock] [--sharpen N] [--res W H] [--qual Q]\n"); - LOG_INFO(" The quality factor Q is roughly proportional to the time taken.\n"); - LOG_INFO(" trace supports no quality factor; its result should look like --block with infinite quality factor.\n"); - LOG_INFO("See also: ^2make_mapinfo^7\n"); + LOG_INFO("Usage:^3 sv_cmd radarmap [--force] [--loop] [--quit] [--block | --trace | --sample | --lineblock] [--sharpen N] [--res W H] [--qual Q]"); + LOG_INFO(" The quality factor Q is roughly proportional to the time taken."); + LOG_INFO(" trace supports no quality factor; its result should look like --block with infinite quality factor."); + LOG_INFO("See also: ^2make_mapinfo^7"); return; } } @@ -1302,9 +1302,9 @@ void GameCommand_reducematchtime(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd reducematchtime\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2extendmatchtime^7\n"); + LOG_INFO("Usage:^3 sv_cmd reducematchtime"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2extendmatchtime^7"); return; } } @@ -1326,12 +1326,12 @@ void GameCommand_setbots(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2setbots^7\n"); + LOG_INFO("Incorrect parameters for ^2setbots^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd setbots botnumber\n"); - LOG_INFO(" Where 'botnumber' is the amount of bots to set bot_number cvar to.\n"); - LOG_INFO("See also: ^2bot_cmd^7\n"); + LOG_INFO("Usage:^3 sv_cmd setbots botnumber"); + LOG_INFO(" Where 'botnumber' is the amount of bots to set bot_number cvar to."); + LOG_INFO("See also: ^2bot_cmd^7"); return; } } @@ -1345,7 +1345,7 @@ void GameCommand_shuffleteams(float request) { if (!teamplay) { - LOG_INFO("Can't shuffle teams when currently not playing a team game.\n"); + LOG_INFO("Can't shuffle teams when currently not playing a team game."); return; } @@ -1354,7 +1354,7 @@ void GameCommand_shuffleteams(float request) // we could theoretically assign forced players to their teams // and shuffle the rest to fill the empty spots but in practise // either all players or none are gonna have forced teams - LOG_INFO("Can't shuffle teams because at least one player has a forced team.\n"); + LOG_INFO("Can't shuffle teams because at least one player has a forced team."); return; } }); @@ -1380,9 +1380,9 @@ void GameCommand_shuffleteams(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd shuffleteams\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2moveplayer, allspec^7\n"); + LOG_INFO("Usage:^3 sv_cmd shuffleteams"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2moveplayer, allspec^7"); return; } } @@ -1411,7 +1411,7 @@ void GameCommand_stuffto(float request, float argc) } else { - LOG_INFO("stuffto: ", GetClientErrorString(accepted, argv(1)), ".\n"); + LOG_INFO("stuffto: ", GetClientErrorString(accepted, argv(1)), "."); } return; @@ -1419,19 +1419,19 @@ void GameCommand_stuffto(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2stuffto^7\n"); + LOG_INFO("Incorrect parameters for ^2stuffto^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd stuffto client \"command\"\n"); - LOG_INFO(" 'client' is the entity number or name of the player,\n"); - LOG_INFO(" and 'command' is the command to be sent to that player.\n"); + LOG_INFO("Usage:^3 sv_cmd stuffto client \"command\""); + LOG_INFO(" 'client' is the entity number or name of the player,"); + LOG_INFO(" and 'command' is the command to be sent to that player."); return; } } #else if (request) { - LOG_INFO("stuffto command is not enabled on this server.\n"); + LOG_INFO("stuffto command is not enabled on this server."); return; } #endif @@ -1452,7 +1452,7 @@ void GameCommand_trace(float request, float argc) case "debug": { float hitcount = 0; - LOG_INFO("TEST CASE. If this returns the runaway loop counter error, possibly everything is oaky.\n"); + LOG_INFO("TEST CASE. If this returns the runaway loop counter error, possibly everything is oaky."); float worst_endpos_bug = 0; for ( ; ; ) { @@ -1499,12 +1499,12 @@ void GameCommand_trace(float request, float argc) } } - LOG_INFO("safe distance to back off: ", ftos(safe * vlen(p - start)), "qu\n"); - LOG_INFO("unsafe distance to back off: ", ftos(unsafe * vlen(p - start)), "qu\n"); + LOG_INFO("safe distance to back off: ", ftos(safe * vlen(p - start)), "qu"); + LOG_INFO("unsafe distance to back off: ", ftos(unsafe * vlen(p - start)), "qu"); tracebox(p, PL_MIN_CONST + '0.1 0.1 0.1', PL_MAX_CONST - '0.1 0.1 0.1', p, MOVE_NOMONSTERS, NULL); - if (trace_startsolid) LOG_INFO("trace_endpos much in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n"); - else LOG_INFO("trace_endpos just in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n"); + if (trace_startsolid) LOG_INFO("trace_endpos much in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p)); + else LOG_INFO("trace_endpos just in solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p)); if (++hitcount >= 10) break; } else @@ -1525,8 +1525,8 @@ void GameCommand_trace(float request, float argc) if (dq > worst_endpos_bug) { worst_endpos_bug = dq; - LOG_INFO("trace_endpos still before solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p), "\n"); - LOG_INFO("could go ", ftos(dq), " units further to ", vtos(q), "\n"); + LOG_INFO("trace_endpos still before solid when tracing from ", vtos(start), " to ", vtos(end), " endpos ", vtos(p)); + LOG_INFO("could go ", ftos(dq), " units further to ", vtos(q)); if (++hitcount >= 10) break; } } @@ -1542,7 +1542,7 @@ void GameCommand_trace(float request, float argc) vv = trace_endpos; if (trace_fraction == 1) { - LOG_INFO("not above ground, aborting\n"); + LOG_INFO("not above ground, aborting"); return; } f = 0; @@ -1551,18 +1551,18 @@ void GameCommand_trace(float request, float argc) dv = randomvec(); if (dv.z > 0) dv = -1 * dv; tracebox(vv, e.mins, e.maxs, vv + dv, MOVE_NORMAL, e); - if (trace_startsolid) LOG_INFO("bug 1\n"); + if (trace_startsolid) LOG_INFO("bug 1"); if (trace_fraction == 1) { if (dv.z < f) { LOG_INFO("bug 2: ", ftos(dv.x), " ", ftos(dv.y), " ", ftos(dv.z)); - LOG_INFO(" (", ftos(asin(dv.z / vlen(dv)) * 180 / M_PI), " degrees)\n"); + LOG_INFO(" (", ftos(asin(dv.z / vlen(dv)) * 180 / M_PI), " degrees)"); f = dv.z; } } } - LOG_INFO("highest possible dist: ", ftos(f), "\n"); + LOG_INFO("highest possible dist: ", ftos(f)); return; } @@ -1571,8 +1571,8 @@ void GameCommand_trace(float request, float argc) if (argc == 4) { e = nextent(NULL); - if (tracewalk(e, stov(argv(2)), e.mins, e.maxs, stov(argv(3)), MOVE_NORMAL)) LOG_INFO("can walk\n"); - else LOG_INFO("cannot walk\n"); + if (tracewalk(e, stov(argv(2)), e.mins, e.maxs, stov(argv(3)), MOVE_NORMAL)) LOG_INFO("can walk"); + else LOG_INFO("cannot walk"); return; } } @@ -1595,12 +1595,12 @@ void GameCommand_trace(float request, float argc) } default: - LOG_INFO("Incorrect parameters for ^2trace^7\n"); + LOG_INFO("Incorrect parameters for ^2trace^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd trace command (startpos endpos)\n"); - LOG_INFO(" Full list of commands here: \"debug, debug2, walk, showline.\"\n"); - LOG_INFO("See also: ^2bbox, gettaginfo^7\n"); + LOG_INFO("Usage:^3 sv_cmd trace command (startpos endpos)"); + LOG_INFO(" Full list of commands here: \"debug, debug2, walk, showline.\""); + LOG_INFO("See also: ^2bbox, gettaginfo^7"); return; } } @@ -1627,9 +1627,9 @@ void GameCommand_unlockteams(float request) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd unlockteams\n"); - LOG_INFO(" No arguments required.\n"); - LOG_INFO("See also: ^2lockteams^7\n"); + LOG_INFO("Usage:^3 sv_cmd unlockteams"); + LOG_INFO(" No arguments required."); + LOG_INFO("See also: ^2lockteams^7"); return; } } @@ -1646,17 +1646,17 @@ void GameCommand_warp(float request, float argc) if (argc >= 2) { CampaignLevelWarp(stof(argv(1))); - LOG_INFO("Successfully warped to campaign level ", argv(1), ".\n"); + LOG_INFO("Successfully warped to campaign level ", argv(1), "."); } else { CampaignLevelWarp(-1); - LOG_INFO("Successfully warped to next campaign level.\n"); + LOG_INFO("Successfully warped to next campaign level."); } } else { - LOG_INFO("Not in campaign, can't level warp\n"); + LOG_INFO("Not in campaign, can't level warp"); } return; } @@ -1664,9 +1664,9 @@ void GameCommand_warp(float request, float argc) default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 sv_cmd warp [level]\n"); - LOG_INFO(" 'level' is the level to change campaign mode to.\n"); - LOG_INFO(" if 'level' is not provided it will change to the next level.\n"); + LOG_INFO("Usage:^3 sv_cmd warp [level]"); + LOG_INFO(" 'level' is the level to change campaign mode to."); + LOG_INFO(" if 'level' is not provided it will change to the next level."); return; } } @@ -1840,5 +1840,5 @@ void GameCommand(string command) } // nothing above caught the command, must be invalid - LOG_INFO(((command != "") ? strcat("Unknown server command \"", command, "\"") : "No command provided"), ". For a list of supported commands, try sv_cmd help.\n"); + LOG_INFO(((command != "") ? strcat("Unknown server command \"", command, "\"") : "No command provided"), ". For a list of supported commands, try sv_cmd help."); } diff --git a/qcsrc/server/command/vote.qc b/qcsrc/server/command/vote.qc index 9d5bf6f94..8cfed5bae 100644 --- a/qcsrc/server/command/vote.qc +++ b/qcsrc/server/command/vote.qc @@ -583,7 +583,7 @@ float VoteCommand_checkargs(float startpos, float argc) if(cvar_type(cvarname) & CVAR_TYPEFLAG_EXISTS) cmdrestriction = cvar_string(cvarname); else - LOG_INFO("NOTE: ", cvarname, " does not exist, no restrictions will be applied.\n"); + LOG_INFO("NOTE: ", cvarname, " does not exist, no restrictions will be applied."); if (cmdrestriction == "") return true; diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 6c6a71d51..66612e0db 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -135,7 +135,7 @@ void GotoFirstMap(entity this) else { this.nextthink = time + 1; - LOG_INFO("Waiting for _sv_init being set to 1 by initialization scripts...\n"); + LOG_INFO("Waiting for _sv_init being set to 1 by initialization scripts..."); } } @@ -532,7 +532,7 @@ void detect_maptype() tracebox(o, '-1 -1 -1' * i, '1 1 1' * i, o - '0 0 32768', MOVE_WORLDONLY, NULL); if(trace_fraction == 1) continue; - LOG_INFO(ftos(i), " -> ", vtos(trace_endpos), "\n"); + LOG_INFO(ftos(i), " -> ", vtos(trace_endpos)); } break; @@ -846,23 +846,23 @@ spawnfunc(worldspawn) continue; if(argv(0) == "cd") { - LOG_INFO("Found ^1UNSUPPORTED^7 cd loop command in .cfg file; put this line in mapinfo instead:\n"); - LOG_INFO(" cdtrack ", argv(2), "\n"); + LOG_INFO("Found ^1UNSUPPORTED^7 cd loop command in .cfg file; put this line in mapinfo instead:"); + LOG_INFO(" cdtrack ", argv(2)); } else if(argv(0) == "fog") { - LOG_INFO("Found ^1UNSUPPORTED^7 fog command in .cfg file; put this line in worldspawn in the .map/.bsp/.ent file instead:\n"); - LOG_INFO(" \"fog\" \"", s, "\"\n"); + LOG_INFO("Found ^1UNSUPPORTED^7 fog command in .cfg file; put this line in worldspawn in the .map/.bsp/.ent file instead:"); + LOG_INFO(" \"fog\" \"", s, "\""); } else if(argv(0) == "set") { - LOG_INFO("Found ^1UNSUPPORTED^7 set command in .cfg file; put this line in mapinfo instead:\n"); - LOG_INFO(" clientsettemp_for_type all ", argv(1), " ", argv(2), "\n"); + LOG_INFO("Found ^1UNSUPPORTED^7 set command in .cfg file; put this line in mapinfo instead:"); + LOG_INFO(" clientsettemp_for_type all ", argv(1), " ", argv(2)); } else if(argv(0) != "//") { - LOG_INFO("Found ^1UNSUPPORTED^7 set command in .cfg file; put this line in mapinfo instead:\n"); - LOG_INFO(" clientsettemp_for_type all ", argv(0), " ", argv(1), "\n"); + LOG_INFO("Found ^1UNSUPPORTED^7 set command in .cfg file; put this line in mapinfo instead:"); + LOG_INFO(" clientsettemp_for_type all ", argv(0), " ", argv(1)); } } fclose(fd); @@ -1438,7 +1438,7 @@ void DumpStats(float final) s = strcat(s, GetGametype(), "_", GetMapname(), ":", ftos(rint(time))); if(to_console) - LOG_INFO(s, "\n"); + LOG_INFO(s); if(to_eventlog) GameLogEcho(s); @@ -1454,7 +1454,7 @@ void DumpStats(float final) s = strcat(":labels:player:", GetPlayerScoreString(NULL, 0)); if(to_console) - LOG_INFO(s, "\n"); + LOG_INFO(s); if(to_eventlog) GameLogEcho(s); if(to_file) @@ -1469,7 +1469,7 @@ void DumpStats(float final) s = strcat(s, "spectator:"); if(to_console) - LOG_INFO(s, playername(it, false), "\n"); + LOG_INFO(s, playername(it, false)); if(to_eventlog) GameLogEcho(strcat(s, ftos(it.playerid), ":", playername(it, false))); if(to_file) @@ -1480,7 +1480,7 @@ void DumpStats(float final) { s = strcat(":labels:teamscores:", GetTeamScoreString(0, 0)); if(to_console) - LOG_INFO(s, "\n"); + LOG_INFO(s); if(to_eventlog) GameLogEcho(s); if(to_file) @@ -1491,7 +1491,7 @@ void DumpStats(float final) s = strcat(":teamscores:see-labels:", GetTeamScoreString(i, 0)); s = strcat(s, ":", ftos(i)); if(to_console) - LOG_INFO(s, "\n"); + LOG_INFO(s); if(to_eventlog) GameLogEcho(s); if(to_file) @@ -1500,7 +1500,7 @@ void DumpStats(float final) } if(to_console) - LOG_INFO(":end\n"); + LOG_INFO(":end"); if(to_eventlog) GameLogEcho(":end"); if(to_file) @@ -2131,7 +2131,7 @@ float RedirectionThink() clients_found = 0; FOREACH_CLIENT(IS_REAL_CLIENT(it), { // TODO add timer - LOG_INFO("Redirecting: sending connect command to ", it.netname, "\n"); + LOG_INFO("Redirecting: sending connect command to ", it.netname); if(redirection_target == "self") stuffcmd(it, "\ndisconnect; defer ", ftos(autocvar_quit_and_redirect_timer), " reconnect\n"); else @@ -2139,7 +2139,7 @@ float RedirectionThink() ++clients_found; }); - LOG_INFO("Redirecting: ", ftos(clients_found), " clients left.\n"); + LOG_INFO("Redirecting: ", ftos(clients_found), " clients left."); if(time > redirection_timeout || clients_found == 0) localcmd("\nwait; wait; wait; quit\n"); @@ -2204,7 +2204,7 @@ void Shutdown() } else if(world_initialized == 0) { - LOG_INFO("NOTE: crashed before even initializing the world, not saving persistent data\n"); + LOG_INFO("NOTE: crashed before even initializing the world, not saving persistent data"); } else { diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc index 1dcc47d0f..56ea478ae 100644 --- a/qcsrc/server/impulse.qc +++ b/qcsrc/server/impulse.qc @@ -652,7 +652,7 @@ IMPULSE(navwaypoint_remove) if (e.wphardwired) { - LOG_INFO("^1Warning: ^7Removal of hardwired waypoints is not allowed in the editor. Please remove links from/to this waypoint (", vtos(e.origin), ") by hand from maps/", mapname, ".waypoints.hardwired\n"); + LOG_INFO("^1Warning: ^7Removal of hardwired waypoints is not allowed in the editor. Please remove links from/to this waypoint (", vtos(e.origin), ") by hand from maps/", mapname, ".waypoints.hardwired"); return; } @@ -710,7 +710,7 @@ IMPULSE(navwaypoint_unreachable) m = 0; IL_EACH(g_waypoints, it.wpcost >= 10000000, { - LOG_INFO("unreachable: ", etos(it), " ", vtos(it.origin), "\n"); + LOG_INFO("unreachable: ", etos(it), " ", vtos(it.origin)); it.colormod_z = 8; it.effects |= EF_NODEPTHTEST | EF_BLUE; ++j; @@ -722,7 +722,7 @@ IMPULSE(navwaypoint_unreachable) j = 0; IL_EACH(g_waypoints, it.wpcost >= 10000000, { - LOG_INFO("cannot reach me: ", etos(it), " ", vtos(it.origin), "\n"); + LOG_INFO("cannot reach me: ", etos(it), " ", vtos(it.origin)); it.colormod_x = 8; if (!(it.effects & EF_NODEPTHTEST)) // not already reported before ++m; @@ -747,7 +747,7 @@ IMPULSE(navwaypoint_unreachable) else { setorigin(it, org); - LOG_INFO("spawn without waypoint: ", etos(it), " ", vtos(it.origin), "\n"); + LOG_INFO("spawn without waypoint: ", etos(it), " ", vtos(it.origin)); it.effects |= EF_NODEPTHTEST; _setmodel(it, this.model); it.frame = this.frame; @@ -768,7 +768,7 @@ IMPULSE(navwaypoint_unreachable) IL_EACH(g_items, true, { if (navigation_findnearestwaypoint(it, false)) continue; - LOG_INFO("item without waypoint: ", etos(it), " ", vtos(it.origin), "\n"); + LOG_INFO("item without waypoint: ", etos(it), " ", vtos(it.origin)); it.effects |= EF_NODEPTHTEST | EF_RED; it.colormod_x = 8; ++j; @@ -779,7 +779,7 @@ IMPULSE(navwaypoint_unreachable) IL_EACH(g_items, true, { if (navigation_findnearestwaypoint(it, true)) continue; - LOG_INFO("item without waypoint: ", etos(it), " ", vtos(it.origin), "\n"); + LOG_INFO("item without waypoint: ", etos(it), " ", vtos(it.origin)); it.effects |= EF_NODEPTHTEST | EF_BLUE; it.colormod_z = 8; ++j; diff --git a/qcsrc/server/ipban.qc b/qcsrc/server/ipban.qc index dfda7283f..98dbf5c55 100644 --- a/qcsrc/server/ipban.qc +++ b/qcsrc/server/ipban.qc @@ -93,7 +93,7 @@ void OnlineBanList_URI_Get_Callback(float id, float status, string data) if(id >= MAX_IPBAN_URIS) { - LOG_INFO("Received ban list for invalid ID\n"); + LOG_INFO("Received ban list for invalid ID"); return; } @@ -104,7 +104,7 @@ void OnlineBanList_URI_Get_Callback(float id, float status, string data) if(OnlineBanList_RequestWaiting[id] == 0) { - LOG_INFO(prelude, "rejected (unexpected)\n"); + LOG_INFO(prelude, "rejected (unexpected)"); return; } @@ -112,14 +112,14 @@ void OnlineBanList_URI_Get_Callback(float id, float status, string data) if(time > OnlineBanList_Timeout) { - LOG_INFO(prelude, "rejected (too late)\n"); + LOG_INFO(prelude, "rejected (too late)"); return; } syncinterval = autocvar_g_ban_sync_interval; if(syncinterval == 0) { - LOG_INFO(prelude, "rejected (syncing disabled)\n"); + LOG_INFO(prelude, "rejected (syncing disabled)"); return; } if(syncinterval > 0) @@ -127,19 +127,19 @@ void OnlineBanList_URI_Get_Callback(float id, float status, string data) if(status != 0) { - LOG_INFO(prelude, "error: status is ", ftos(status), "\n"); + LOG_INFO(prelude, "error: status is ", ftos(status)); return; } if(substring(data, 0, 1) == "<") { - LOG_INFO(prelude, "error: received HTML instead of a ban list\n"); + LOG_INFO(prelude, "error: received HTML instead of a ban list"); return; } if(strstrofs(data, "\r", 0) != -1) { - LOG_INFO(prelude, "error: received carriage returns\n"); + LOG_INFO(prelude, "error: received carriage returns"); return; } @@ -150,11 +150,11 @@ void OnlineBanList_URI_Get_Callback(float id, float status, string data) if((n % 4) != 0) { - LOG_INFO(prelude, "error: received invalid item count: ", ftos(n), "\n"); + LOG_INFO(prelude, "error: received invalid item count: ", ftos(n)); return; } - LOG_INFO(prelude, "OK, ", ftos(n / 4), " items\n"); + LOG_INFO(prelude, "OK, ", ftos(n / 4), " items"); for(i = 0; i < n; i += 4) { @@ -177,7 +177,7 @@ void OnlineBanList_URI_Get_Callback(float id, float status, string data) for(j = 0; j < l; ++j) if(strstrofs("0123456789.", substring(ip, j, 1), 0) == -1) { - LOG_INFO("Invalid character ", substring(ip, j, 1), " in IP address ", ip, ". Skipping this ban.\n"); + LOG_INFO("Invalid character ", substring(ip, j, 1), " in IP address ", ip, ". Skipping this ban."); goto skip; } } @@ -329,7 +329,7 @@ void Ban_View() float i, n; string msg; - LOG_INFO("^2Listing all existing active bans:\n"); + LOG_INFO("^2Listing all existing active bans:"); n = 0; for(i = 0; i < ban_count; ++i) @@ -343,10 +343,10 @@ void Ban_View() msg = strcat(msg, ban_ip[i], " is still banned for "); msg = strcat(msg, ftos(ban_expire[i] - time), " seconds"); - LOG_INFO(" ", msg, "\n"); + LOG_INFO(" ", msg); } - LOG_INFO("^2Done listing all active (", ftos(n), ") bans.\n"); + LOG_INFO("^2Done listing all active (", ftos(n), ") bans."); } float Ban_GetClientIP(entity client) @@ -548,7 +548,7 @@ float Ban_Insert(string ip, float bantime, string reason, float dosync) if(i < ban_count) if(ban_expire[i] > time + bantime) { - LOG_INFO(ip, " could not get banned due to no free ban slot\n"); + LOG_INFO(ip, " could not get banned due to no free ban slot"); return false; } // okay, insert our new victim as i diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 78d290c81..7bb8e922d 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -1125,7 +1125,7 @@ void URI_Get_Callback(float id, float status, string data) } else { - LOG_INFO("Received HTTP request data for an invalid id ", ftos(id), ".\n"); + LOG_INFO("Received HTTP request data for an invalid id ", ftos(id), "."); } } diff --git a/qcsrc/server/player.qc b/qcsrc/server/player.qc index 931ef826d..82f661a44 100644 --- a/qcsrc/server/player.qc +++ b/qcsrc/server/player.qc @@ -939,7 +939,7 @@ int Say(entity source, int teamsay, entity privatesay, string msgin, bool floodc } if(flood) - LOG_INFO("NOTE: ", playername(source, true), "^7 is flooding.\n"); + LOG_INFO("NOTE: ", playername(source, true), "^7 is flooding."); // build sourcemsgstr by cutting off a prefix and replacing it by the other one if(privatesay) diff --git a/qcsrc/server/playerdemo.qc b/qcsrc/server/playerdemo.qc index e337e9be4..411d826a8 100644 --- a/qcsrc/server/playerdemo.qc +++ b/qcsrc/server/playerdemo.qc @@ -22,7 +22,7 @@ void playerdemo_shutdown(entity this) { if(this.playerdemo_mode != PLAYERDEMO_MODE_OFF) { - LOG_INFO("playerdemo: ", this.netname, " closed\n"); + LOG_INFO("playerdemo: ", this.netname, " closed"); fclose(this.playerdemo_fh); } this.playerdemo_mode = 0; @@ -36,7 +36,7 @@ void playerdemo_open_read(entity this, string f) this.playerdemo_time = stof(fgets(this.playerdemo_fh)); this.playerdemo_time += this.playerdemo_starttime; set_movetype(this, MOVETYPE_NONE); - LOG_INFO("playerdemo: ", this.netname, " reading from ", f, "\n"); + LOG_INFO("playerdemo: ", this.netname, " reading from ", f); } void playerdemo_open_write(entity this, string f) { @@ -44,8 +44,8 @@ void playerdemo_open_write(entity this, string f) this.playerdemo_mode = PLAYERDEMO_MODE_WRITING; this.playerdemo_fh = fopen(f, FILE_WRITE); this.playerdemo_starttime = time - 1; - LOG_INFO("playerdemo: ", this.netname, " writing to ", f, "\n"); - LOG_INFO("WARNING: playerdemo file format is incomplete and not stable yet. DO NOT RELY ON IT!\n"); + LOG_INFO("playerdemo: ", this.netname, " writing to ", f); + LOG_INFO("WARNING: playerdemo file format is incomplete and not stable yet. DO NOT RELY ON IT!"); } #define PLAYERDEMO_FIELD(ent,func,t,f) func##t(ent,f,#f); #define PLAYERDEMO_FIELDS(ent,func) \ diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc index 6de3e0af3..20039cfcc 100644 --- a/qcsrc/server/portals.qc +++ b/qcsrc/server/portals.qc @@ -149,7 +149,7 @@ float Portal_TeleportPlayer(entity teleporter, entity player) tracebox(safe, player.mins - SAFENUDGE, player.maxs + SAFENUDGE, step, MOVE_NOMONSTERS, player); if(trace_startsolid) { - LOG_INFO("'safe' teleport location is not safe!\n"); + LOG_INFO("'safe' teleport location is not safe!"); // FAIL TODO why does this happen? return 0; } @@ -157,7 +157,7 @@ float Portal_TeleportPlayer(entity teleporter, entity player) tracebox(safe, player.mins - SAFENUDGE, player.maxs + SAFENUDGE, to, MOVE_NOMONSTERS, player); if(trace_startsolid) { - LOG_INFO("trace_endpos in solid, this can't be!\n"); + LOG_INFO("trace_endpos in solid, this can't be!"); // FAIL TODO why does this happen? (reported by MrBougo) return 0; } @@ -216,7 +216,7 @@ float Portal_FindSafeOrigin(entity portal) if(!move_out_of_solid(portal)) { #ifdef DEBUG - LOG_INFO("NO SAFE ORIGIN\n"); + LOG_INFO("NO SAFE ORIGIN"); #endif return 0; } diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc index b5156f49f..cd393b641 100644 --- a/qcsrc/server/spawnpoints.qc +++ b/qcsrc/server/spawnpoints.qc @@ -91,7 +91,7 @@ void relocate_spawnpoint(entity this) if (autocvar_g_spawnpoints_auto_move_out_of_solid) { if (!spawnpoint_nag) - LOG_INFO("\{1}^1NOTE: this map needs FIXING (it contains spawnpoints in solid, see server log)\n"); + LOG_INFO("\{1}^1NOTE: this map needs FIXING (it contains spawnpoints in solid, see server log)"); spawnpoint_nag = 1; } else diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc index 793a227b8..eda9b958b 100644 --- a/qcsrc/server/teamplay.qc +++ b/qcsrc/server/teamplay.qc @@ -65,7 +65,7 @@ void InitGameplayMode() if (!cvar_value_issafe(world.fog)) { - LOG_INFO("The current map contains a potentially harmful fog setting, ignored\n"); + LOG_INFO("The current map contains a potentially harmful fog setting, ignored"); world.fog = string_null; } if(MapInfo_Map_fog != "") diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc index 8eaa0280a..bf272a01a 100644 --- a/qcsrc/server/weapons/tracing.qc +++ b/qcsrc/server/weapons/tracing.qc @@ -122,7 +122,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, .entity weaponentity, vect if (trace_ent == CS(ent).cursor_trace_ent) w_shotdir = normalize(CS(ent).cursor_trace_ent.origin - w_shotorg); else - LOG_INFO("antilag fail\n"); + LOG_INFO("antilag fail"); } } } @@ -185,7 +185,7 @@ void W_SetupProjVelocity_Explicit(entity proj, vector dir, vector upDir, float p #if 0 mspercallsum += gettime(GETTIME_HIRES); mspercallcount += 1; - LOG_INFO("avg: ", ftos(mspercallcount / mspercallsum), " per sec\n"); + LOG_INFO("avg: ", ftos(mspercallcount / mspercallsum), " per sec"); #endif proj.velocity = W_CalculateProjectileVelocity(proj.owner, proj.owner.velocity, pSpeed * dir, forceAbsolute); diff --git a/qcsrc/server/weapons/weaponstats.qc b/qcsrc/server/weapons/weaponstats.qc index a71abe70f..296d10fa6 100644 --- a/qcsrc/server/weapons/weaponstats.qc +++ b/qcsrc/server/weapons/weaponstats.qc @@ -49,21 +49,21 @@ void WeaponStats_ready(entity fh, entity pass, float status) case URL_READY_CANREAD: // url_fclose is processing, we got a response for writing the data // this must come from HTTP - LOG_INFO("Got response from weapon stats server:\n"); + LOG_INFO("Got response from weapon stats server:"); while((s = url_fgets(fh))) - LOG_INFO(" ", s, "\n"); - LOG_INFO("End of response.\n"); + LOG_INFO(" ", s); + LOG_INFO("End of response."); url_fclose(fh); break; case URL_READY_CLOSED: // url_fclose has finished - LOG_INFO("Weapon stats written\n"); + LOG_INFO("Weapon stats written"); buf_del(weaponstats_buffer); weaponstats_buffer = -1; break; case URL_READY_ERROR: default: - LOG_INFO("Weapon stats writing failed: ", ftos(status), "\n"); + LOG_INFO("Weapon stats writing failed: ", ftos(status)); buf_del(weaponstats_buffer); weaponstats_buffer = -1; break; -- 2.39.2