From: Mario Date: Sat, 17 Feb 2018 17:47:30 +0000 (+0000) Subject: Merge branch 'martin-t/cfgs' into 'master' X-Git-Tag: xonotic-v0.8.5~2297 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=fcd31ea01083f448ef36785ad0bdb4244927fa42;hp=-c Merge branch 'martin-t/cfgs' into 'master' Rename all the configs See merge request xonotic/xonotic-data.pk3dir!536 --- fcd31ea01083f448ef36785ad0bdb4244927fa42 diff --combined qcsrc/client/teamradar.qc index d8264f4298,c6f8b8daa6..c5f1c2fb4b --- a/qcsrc/client/teamradar.qc +++ b/qcsrc/client/teamradar.qc @@@ -187,7 -187,7 +187,7 @@@ void teamradar_loadcvars( hud_panel_radar_maximized_zoommode = autocvar_hud_panel_radar_maximized_zoommode; // others default to 0 - // match this to defaultXonotic.cfg! + // match this to default hud cfg file! if(!hud_panel_radar_scale) hud_panel_radar_scale = 4096; if(!hud_panel_radar_foreground_alpha) hud_panel_radar_foreground_alpha = 0.8 * panel_fg_alpha; if(!hud_panel_radar_size.x) hud_panel_radar_size.x = 128; @@@ -208,13 -208,17 +208,13 @@@ NET_HANDLE(ENT_CLIENT_RADARLINK, bool i if(sendflags & 1) { - this.origin_x = ReadCoord(); - this.origin_y = ReadCoord(); - this.origin_z = ReadCoord(); + this.origin = ReadVector(); setorigin(this, this.origin); } if(sendflags & 2) { - this.velocity_x = ReadCoord(); - this.velocity_y = ReadCoord(); - this.velocity_z = ReadCoord(); + this.velocity = ReadVector(); } if(sendflags & 4)