X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fdebug.qh;h=b349e22f2b7a1419bc62097f1ae6fd89fd587d61;hp=b26c19d9a7a718d1608da69e0a41c24165227896;hb=90d9f7c775306324957323d53d5a4ad995d999e3;hpb=a1a42d9340bc42ed74055a1bb52a62b53796f61f diff --git a/qcsrc/common/debug.qh b/qcsrc/common/debug.qh index b26c19d9a..b349e22f2 100644 --- a/qcsrc/common/debug.qh +++ b/qcsrc/common/debug.qh @@ -69,7 +69,7 @@ REGISTER_NET_TEMP(net_debug) * 6: on (.solid != 0) */ bool autocvar_debugdraw; -#endif +#endif // GAMEQC #ifdef CSQC string autocvar_debugdraw_filter, autocvar_debugdraw_filterout; @@ -161,8 +161,7 @@ bool autocvar_debugdraw; }); }); } -#endif - +#endif // CSQC #ifdef SVQC COMMON_COMMAND(debugdraw_sv, "Dump all server entities") @@ -188,16 +187,16 @@ bool autocvar_debugdraw; default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " debugdraw_sv"); + LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " debugdraw_sv"); return; } } } -#endif -#endif +#endif // SVQC +#endif // ENABLE_DEBUGDRAW -GENERIC_COMMAND(bufstr_get, "Examine a string buffer object") +GENERIC_COMMAND(bufstr_get, "Examine a string buffer object", false) { switch (request) { @@ -205,34 +204,33 @@ 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", s); + LOG_INFO(bufstr_get(bufhandle, string_index)); return; } default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " bufstr_get bufhandle string_index"); + LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " bufstr_get bufhandle string_index"); return; } } } -GENERIC_COMMAND(version, "Print the current version") +GENERIC_COMMAND(version, "Print the current version", false) { switch (request) { case CMD_REQUEST_COMMAND: { - LOG_INFO(WATERMARK); + LOG_INFO(PROGNAME, " version: ", WATERMARK); return; } default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " version"); + LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " version"); return; } } @@ -242,7 +240,8 @@ GENERIC_COMMAND(version, "Print the current version") #ifdef CSQC void(float bufhandle, string pattern, string antipattern) buf_cvarlist = #517; #endif -GENERIC_COMMAND(cvar_localchanges, "Print locally changed cvars") + +GENERIC_COMMAND(cvar_localchanges, "Print locally changed cvars", false) { switch (request) { @@ -267,7 +266,7 @@ GENERIC_COMMAND(cvar_localchanges, "Print locally changed cvars") default: case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " cvar_localchanges"); + LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " cvar_localchanges"); return; } } @@ -276,6 +275,7 @@ GENERIC_COMMAND(cvar_localchanges, "Print locally changed cvars") #if ENABLE_DEBUGTRACE REGISTER_STAT(TRACE_ENT, int) + #ifdef SVQC bool autocvar_debugtrace; @@ -296,7 +296,7 @@ MUTATOR_HOOKFUNCTION(trace, SV_StartFrame) it.solid = SOLID_BBOX; }); vector forward = '0 0 0'; vector right = '0 0 0'; vector up = '0 0 0'; - MAKEVECTORS(makevectors, it.v_angle, forward, right, up); + MAKE_VECTORS(it.v_angle, forward, right, up); vector pos = it.origin + it.view_ofs; traceline(pos, pos + forward * max_shot_distance, MOVE_NORMAL, it); FOREACH_ENTITY(true, { @@ -311,7 +311,8 @@ MUTATOR_HOOKFUNCTION(trace, SV_StartFrame) stuffcmd(it, sprintf("prvm_edict server %d\n", i)); }); } -#endif +#endif // SVQC + #ifdef CSQC entity TRACE_ENT; void Trace_draw2d(entity this) @@ -329,11 +330,12 @@ STATIC_INIT(TRACE_ENT) e.draw2d = Trace_draw2d; IL_PUSH(g_drawables_2d, e); } -#endif +#endif // CSQC + #endif -GENERIC_COMMAND(find, "Search through entities for matching classname") +GENERIC_COMMAND(findent, "Search through entities for matching classname", false) { switch (request) { @@ -351,20 +353,18 @@ GENERIC_COMMAND(find, "Search through entities for matching classname") } default: - { - LOG_INFO("Incorrect parameters for ^2find^7"); - } + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 " GetProgramCommandPrefix() " find classname"); - LOG_INFO(" Where 'classname' is the classname to search for."); + LOG_HELP("Usage:^3 " GetProgramCommandPrefix() " find classname"); + LOG_HELP(" Where 'classname' is the classname to search for."); return; } } } -GENERIC_COMMAND(findat, "Search through entities for matching origin") +GENERIC_COMMAND(findat, "Search through entities for matching origin", false) { switch (request) { @@ -376,10 +376,10 @@ GENERIC_COMMAND(findat, "Search through entities for matching origin") } default: - LOG_INFO("Incorrect parameters for ^2findat^7"); + LOG_INFOF("Incorrect parameters for ^2%s^7", argv(0)); case CMD_REQUEST_USAGE: { - LOG_INFO("Usage:^3 " GetProgramCommandPrefix() " findat \"0 0 0\""); + LOG_HELP("Usage:^3 " GetProgramCommandPrefix() " findat \"x y z\""); return; } } @@ -400,14 +400,14 @@ CLASS(DebugText3d, Object) ATTRIB(DebugText3d, message, string); // the text (i wanted to use the .text field but then this whole macro-based-inheritance thing shat itself) ATTRIB(DebugText3d, health, float); // text alignment (recycled field) ATTRIB(DebugText3d, hit_time, float); // when it was created - ATTRIB(DebugText3d, fade_rate, float); // how fast is should disappear + ATTRIB(DebugText3d, fade_rate, float); // how fast it should disappear ATTRIB(DebugText3d, velocity, vector); CONSTRUCTOR(DebugText3d, vector pos, string msg, float align, float fade_rate_, vector vel) { CONSTRUCT(DebugText3d); this.origin = pos; this.message = strzone(msg); - SetResourceAmount(this, RESOURCE_HEALTH, align); + SetResource(this, RES_HEALTH, align); this.hit_time = time; this.fade_rate = fade_rate_; this.velocity = vel; @@ -432,7 +432,7 @@ CLASS(DebugText3d, Object) if (screen_pos.z < 0) return; // behind camera screen_pos.z = 0; - float align = GetResourceAmount(this, RESOURCE_HEALTH); + float align = GetResource(this, RES_HEALTH); string msg; vector msg_pos; @@ -444,8 +444,7 @@ CLASS(DebugText3d, Object) if (align > 0) msg_pos.x -= stringwidth(msg, true, size * '1 1 0') * min(1, align); - vector rgb = '1 1 0'; - drawcolorcodedstring2_builtin(msg_pos, msg, size * '1 1 0', rgb, alpha_, DRAWFLAG_NORMAL); + drawcolorcodedstring_builtin(msg_pos, msg, size * '1 1 0', alpha_, DRAWFLAG_NORMAL); } } ATTRIB(DebugText3d, draw2d, void(DebugText3d), DebugText3d_draw2d);