From: TimePath Date: Sun, 6 Mar 2016 06:59:12 +0000 (+1100) Subject: Resolve some TODOs X-Git-Tag: xonotic-v0.8.2~1153 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=79b41d4eab2bd72d9916dd3acee177795c89cb52;p=xonotic%2Fxonotic-data.pk3dir.git Resolve some TODOs --- diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index cbee59e90..d48fb6333 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -195,7 +195,7 @@ float autocvar_hud_dock_alpha; string autocvar_hud_dock_color; bool autocvar_hud_dock_color_team; bool autocvar_hud_panel_ammo; -bool autocvar_hud_panel_ammo_iconalign; // TODO: check if this should be turned into an int +bool autocvar_hud_panel_ammo_iconalign; int autocvar_hud_panel_ammo_maxammo; bool autocvar_hud_panel_ammo_onlycurrent; float autocvar_hud_panel_ammo_noncurrent_alpha = 0.7; @@ -207,8 +207,8 @@ bool autocvar_hud_panel_ammo_text; string autocvar_hud_panel_bg; float autocvar_hud_panel_bg_alpha; float autocvar_hud_panel_bg_border; -vector autocvar_hud_panel_bg_color; // TODO: int? -float autocvar_hud_panel_bg_color_team; // ^ +vector autocvar_hud_panel_bg_color; +float autocvar_hud_panel_bg_color_team; float autocvar_hud_panel_bg_padding; bool autocvar_hud_panel_centerprint; float autocvar_hud_panel_centerprint_align; diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index b0445abf1..8df44c589 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -1,31 +1,6 @@ #ifndef CONSTANTS_H #define CONSTANTS_H -// COMMIT-TODO: Update if necessary before committing -// Revision 1: additional statistics sent (flag caps, returns, deaths) -// Revision 2: Mapvote preview pictures -// Revision 3: optimized map vote protocol -// Revision 4: CSQC config var system -// Revision 5: mapvote time fix -// Revision 6: more robust against packet loss/delays, also show not yet connected clients -// Revision 7: packet loss column -// Revision 8: race -// Revision 9: race delta -// Revision 10: scoreboard force -// Revision 11: scoreboard unforce; spectator support beginning -// Revision 12: smaller scores updates (SERVER: requires new engine) -// Revision 13: pointparticles -// Revision 14: laser -// Revision 15: zoom -// Revision 16: multi-weapons -// Revision 17: multi-weaponimpulses -// Revision 18: warmup -// Revision 19: fog -// Revision 20: naggers -// Revision 21: entcs for players optimized (position data down from 12 to 7 bytes); waypointsprites in csqc for team radar -// Revision 22: hook shot origin -#define CSQC_REVISION 22 - REGISTER_NET_TEMP(TE_CSQC_PICTURE) REGISTER_NET_TEMP(TE_CSQC_RACE) REGISTER_NET_TEMP(TE_CSQC_TEAMNAGGER) diff --git a/qcsrc/common/csqcmodel_settings.qh b/qcsrc/common/csqcmodel_settings.qh index da2661b9c..ff890afec 100644 --- a/qcsrc/common/csqcmodel_settings.qh +++ b/qcsrc/common/csqcmodel_settings.qh @@ -69,7 +69,7 @@ CSQCMODEL_PROPERTY(BIT(14), TAG_VIEWLOC_TYPE, ReadShort, WriteEntity, TAG_VIEWLOC_NAME) \ CSQCMODEL_PROPERTY(BIT(15), int, ReadByte, WriteByte, multijump_count) \ CSQCMODEL_PROPERTY(BIT(16), int, ReadByte, WriteByte, MOVETYPE_NAME) -// TODO get rid of colormod/glowmod here, find good solution for vortex charge glowmod hack; also get rid of some useless properties on non-players that only exist for CopyBody +// TODO get rid of colormod/glowmod here; also get rid of some useless properties on non-players that only exist for CopyBody // add hook function calls here #define CSQCPLAYER_HOOK_POSTCAMERASETUP() \ diff --git a/qcsrc/lib/accumulate.qh b/qcsrc/lib/accumulate.qh index a32649f5c..c265325f8 100644 --- a/qcsrc/lib/accumulate.qh +++ b/qcsrc/lib/accumulate.qh @@ -10,7 +10,6 @@ func() #else #ifdef HAVE_YO_DAWG_CPP -// TODO make ascii art pic of xzibit // YO DAWG! // I HERD YO LIEK MACROS // SO I PUT A MACRO DEFINITION IN YO MACRO DEFINITION diff --git a/qcsrc/lib/string.qh b/qcsrc/lib/string.qh index bd0c8d30f..47a8175ca 100644 --- a/qcsrc/lib/string.qh +++ b/qcsrc/lib/string.qh @@ -16,7 +16,6 @@ } #endif -// TODO: macro string seconds_tostring(float sec) { float minutes = floor(sec / 60);