From ae104b5ca1b2fccc934cfda6e562029858186975 Mon Sep 17 00:00:00 2001 From: TimePath Date: Sun, 27 Aug 2017 12:58:18 +1000 Subject: [PATCH] LOG_INFOF: remove 'extra' newlines --- qcsrc/client/bgmscript.qc | 2 +- qcsrc/client/commands/cl_cmd.qc | 2 +- qcsrc/client/csqcmodel_hooks.qc | 2 +- qcsrc/client/hud/hud_config.qc | 4 +-- qcsrc/client/hud/panel/quickmenu.qc | 2 +- qcsrc/client/hud/panel/scoreboard.qc | 6 ++-- qcsrc/client/main.qc | 22 +++++++-------- qcsrc/client/miscfunctions.qc | 2 +- qcsrc/client/view.qc | 2 +- qcsrc/common/command/generic.qc | 10 +++---- qcsrc/common/debug.qh | 10 +++---- qcsrc/common/effects/effectinfo.qc | 4 +-- qcsrc/common/items/item/pickup.qh | 2 +- .../mutator/waypoints/waypointsprites.qc | 2 +- qcsrc/common/notifications/all.qc | 28 +++++++++---------- qcsrc/common/notifications/all.qh | 4 +-- qcsrc/common/playerstats.qc | 8 +++--- qcsrc/common/turrets/all.qh | 4 +-- qcsrc/common/turrets/cl_turrets.qc | 2 +- qcsrc/common/turrets/config.qc | 4 +-- qcsrc/common/util.qc | 6 ++-- qcsrc/common/weapons/all.qc | 2 +- qcsrc/common/weapons/all.qh | 4 +-- qcsrc/common/weapons/calculations.qc | 2 +- qcsrc/common/weapons/config.qc | 4 +-- qcsrc/common/weapons/weapon/devastator.qc | 4 +-- qcsrc/common/weapons/weapon/shockwave.qc | 10 +++---- qcsrc/lib/test.qc | 8 +++--- qcsrc/lib/urllib.qc | 2 +- qcsrc/menu/command/menu_cmd.qc | 2 +- qcsrc/menu/menu.qc | 2 +- qcsrc/menu/xonotic/serverlist.qc | 2 +- qcsrc/menu/xonotic/slider_decibels.qc | 2 +- qcsrc/menu/xonotic/util.qc | 6 ++-- qcsrc/server/bot/default/scripting.qc | 2 +- qcsrc/server/bot/default/waypoints.qc | 10 +++---- qcsrc/server/command/sv_cmd.qc | 8 +++--- qcsrc/server/g_damage.qc | 2 +- qcsrc/server/g_world.qc | 4 +-- qcsrc/server/impulse.qc | 12 ++++---- 40 files changed, 108 insertions(+), 108 deletions(-) diff --git a/qcsrc/client/bgmscript.qc b/qcsrc/client/bgmscript.qc index 4dc6204cb..2db9e54cf 100644 --- a/qcsrc/client/bgmscript.qc +++ b/qcsrc/client/bgmscript.qc @@ -138,7 +138,7 @@ void BGMScript_InitEntity(entity e) e.bgmscriptline = e.bgmscriptline0 = i; if(i >= bgmscriptbufsize) { - LOG_INFOF("ERROR: bgmscript does not define %s\n", e.bgmscript); + LOG_INFOF("ERROR: bgmscript does not define %s", e.bgmscript); strunzone(e.bgmscript); e.bgmscript = string_null; } diff --git a/qcsrc/client/commands/cl_cmd.qc b/qcsrc/client/commands/cl_cmd.qc index 6de891e35..2a2f19ef5 100644 --- a/qcsrc/client/commands/cl_cmd.qc +++ b/qcsrc/client/commands/cl_cmd.qc @@ -484,7 +484,7 @@ CLIENT_COMMAND(sendcvar, "Send a cvar to the server (like weaponpriority)") { Lo void LocalCommand_macro_help() { - FOREACH(CLIENT_COMMANDS, true, LOG_INFOF(" ^2%s^7: %s\n", it.m_name, it.m_description)); + FOREACH(CLIENT_COMMANDS, true, LOG_INFOF(" ^2%s^7: %s", it.m_name, it.m_description)); } bool LocalCommand_macro_command(int argc, string command) diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index 9893b8ae3..6499a683e 100644 --- a/qcsrc/client/csqcmodel_hooks.qc +++ b/qcsrc/client/csqcmodel_hooks.qc @@ -134,7 +134,7 @@ void CSQCPlayer_ModelAppearance_PostUpdate(entity this) this.forceplayermodels_isgoodmodel = fexists(this.forceplayermodels_savemodel); this.forceplayermodels_isgoodmodel_mdl = this.forceplayermodels_savemodel; if(!this.forceplayermodels_isgoodmodel) - LOG_INFOF("Warning: missing model %s has been used\n", this.forceplayermodels_savemodel); + LOG_INFOF("Warning: missing model %s has been used", this.forceplayermodels_savemodel); } } void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer) diff --git a/qcsrc/client/hud/hud_config.qc b/qcsrc/client/hud/hud_config.qc index a1f1cc7ec..ec07ee409 100644 --- a/qcsrc/client/hud/hud_config.qc +++ b/qcsrc/client/hud/hud_config.qc @@ -239,11 +239,11 @@ void HUD_Panel_ExportCfg(string cfgname) HUD_Write("menu_sync\n"); // force the menu to reread the cvars, so that the dialogs are updated - LOG_INFOF(_("^2Successfully exported to %s! (Note: It's saved in data/data/)\n"), filename); + LOG_INFOF(_("^2Successfully exported to %s! (Note: It's saved in data/data/)"), filename); fclose(fh); } else - LOG_INFOF(_("^1Couldn't write to %s\n"), filename); + LOG_INFOF(_("^1Couldn't write to %s"), filename); } void HUD_Configure_Exit_Force() diff --git a/qcsrc/client/hud/panel/quickmenu.qc b/qcsrc/client/hud/panel/quickmenu.qc index 3233d1b9b..2b2f8ad0d 100644 --- a/qcsrc/client/hud/panel/quickmenu.qc +++ b/qcsrc/client/hud/panel/quickmenu.qc @@ -88,7 +88,7 @@ bool QuickMenu_Open(string mode, string submenu, string file) { fh = fopen(file, FILE_READ); if(fh < 0) - LOG_INFOF("Couldn't open file \"%s\", loading default quickmenu\n", file); + LOG_INFOF("Couldn't open file \"%s\", loading default quickmenu", file); } if(fh < 0) mode = "default"; diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc index 3a11bdb1e..d0e97ba47 100644 --- a/qcsrc/client/hud/panel/scoreboard.qc +++ b/qcsrc/client/hud/panel/scoreboard.qc @@ -475,7 +475,7 @@ LABEL(notfound) else { if(!nocomplain) - LOG_INFOF("^1Error:^7 Unknown score field: '%s'\n", str); + LOG_INFOF("^1Error:^7 Unknown score field: '%s'", str); continue; } LABEL(found) @@ -548,7 +548,7 @@ LABEL(found) sbt_field_size[sbt_num_fields] = stringwidth(sbt_field_title[sbt_num_fields], false, hud_fontsize); sbt_field[sbt_num_fields] = ps_secondary; ++sbt_num_fields; - LOG_INFOF("fixed missing field '%s'\n", scores_label(ps_secondary)); + LOG_INFOF("fixed missing field '%s'", scores_label(ps_secondary)); } if(!have_primary) { @@ -557,7 +557,7 @@ LABEL(found) sbt_field_size[sbt_num_fields] = stringwidth(sbt_field_title[sbt_num_fields], false, hud_fontsize); sbt_field[sbt_num_fields] = ps_primary; ++sbt_num_fields; - LOG_INFOF("fixed missing field '%s'\n", scores_label(ps_primary)); + LOG_INFOF("fixed missing field '%s'", scores_label(ps_primary)); } } diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 7ad10879f..ae624ef85 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -97,7 +97,7 @@ void CSQC_Init() prvm_language = strzone(cvar_string("prvm_language")); #ifdef WATERMARK - LOG_INFOF("^4CSQC Build information: ^1%s\n", WATERMARK); + LOG_INFOF("^4CSQC Build information: ^1%s", WATERMARK); #endif { @@ -414,7 +414,7 @@ NET_HANDLE(ENT_CLIENT_SCORES, bool isnew) if(!isNew && n != this.sv_entnum) { //print("A CSQC entity changed its owner!\n"); - LOG_INFOF("A CSQC entity changed its owner! (edict: %d, classname: %s)\n", etof(this), this.classname); + LOG_INFOF("A CSQC entity changed its owner! (edict: %d, classname: %s)", etof(this), this.classname); isNew = true; Ent_Remove(this); } @@ -826,7 +826,7 @@ void CSQC_Ent_Update(entity this, bool isnew) { if (t != this.enttype || isnew) { - LOG_INFOF("A CSQC entity changed its type! (edict: %d, server: %d, type: %d -> %d)\n", etof(this), this.entnum, this.enttype, t); + LOG_INFOF("A CSQC entity changed its type! (edict: %d, server: %d, type: %d -> %d)", etof(this), this.entnum, this.enttype, t); Ent_Remove(this); clearentity(this); isnew = true; @@ -836,7 +836,7 @@ void CSQC_Ent_Update(entity this, bool isnew) { if (!isnew) { - LOG_INFOF("A CSQC entity appeared out of nowhere! (edict: %d, server: %d, type: %d)\n", etof(this), this.entnum, t); + LOG_INFOF("A CSQC entity appeared out of nowhere! (edict: %d, server: %d, type: %d)", etof(this), this.entnum, t); isnew = true; } } @@ -846,7 +846,7 @@ void CSQC_Ent_Update(entity this, bool isnew) FOREACH(LinkedEntities, it.m_id == t, { if (isnew) this.classname = it.netname; if (autocvar_developer_csqcentities) - LOG_INFOF("CSQC_Ent_Update(%d) at %f with this=%i {.entnum=%d, .enttype=%d} t=%s (%d)\n", isnew, savetime, this, this.entnum, this.enttype, this.classname, t); + LOG_INFOF("CSQC_Ent_Update(%d) at %f with this=%i {.entnum=%d, .enttype=%d} t=%s (%d)", isnew, savetime, this, this.entnum, this.enttype, this.classname, t); done = it.m_read(this, NULL, isnew); MUTATOR_CALLHOOK(Ent_Update, this, isnew); break; @@ -886,7 +886,7 @@ void Ent_Remove(entity this) // CSQC_Ent_Remove : Called when the server requests a SSQC / CSQC entity to be removed. Essentially call remove(this) as well. void CSQC_Ent_Remove(entity this) { - if (autocvar_developer_csqcentities) LOG_INFOF("CSQC_Ent_Remove() with this=%i {.entnum=%d, .enttype=%d}\n", this, this.entnum, this.enttype); + if (autocvar_developer_csqcentities) LOG_INFOF("CSQC_Ent_Remove() with this=%i {.entnum=%d, .enttype=%d}", this, this.entnum, this.enttype); if (wasfreed(this)) { LOG_WARN("CSQC_Ent_Remove called for already removed entity. Packet loss?"); @@ -908,20 +908,20 @@ void Gamemode_Init() // CSQC_Parse_StuffCmd : Provides the stuffcmd string in the first parameter that the server provided. To execute standard behavior, simply execute localcmd with the string. void CSQC_Parse_StuffCmd(string strMessage) { - if (autocvar_developer_csqcentities) LOG_INFOF("CSQC_Parse_StuffCmd(\"%s\")\n", strMessage); + if (autocvar_developer_csqcentities) LOG_INFOF("CSQC_Parse_StuffCmd(\"%s\")", strMessage); localcmd(strMessage); } // CSQC_Parse_Print : Provides the print string in the first parameter that the server provided. To execute standard behavior, simply execute print with the string. void CSQC_Parse_Print(string strMessage) { - if (autocvar_developer_csqcentities) LOG_INFOF("CSQC_Parse_Print(\"%s\")\n", strMessage); + if (autocvar_developer_csqcentities) LOG_INFOF("CSQC_Parse_Print(\"%s\")", strMessage); print(ColorTranslateRGB(strMessage)); } // CSQC_Parse_CenterPrint : Provides the centerprint_hud string in the first parameter that the server provided. void CSQC_Parse_CenterPrint(string strMessage) { - if (autocvar_developer_csqcentities) LOG_INFOF("CSQC_Parse_CenterPrint(\"%s\")\n", strMessage); + if (autocvar_developer_csqcentities) LOG_INFOF("CSQC_Parse_CenterPrint(\"%s\")", strMessage); centerprint_hud(strMessage); } @@ -935,12 +935,12 @@ bool CSQC_Parse_TempEntity() FOREACH(TempEntities, it.m_id == nTEID, { if (autocvar_developer_csqcentities) - LOG_INFOF("CSQC_Parse_TempEntity() nTEID=%s (%d)\n", it.netname, nTEID); + LOG_INFOF("CSQC_Parse_TempEntity() nTEID=%s (%d)", it.netname, nTEID); return it.m_read(NULL, NULL, true); }); if (autocvar_developer_csqcentities) - LOG_INFOF("CSQC_Parse_TempEntity() with nTEID=%d\n", nTEID); + LOG_INFOF("CSQC_Parse_TempEntity() with nTEID=%d", nTEID); // No special logic for this temporary entity; return 0 so the engine can handle it return false; diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index 84a475a7d..9fc8a1563 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -569,7 +569,7 @@ void URI_Get_Callback(int id, int status, string data) } else { - LOG_INFOF("Received HTTP request data for an invalid id %d.\n", id); + LOG_INFOF("Received HTTP request data for an invalid id %d.", id); } } diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index e4f38b24c..7a0546063 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -1782,7 +1782,7 @@ void CSQC_UpdateView(entity this, float w, float h) ov_enabled = true; #if 0 - LOG_INFOF("OrthoView: org = %s, angles = %s, distance = %f, nearest = %f, furthest = %f\n", + LOG_INFOF("OrthoView: org = %s, angles = %s, distance = %f, nearest = %f, furthest = %f", vtos(ov_org), vtos(getpropertyvec(VF_ANGLES)), ov_distance, diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc index 9b4cdfe8a..c500e7d2e 100644 --- a/qcsrc/common/command/generic.qc +++ b/qcsrc/common/command/generic.qc @@ -375,10 +375,10 @@ void GenericCommand_restartnotifs(float request) int NOTIF_MULTI_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_MULTI, { ++NOTIF_MULTI_COUNT; }); int NOTIF_CHOICE_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_CHOICE, { ++NOTIF_CHOICE_COUNT; }); LOG_INFOF( - strcat( - "Restart_Notifications(): Restarting %d notifications... ", - "Counts: MSG_ANNCE = %d, MSG_INFO = %d, MSG_CENTER = %d, MSG_MULTI = %d, MSG_CHOICE = %d\n" - ), + ( + "Restart_Notifications(): Restarting %d notifications... " + "Counts: MSG_ANNCE = %d, MSG_INFO = %d, MSG_CENTER = %d, MSG_MULTI = %d, MSG_CHOICE = %d" + ), ( NOTIF_ANNCE_COUNT + NOTIF_INFO_COUNT + @@ -531,7 +531,7 @@ GENERIC_COMMAND(runtest, "Run unit tests") { GenericCommand_runtest(request, arg void GenericCommand_macro_help() { - FOREACH(GENERIC_COMMANDS, true, LOG_INFOF(" ^2%s^7: %s\n", it.m_name, it.m_description)); + FOREACH(GENERIC_COMMANDS, true, LOG_INFOF(" ^2%s^7: %s", it.m_name, it.m_description)); } float GenericCommand_macro_command(float argc, string command) diff --git a/qcsrc/common/debug.qh b/qcsrc/common/debug.qh index 7fee4258e..8bcea523d 100644 --- a/qcsrc/common/debug.qh +++ b/qcsrc/common/debug.qh @@ -170,7 +170,7 @@ bool autocvar_debugdraw; e.debug = true; --rem; } - LOG_INFOF("%d server entities sent\n", n - rem); + LOG_INFOF("%d server entities sent", n - rem); return; } @@ -194,7 +194,7 @@ GENERIC_COMMAND(bufstr_get, "Examine a string buffer object") int bufhandle = stof(argv(1)); int string_index = stof(argv(2)); string s = bufstr_get(bufhandle, string_index); - LOG_INFOF("%s\n", s); + LOG_INFOF("%s", s); return; } @@ -326,11 +326,11 @@ GENERIC_COMMAND(find, "Search through entities for matching classname") int entcnt = 0; FOREACH_ENTITY_CLASS_ORDERED(argv(1), true, { - LOG_INFOF("%i (%s)\n", it, it.classname); + LOG_INFOF("%i (%s)", it, it.classname); ++entcnt; }); if(entcnt) - LOG_INFOF("Found %d entities\n", entcnt); + LOG_INFOF("Found %d entities", entcnt); return; } @@ -354,7 +354,7 @@ GENERIC_COMMAND(findat, "Search through entities for matching origin") case CMD_REQUEST_COMMAND: { vector match = stov(argv(1)); - FOREACH_ENTITY_ORDERED(it.origin == match, LOG_INFOF("%i (%s)\n", it, it.classname)); + FOREACH_ENTITY_ORDERED(it.origin == match, LOG_INFOF("%i (%s)", it, it.classname)); return; } diff --git a/qcsrc/common/effects/effectinfo.qc b/qcsrc/common/effects/effectinfo.qc index aa523c2d8..bd83b3e66 100644 --- a/qcsrc/common/effects/effectinfo.qc +++ b/qcsrc/common/effects/effectinfo.qc @@ -303,8 +303,8 @@ GENERIC_COMMAND(dumpeffectinfo, "Dump all effectinfo to effectinfo_dump.txt") int fh = fopen(filename, FILE_WRITE); if (fh >= 0) { effectinfo_dump(fh, alsoprint); - LOG_INFOF("Dumping effectinfo... File located at ^2data/data/%s^7.\n", filename); - LOG_INFOF("Reload with ^2cl_particles_reloadeffects data/%s^7.\n", filename); + LOG_INFOF("Dumping effectinfo... File located at ^2data/data/%s^7.", filename); + LOG_INFOF("Reload with ^2cl_particles_reloadeffects data/%s^7.", filename); fclose(fh); } else { LOG_WARNF("Could not open file '%s'!", filename); diff --git a/qcsrc/common/items/item/pickup.qh b/qcsrc/common/items/item/pickup.qh index fae573c70..39cf78cc3 100644 --- a/qcsrc/common/items/item/pickup.qh +++ b/qcsrc/common/items/item/pickup.qh @@ -37,7 +37,7 @@ CLASS(Pickup, GameItem) METHOD(Pickup, show, void(Pickup this)) { TC(Pickup, this); - LOG_INFOF("%s: %s\n", etos(this), this.m_name); + LOG_INFOF("%s: %s", etos(this), this.m_name); } ATTRIB(Pickup, m_itemid, int, 0); #ifdef SVQC diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc index 9e2039223..6dec163fa 100644 --- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc +++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc @@ -530,7 +530,7 @@ void Draw_WaypointSprite(entity this) if (rgb == '0 0 0') { this.teamradar_color = '1 0 1'; - LOG_INFOF("WARNING: sprite of name %s has no color, using pink so you notice it\n", spriteimage); + LOG_INFOF("WARNING: sprite of name %s has no color, using pink so you notice it", spriteimage); } if (time - floor(time) > 0.5) diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc index 9fac59d5b..b9350758a 100644 --- a/qcsrc/common/notifications/all.qc +++ b/qcsrc/common/notifications/all.qc @@ -200,7 +200,7 @@ string Process_Notif_Line( LOG_INFOF( ( "^1TRAILING NEW LINE AT END OF NOTIFICATION: " - "^7net_type = %s, net_name = %s, string = %s.\n" + "^7net_type = %s, net_name = %s, string = %s." ), notiftype, notifname, @@ -235,7 +235,7 @@ string Process_Notif_Args( LOG_INFOF( ( "^1NOTIFICATION HAS TOO MANY ARGUMENTS: " - "^7net_type = %s, net_name = %s, max args = %d.\n" + "^7net_type = %s, net_name = %s, max args = %d." ), notiftype, notifname, @@ -267,7 +267,7 @@ string Process_Notif_Args( LOG_INFOF( ( "^1NOTIFICATION WITH UNKNOWN TOKEN IN ARGUMENT STRING: " - "^7net_type = %s, net_name = %s, args arg = '%s'.\n" + "^7net_type = %s, net_name = %s, args arg = '%s'." ), notiftype, notifname, @@ -286,7 +286,7 @@ string Process_Notif_Args( LOG_INFOF( ( "^1NOTIFICATION HAS TOO MANY ARGUMENTS: " - "^7net_type = %s, net_name = %s, max hudargs = %d.\n" + "^7net_type = %s, net_name = %s, max hudargs = %d." ), notiftype, notifname, @@ -318,7 +318,7 @@ string Process_Notif_Args( LOG_INFOF( ( "^1NOTIFICATION WITH UNKNOWN TOKEN IN ARGUMENT STRING: " - "^7net_type = %s, net_name = %s, hudargs arg = '%s'.\n" + "^7net_type = %s, net_name = %s, hudargs arg = '%s'." ), notiftype, notifname, @@ -337,7 +337,7 @@ string Process_Notif_Args( LOG_INFOF( ( "^1NOTIFICATION HAS TOO MANY ARGUMENTS: " - "^7net_type = %s, net_name = %s, max durcnt = %d.\n" + "^7net_type = %s, net_name = %s, max durcnt = %d." ), notiftype, notifname, @@ -372,7 +372,7 @@ string Process_Notif_Args( LOG_INFOF( ( "^1NOTIFICATION WITH UNKNOWN TOKEN IN ARGUMENT STRING: " - "^7net_type = %s, net_name = %s, durcnt arg = '%s'.\n" + "^7net_type = %s, net_name = %s, durcnt arg = '%s'." ), notiftype, notifname, @@ -421,7 +421,7 @@ void Create_Notification_Entity(entity notif, LOG_INFOF( ( "^1NOTIFICATION WITH IMPROPER TYPE: " - "^7net_type = %d, net_name = %s.\n" + "^7net_type = %d, net_name = %s." ), typeId, namestring @@ -471,7 +471,7 @@ void Create_Notification_Entity_Annce(entity notif, LOG_INFOF( ( "^1NOTIFICATION WITH NO SOUND: " - "^7net_type = %s, net_name = %s.\n" + "^7net_type = %s, net_name = %s." ), typestring, namestring @@ -529,7 +529,7 @@ void Create_Notification_Entity_InfoCenter(entity notif, LOG_INFOF( ( "^1NOTIFICATION HAS ARG COUNTS BUT NO ARGS OR HUDARGS OR DURCNT: " - "^7net_type = %s, net_name = %s, strnum = %d, flnum = %d\n" + "^7net_type = %s, net_name = %s, strnum = %d, flnum = %d" ), typestring, namestring, @@ -563,7 +563,7 @@ void Create_Notification_Entity_InfoCenter(entity notif, LOG_INFOF( ( "^1NOTIFICATION HAS HUDARGS BUT NO ICON: " - "^7net_type = %s, net_name = %s.\n" + "^7net_type = %s, net_name = %s." ), typestring, namestring @@ -635,7 +635,7 @@ void Create_Notification_Entity_InfoCenter(entity notif, LOG_INFOF( ( "^1EMPTY NOTIFICATION: " - "^7net_type = %s, net_name = %s.\n" + "^7net_type = %s, net_name = %s." ), typestring, namestring @@ -661,7 +661,7 @@ void Create_Notification_Entity_Multi(entity notif, LOG_INFOF( ( "^1NOTIFICATION WITH NO SUBCALLS: " - "^7net_type = %s, net_name = %s.\n" + "^7net_type = %s, net_name = %s." ), typestring, namestring @@ -713,7 +713,7 @@ void Create_Notification_Entity_Choice(entity notif, LOG_INFOF( ( "^1NOTIFICATION IS MISSING CHOICE PARAMS: " - "^7net_type = %s, net_name = %s.\n" + "^7net_type = %s, net_name = %s." ), typestring, namestring diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh index 36bf248eb..42ac1e607 100644 --- a/qcsrc/common/notifications/all.qh +++ b/qcsrc/common/notifications/all.qh @@ -181,12 +181,12 @@ GENERIC_COMMAND(dumpnotifs, "Dump all notifications into notifications_dump.txt" if (fh >= 0) { Dump_Notifications(fh, alsoprint); - LOG_INFOF("Dumping notifications... File located in ^2data/data/%s^7.\n", filename); + LOG_INFOF("Dumping notifications... File located in ^2data/data/%s^7.", filename); fclose(fh); } else { - LOG_INFOF("^1Error: ^7Could not open file '%s'!\n", filename); + LOG_INFOF("^1Error: ^7Could not open file '%s'!", filename); } #else LOG_INFO(_("Notification dump command only works with cl_cmd and sv_cmd.\n")); diff --git a/qcsrc/common/playerstats.qc b/qcsrc/common/playerstats.qc index 4e0ffe6c0..b511710f5 100644 --- a/qcsrc/common/playerstats.qc +++ b/qcsrc/common/playerstats.qc @@ -613,7 +613,7 @@ void PlayerStats_PlayerBasic_Handler(entity fh, entity p, float status) float i = 0; for(e = PS_D_IN_EVL; (en = db_get(PS_D_IN_DB, e)) != ""; e = en) { - LOG_INFOF("%d:%s:%s\n", i, e, db_get(PS_D_IN_DB, sprintf("#%s", e))); + LOG_INFOF("%d:%s:%s", i, e, db_get(PS_D_IN_DB, sprintf("#%s", e))); ++i; } #endif @@ -679,7 +679,7 @@ void PlayerStats_PlayerDetail_CheckUpdate() float gamecount = cvar("cl_matchcount"); #if 0 - LOG_INFOF("PlayerStats_PlayerDetail_CheckUpdate(): %f >= %f, %d > %d\n", + LOG_INFOF("PlayerStats_PlayerDetail_CheckUpdate(): %f >= %f, %d > %d", time, PS_D_NEXTUPDATETIME, PS_D_LASTGAMECOUNT, @@ -782,7 +782,7 @@ void PlayerStats_PlayerDetail_Handler(entity fh, entity unused, float status) "PlayerStats_PlayerDetail_Handler(): ERROR: " "Key went unhandled? Is our version outdated?\n" "PlayerStats_PlayerDetail_Handler(): " - "Key '%s', Event '%s', Data '%s'\n", + "Key '%s', Event '%s', Data '%s'", key, event, data @@ -794,7 +794,7 @@ void PlayerStats_PlayerDetail_Handler(entity fh, entity unused, float status) #if 0 LOG_INFOF( "PlayerStats_PlayerDetail_Handler(): " - "Key '%s', Event '%s', Data '%s'\n", + "Key '%s', Event '%s', Data '%s'", key, event, data diff --git a/qcsrc/common/turrets/all.qh b/qcsrc/common/turrets/all.qh index 7160c2f3e..fc3d5a7bc 100644 --- a/qcsrc/common/turrets/all.qh +++ b/qcsrc/common/turrets/all.qh @@ -38,14 +38,14 @@ GENERIC_COMMAND(dumpturrets, "Dump all turrets into turrets_dump.txt") if(tur_config_file >= 0) { Dump_Turret_Settings(); - LOG_INFOF("Dumping turrets... File located in ^2data/data/%s^7.\n", filename); + LOG_INFOF("Dumping turrets... File located in ^2data/data/%s^7.", filename); fclose(tur_config_file); tur_config_file = -1; tur_config_alsoprint = -1; } else { - LOG_INFOF("^1Error: ^7Could not open file '%s'!\n", filename); + LOG_INFOF("^1Error: ^7Could not open file '%s'!", filename); } #else LOG_INFO(_("Turrets dump command only works with sv_cmd.\n")); diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc index 11d5e5d72..d75e4a925 100644 --- a/qcsrc/common/turrets/cl_turrets.qc +++ b/qcsrc/common/turrets/cl_turrets.qc @@ -112,7 +112,7 @@ void turret_draw2d(entity this) if(rgb == '0 0 0') { this.teamradar_color = '1 0 1'; - LOG_INFOF("WARNING: sprite of name %s has no color, using pink so you notice it\n", spriteimage); + LOG_INFOF("WARNING: sprite of name %s has no color, using pink so you notice it", spriteimage); } txt = this.netname; diff --git a/qcsrc/common/turrets/config.qc b/qcsrc/common/turrets/config.qc index 0d745b9c6..effabeac2 100644 --- a/qcsrc/common/turrets/config.qc +++ b/qcsrc/common/turrets/config.qc @@ -50,7 +50,7 @@ void Dump_Turret_Settings() TUR_CONFIG_WRITETOFILE("// }}}\n") // step 5: debug info - LOG_INFOF("#%d: %s: %d settings...\n", i, it.turret_name, TUR_CONFIG_COUNT); + LOG_INFOF("#%d: %s: %d settings...", i, it.turret_name, TUR_CONFIG_COUNT); totalsettings += TUR_CONFIG_COUNT; }); @@ -60,7 +60,7 @@ void Dump_Turret_Settings() config_queue[j] = string_null; // extra information - LOG_INFOF("Totals: %d turrets, %d settings\n", (Turrets_COUNT - 1), totalsettings); + LOG_INFOF("Totals: %d turrets, %d settings", (Turrets_COUNT - 1), totalsettings); } #endif diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc index 81eb7744d..c545aaa88 100644 --- a/qcsrc/common/util.qc +++ b/qcsrc/common/util.qc @@ -598,7 +598,7 @@ float cvar_settemp(string tmp_cvar, string tmp_value) if(!cvar_type(tmp_cvar)) { - LOG_INFOF("Error: cvar %s doesn't exist!\n", tmp_cvar); + LOG_INFOF("Error: cvar %s doesn't exist!", tmp_cvar); return 0; } @@ -640,7 +640,7 @@ int cvar_settemp_restore() ++j; } else - LOG_INFOF("Error: cvar %s doesn't exist anymore! It can still be restored once it's manually recreated.\n", it.netname); + LOG_INFOF("Error: cvar %s doesn't exist anymore! It can still be restored once it's manually recreated.", it.netname); }); #else @@ -654,7 +654,7 @@ int cvar_settemp_restore() ++j; } else - print(sprintf("Error: cvar %s doesn't exist anymore! It can still be restored once it's manually recreated.\n", e.netname)); + print(sprintf("Error: cvar %s doesn't exist anymore! It can still be restored once it's manually recreated.", e.netname)); } #endif diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index 32f136dbc..fb060df8a 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -639,7 +639,7 @@ CLIENT_COMMAND(weapon_find, "Show spawn locations of a weapon") } default: { - LOG_INFOF("Incorrect parameters for ^2%s^7\n", "weapon_find"); + LOG_INFOF("Incorrect parameters for ^2%s^7", "weapon_find"); } case CMD_REQUEST_USAGE: { diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index 26cf121fe..bdd8c8d6f 100644 --- a/qcsrc/common/weapons/all.qh +++ b/qcsrc/common/weapons/all.qh @@ -64,14 +64,14 @@ GENERIC_COMMAND(dumpweapons, "Dump all weapons into weapons_dump.txt") // WEAPON if(wep_config_file >= 0) { Dump_Weapon_Settings(); - LOG_INFOF("Dumping weapons... File located in ^2data/data/%s^7.\n", filename); + LOG_INFOF("Dumping weapons... File located in ^2data/data/%s^7.", filename); fclose(wep_config_file); wep_config_file = -1; wep_config_alsoprint = -1; } else { - LOG_INFOF("^1Error: ^7Could not open file '%s'!\n", filename); + LOG_INFOF("^1Error: ^7Could not open file '%s'!", filename); } #else LOG_INFO(_("Weapons dump command only works with sv_cmd.\n")); diff --git a/qcsrc/common/weapons/calculations.qc b/qcsrc/common/weapons/calculations.qc index 513af5209..3323d8e36 100644 --- a/qcsrc/common/weapons/calculations.qc +++ b/qcsrc/common/weapons/calculations.qc @@ -57,7 +57,7 @@ vector damage_explosion_calcpush(vector explosion_f, vector target_v, float spee v = explosion_calcpush(explosion_f * speedfactor, m, target_v, 1, 0); // the factor we then get is: // 1 - LOG_INFOF("MASS: %f\nv: %v -> %v\nENERGY BEFORE == %f + %f = %f\nENERGY AFTER >= %f\n", + LOG_INFOF("MASS: %f\nv: %v -> %v\nENERGY BEFORE == %f + %f = %f\nENERGY AFTER >= %f", m, target_v, target_v + v, target_v * target_v, m * explosion_f * speedfactor * explosion_f * speedfactor, target_v * target_v + m * explosion_f * speedfactor * explosion_f * speedfactor, diff --git a/qcsrc/common/weapons/config.qc b/qcsrc/common/weapons/config.qc index d13587c15..d2443f167 100644 --- a/qcsrc/common/weapons/config.qc +++ b/qcsrc/common/weapons/config.qc @@ -48,7 +48,7 @@ void Dump_Weapon_Settings() WEP_CONFIG_WRITETOFILE("// }}}\n"); // step 5: debug info - LOG_INFOF("#%d: %s: %d settings...\n", i, it.m_name, WEP_CONFIG_COUNT); + LOG_INFOF("#%d: %s: %d settings...", i, it.m_name, WEP_CONFIG_COUNT); totalweapons += 1; totalsettings += WEP_CONFIG_COUNT; }); @@ -59,5 +59,5 @@ void Dump_Weapon_Settings() config_queue[x] = string_null; // extra information - LOG_INFOF("Totals: %d weapons, %d settings\n", totalweapons, totalsettings); + LOG_INFOF("Totals: %d weapons, %d settings", totalweapons, totalsettings); } diff --git a/qcsrc/common/weapons/weapon/devastator.qc b/qcsrc/common/weapons/weapon/devastator.qc index 6e618c88e..88d50f80a 100644 --- a/qcsrc/common/weapons/weapon/devastator.qc +++ b/qcsrc/common/weapons/weapon/devastator.qc @@ -489,14 +489,14 @@ METHOD(Devastator, wr_checkammo1, bool(entity thiswep, entity actor, .entity wea #if 0 if(actor.rl_release == 0) { - LOG_INFOF("W_Devastator(WR_CHECKAMMO1): %d, %.2f, %d: TRUE\n", actor.rl_release, actor.(thiswep.ammo_field), WEP_CVAR(devastator, ammo)); + LOG_INFOF("W_Devastator(WR_CHECKAMMO1): %d, %.2f, %d: TRUE", actor.rl_release, actor.(thiswep.ammo_field), WEP_CVAR(devastator, ammo)); return true; } else { ammo_amount = actor.(thiswep.ammo_field) >= WEP_CVAR(devastator, ammo); ammo_amount += actor.(weaponentity).(weapon_load[WEP_DEVASTATOR.m_id]) >= WEP_CVAR(devastator, ammo); - LOG_INFOF("W_Devastator(WR_CHECKAMMO1): %d, %.2f, %d: %s\n", actor.rl_release, actor.(thiswep.ammo_field), WEP_CVAR(devastator, ammo), (ammo_amount ? "TRUE" : "FALSE")); + LOG_INFOF("W_Devastator(WR_CHECKAMMO1): %d, %.2f, %d: %s", actor.rl_release, actor.(thiswep.ammo_field), WEP_CVAR(devastator, ammo), (ammo_amount ? "TRUE" : "FALSE")); return ammo_amount; } #else diff --git a/qcsrc/common/weapons/weapon/shockwave.qc b/qcsrc/common/weapons/weapon/shockwave.qc index 8b976e247..bc9e94767 100644 --- a/qcsrc/common/weapons/weapon/shockwave.qc +++ b/qcsrc/common/weapons/weapon/shockwave.qc @@ -111,7 +111,7 @@ void W_Shockwave_Melee_Think(entity this) #ifdef DEBUG_SHOCKWAVE LOG_INFOF( - "MELEE: %s hitting %s with %f damage (factor: %f) at %f time.\n", + "MELEE: %s hitting %s with %f damage (factor: %f) at %f time.", this.realowner.netname, target_victim.netname, swing_damage, @@ -399,7 +399,7 @@ void W_Shockwave_Attack(entity actor, .entity weaponentity) #ifdef DEBUG_SHOCKWAVE LOG_INFOF( "SELF HIT: multiplier = %f, damage = %f, force = %f... " - "multiplier_from_accuracy = %f, multiplier_from_distance = %f.\n", + "multiplier_from_accuracy = %f, multiplier_from_distance = %f.", multiplier, final_damage, vlen(final_force), @@ -462,7 +462,7 @@ void W_Shockwave_Attack(entity actor, .entity weaponentity) #ifdef DEBUG_SHOCKWAVE LOG_INFOF( "SPLASH HIT: multiplier = %f, damage = %f, force = %f... " - "multiplier_from_accuracy = %f, multiplier_from_distance = %f.\n", + "multiplier_from_accuracy = %f, multiplier_from_distance = %f.", multiplier, final_damage, vlen(final_force), @@ -551,7 +551,7 @@ void W_Shockwave_Attack(entity actor, .entity weaponentity) #ifdef DEBUG_SHOCKWAVE LOG_INFOF( "BLAST HIT: multiplier = %f, damage = %f, force = %f... " - "multiplier_from_accuracy = %f, multiplier_from_distance = %f.\n", + "multiplier_from_accuracy = %f, multiplier_from_distance = %f.", multiplier, final_damage, vlen(final_force), @@ -585,7 +585,7 @@ void W_Shockwave_Attack(entity actor, .entity weaponentity) #ifdef DEBUG_SHOCKWAVE LOG_INFOF( - "SHOCKWAVE by %s: damage = %f, force = %f.\n", + "SHOCKWAVE by %s: damage = %f, force = %f.", actor.netname, final_damage, vlen(final_force) diff --git a/qcsrc/lib/test.qc b/qcsrc/lib/test.qc index 0997e53a4..3fbf7924c 100644 --- a/qcsrc/lib/test.qc +++ b/qcsrc/lib/test.qc @@ -6,7 +6,7 @@ bool RUN_ALL_TESTS() int f = TEST_RunAll_accumulated(0); if (f) { - LOG_INFOF("%d tests failed\n", f); + LOG_INFOF("%d tests failed", f); return true; } else @@ -18,7 +18,7 @@ bool RUN_ALL_TESTS() bool TEST_Run(string s) { - LOG_INFOF("%s: testing...\n", s); + LOG_INFOF("%s: testing...", s); TEST_failed = 0; TEST_fatal = 0; TEST_ok = false; @@ -26,12 +26,12 @@ bool TEST_Run(string s) if (isfunction(fn)) callfunction(fn); if (TEST_failed > 0) { - LOG_INFOF("%s: %d items failed.\n", s, TEST_failed); + LOG_INFOF("%s: %d items failed.", s, TEST_failed); return false; } else if (!TEST_ok) { - LOG_INFOF("%s: did not complete.\n", s); + LOG_INFOF("%s: did not complete.", s); return false; } return true; diff --git a/qcsrc/lib/urllib.qc b/qcsrc/lib/urllib.qc index fd8b16d88..3a206ca56 100644 --- a/qcsrc/lib/urllib.qc +++ b/qcsrc/lib/urllib.qc @@ -35,7 +35,7 @@ float url_URI_Get_Callback(int id, float status, string data) if (!e) return 0; if (e.url_rbuf >= 0 || e.url_wbuf >= 0) { - LOG_INFOF("WARNING: handle %d (%s) has already received data?!?\n", id + NUM_URL_ID, e.url_url); + LOG_INFOF("WARNING: handle %d (%s) has already received data?!?", id + NUM_URL_ID, e.url_url); return 0; } diff --git a/qcsrc/menu/command/menu_cmd.qc b/qcsrc/menu/command/menu_cmd.qc index 8859b407f..4b2046faf 100644 --- a/qcsrc/menu/command/menu_cmd.qc +++ b/qcsrc/menu/command/menu_cmd.qc @@ -86,7 +86,7 @@ void GameCommand(string theCommand) if (!startsWith(s, filter)) continue; s = substring(s, strlen(filter), strlen(s) - strlen(filter)); } - LOG_INFOF(" %s\n", s); + LOG_INFOF(" %s", s); }); } else if (argc == 2 && !isdemo()) // don't allow this command in demos diff --git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc index f0e6646ca..af14e0842 100644 --- a/qcsrc/menu/menu.qc +++ b/qcsrc/menu/menu.qc @@ -69,7 +69,7 @@ void m_init() cvar_set("_menu_prvm_language", prvm_language); #ifdef WATERMARK - LOG_INFOF("^4MQC Build information: ^1%s\n", WATERMARK); + LOG_INFOF("^4MQC Build information: ^1%s", WATERMARK); #endif // list all game dirs (TEST) diff --git a/qcsrc/menu/xonotic/serverlist.qc b/qcsrc/menu/xonotic/serverlist.qc index ad9e38f03..5e6a567b6 100644 --- a/qcsrc/menu/xonotic/serverlist.qc +++ b/qcsrc/menu/xonotic/serverlist.qc @@ -45,7 +45,7 @@ void RegisterSLCategories() else \ { \ LOG_INFOF( \ - "RegisterSLCategories(): Improper override '%s' for category '%s'!\n", \ + "RegisterSLCategories(): Improper override '%s' for category '%s'!", \ s, \ categories[i].cat_name \ ); \ diff --git a/qcsrc/menu/xonotic/slider_decibels.qc b/qcsrc/menu/xonotic/slider_decibels.qc index dcc2c85b0..e26076b65 100644 --- a/qcsrc/menu/xonotic/slider_decibels.qc +++ b/qcsrc/menu/xonotic/slider_decibels.qc @@ -92,7 +92,7 @@ TEST(XonoticDecibelsSlider, SoundTest) float v = fromDecibelOfSquare(db, -40); float dbv = toDecibelOfSquare(v, -40); float d = dbv - db; - LOG_INFOF("%f -> %f -> %f (diff: %f)\n", db, v, dbv, d); + LOG_INFOF("%f -> %f -> %f (diff: %f)", db, v, dbv, d); EXPECT_GT(fabs(d), 0.02); } SUCCEED(); diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc index 7f038a85f..03a4073df 100644 --- a/qcsrc/menu/xonotic/util.qc +++ b/qcsrc/menu/xonotic/util.qc @@ -306,7 +306,7 @@ void URI_Get_Callback(float id, float status, string data) } else { - LOG_INFOF("Received HTTP request data for an invalid id %d.\n", id); + LOG_INFOF("Received HTTP request data for an invalid id %d.", id); } } @@ -414,7 +414,7 @@ void UpdateNotification_URI_Get_Callback(float id, float status, string data) { // update needed _Nex_ExtResponseSystem_UpdateTo = strzone(un_version); - if(un_download) { LOG_INFOF(_("Update can be downloaded at:\n%s\n"), un_download); } + if(un_download) { LOG_INFOF(_("Update can be downloaded at:\n%s"), un_download); } if(un_url) { _Nex_ExtResponseSystem_UpdateToURL = strzone(un_url); } DisableServerBackwardsCompatibility(); } @@ -830,7 +830,7 @@ void CheckSendCvars(entity me, string cvarnamestring) { if(me.sendCvars) { - LOG_INFOF("Sending cvar: %s -> %s\n", cvarnamestring, cvar_string(cvarnamestring)); + LOG_INFOF("Sending cvar: %s -> %s", cvarnamestring, cvar_string(cvarnamestring)); if(gamestatus & (GAME_CONNECTED | GAME_ISSERVER)) { cmd(sprintf("\nsendcvar %s\n", cvarnamestring)); diff --git a/qcsrc/server/bot/default/scripting.qc b/qcsrc/server/bot/default/scripting.qc index b98317e36..27fb0a234 100644 --- a/qcsrc/server/bot/default/scripting.qc +++ b/qcsrc/server/bot/default/scripting.qc @@ -315,7 +315,7 @@ float bot_decodecommand(string cmdstring) case BOT_CMD_PARAMETER_VECTOR: if(substring(parm, 0, 1) != "\'") { - LOG_INFOF("ERROR: expected vector type \'x y z\', got %s\n", parm); + LOG_INFOF("ERROR: expected vector type \'x y z\', got %s", parm); return 0; } bot_cmd.bot_cmd_parm_vector = stov(parm); diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc index f08fc75a1..2066e7154 100644 --- a/qcsrc/server/bot/default/waypoints.qc +++ b/qcsrc/server/bot/default/waypoints.qc @@ -615,7 +615,7 @@ void waypoint_save_links() int file = fopen(filename, FILE_WRITE); if (file < 0) { - LOG_INFOF("waypoint link save to %s failed\n", filename); + LOG_INFOF("waypoint link save to %s failed", filename); return; } @@ -636,7 +636,7 @@ void waypoint_save_links() fclose(file); botframe_cachedwaypointlinks = true; - LOG_INFOF("saved %d waypoint links to maps/%s.waypoints.cache\n", c, mapname); + LOG_INFOF("saved %d waypoint links to maps/%s.waypoints.cache", c, mapname); waypoint_load_links_hardwired(); } @@ -651,7 +651,7 @@ void waypoint_saveall() waypoint_save_links(); // save anyway? botframe_loadedforcedlinks = false; - LOG_INFOF("waypoint links: save to %s failed\n", filename); + LOG_INFOF("waypoint links: save to %s failed", filename); return; } @@ -674,7 +674,7 @@ void waypoint_saveall() waypoint_save_links(); botframe_loadedforcedlinks = false; - LOG_INFOF("saved %d waypoints to maps/%s.waypoints\n", c, mapname); + LOG_INFOF("saved %d waypoints to maps/%s.waypoints", c, mapname); } // load waypoints from file @@ -1119,7 +1119,7 @@ LABEL(next) IL_EACH(g_waypoints, !(it.wpflags & (WAYPOINTFLAG_USEFUL | WAYPOINTFLAG_DEAD_END)), { - LOG_INFOF("Removed a waypoint at %v. Try again for more!\n", it.origin); + LOG_INFOF("Removed a waypoint at %v. Try again for more!", it.origin); te_explosion(it.origin); waypoint_remove(it); break; diff --git a/qcsrc/server/command/sv_cmd.qc b/qcsrc/server/command/sv_cmd.qc index c12335829..35a3c73aa 100644 --- a/qcsrc/server/command/sv_cmd.qc +++ b/qcsrc/server/command/sv_cmd.qc @@ -303,9 +303,9 @@ void GameCommand_bbox(float request) NULL); size_max.z = (trace_startsolid) ? world.absmax.z : trace_endpos.z; - LOG_INFOF("Original size: %v %v\n", world.absmin, world.absmax); - LOG_INFOF("Currently set size: %v %v\n", world.mins, world.maxs); - LOG_INFOF("Solid bounding box size: %v %v\n", size_min, size_max); + LOG_INFOF("Original size: %v %v", world.absmin, world.absmax); + LOG_INFOF("Currently set size: %v %v", world.mins, world.maxs); + LOG_INFOF("Solid bounding box size: %v %v", size_min, size_max); return; } @@ -1735,7 +1735,7 @@ SERVER_COMMAND(warp, "Choose different level in campaign") { GameCommand_warp(re void GameCommand_macro_help() { - FOREACH(SERVER_COMMANDS, true, { LOG_INFOF(" ^2%s^7: %s\n", it.m_name, it.m_description); }); + FOREACH(SERVER_COMMANDS, true, { LOG_INFOF(" ^2%s^7: %s", it.m_name, it.m_description); }); } float GameCommand_macro_command(float argc, string command) diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index d96c28bf1..4e6820fd5 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -1064,7 +1064,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in force = force * a; if(autocvar_g_throughfloor_debug) - LOG_INFOF(" D=%f F=%f\n", finaldmg, vlen(force)); + LOG_INFOF(" D=%f F=%f", finaldmg, vlen(force)); } //if (targ == attacker) diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 4a851b18d..6c6a71d51 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -653,7 +653,7 @@ spawnfunc(worldspawn) fclose(sentinel); if (switchversion != "" && switchversion != WATERMARK) { - LOG_INFOF("Switching progs: " WATERMARK " -> %s\n", switchversion); + LOG_INFOF("Switching progs: " WATERMARK " -> %s", switchversion); // if it doesn't exist, assume either: // a) the current program was overwritten // b) this is a client only update @@ -674,7 +674,7 @@ spawnfunc(worldspawn) } if (wantrestart) { - LOG_INFOF("Restart requested\n"); + LOG_INFOF("Restart requested"); changelevel(mapname); // let initialization continue, shutdown depends on it } diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc index a8b272f4c..1dcc47d0f 100644 --- a/qcsrc/server/impulse.qc +++ b/qcsrc/server/impulse.qc @@ -716,7 +716,7 @@ IMPULSE(navwaypoint_unreachable) ++j; ++m; }); - if (j) LOG_INFOF("%d waypoints cannot be reached from here in any way (marked with blue light)\n", j); + if (j) LOG_INFOF("%d waypoints cannot be reached from here in any way (marked with blue light)", j); navigation_markroutes_inverted(e2); j = 0; @@ -729,8 +729,8 @@ IMPULSE(navwaypoint_unreachable) it.effects |= EF_NODEPTHTEST | EF_RED; ++j; }); - if (j) LOG_INFOF("%d waypoints cannot walk to here in any way (marked with red light)\n", j); - if (m) LOG_INFOF("%d waypoints have been marked total\n", m); + if (j) LOG_INFOF("%d waypoints cannot walk to here in any way (marked with red light)", j); + if (m) LOG_INFOF("%d waypoints have been marked total", m); j = 0; IL_EACH(g_spawnpoints, true, @@ -757,7 +757,7 @@ IMPULSE(navwaypoint_unreachable) ++j; } }); - if (j) LOG_INFOF("%d spawnpoints have no nearest waypoint (marked by player model)\n", j); + if (j) LOG_INFOF("%d spawnpoints have no nearest waypoint (marked by player model)", j); j = 0; IL_EACH(g_items, true, @@ -773,7 +773,7 @@ IMPULSE(navwaypoint_unreachable) it.colormod_x = 8; ++j; }); - if (j) LOG_INFOF("%d items have no nearest waypoint and cannot be walked away from (marked with red light)\n", j); + if (j) LOG_INFOF("%d items have no nearest waypoint and cannot be walked away from (marked with red light)", j); j = 0; IL_EACH(g_items, true, @@ -784,5 +784,5 @@ IMPULSE(navwaypoint_unreachable) it.colormod_z = 8; ++j; }); - if (j) LOG_INFOF("%d items have no nearest waypoint and cannot be walked to (marked with blue light)\n", j); + if (j) LOG_INFOF("%d items have no nearest waypoint and cannot be walked to (marked with blue light)", j); } -- 2.39.2