From: terencehill Date: Fri, 9 Oct 2015 11:55:53 +0000 (+0200) Subject: Rename 2 global variables X-Git-Tag: xonotic-v0.8.2~1799^2~10 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=de976a53d172a3f57602ba7d42bd945562b37640;p=xonotic%2Fxonotic-data.pk3dir.git Rename 2 global variables --- diff --git a/qcsrc/common/vehicles/cl_vehicles.qc b/qcsrc/common/vehicles/cl_vehicles.qc index 52e84a210..d14f0d0b0 100644 --- a/qcsrc/common/vehicles/cl_vehicles.qc +++ b/qcsrc/common/vehicles/cl_vehicles.qc @@ -149,29 +149,29 @@ void Vehicles_drawHUD( if (precache_pic(frame) == "") frame = "gfx/hud/default/vehicle_frame"; - hudSize = draw_getimagesize(frame) * autocvar_cl_vehicles_hudscale; - hudPos.x = (vid_conwidth - hudSize.x) / 2; - hudPos.y = vid_conheight - hudSize.y; + vehicleHud_Size = draw_getimagesize(frame) * autocvar_cl_vehicles_hudscale; + vehicleHud_Pos.x = (vid_conwidth - vehicleHud_Size.x) / 2; + vehicleHud_Pos.y = vid_conheight - vehicleHud_Size.y; if(teamplay && autocvar_hud_panel_bg_color_team) - drawpic(hudPos, frame, hudSize, myteamcolors * autocvar_hud_panel_bg_color_team, autocvar_hud_panel_bg_alpha, DRAWFLAG_NORMAL); + drawpic(vehicleHud_Pos, frame, vehicleHud_Size, myteamcolors * autocvar_hud_panel_bg_color_team, autocvar_hud_panel_bg_alpha, DRAWFLAG_NORMAL); else - drawpic(hudPos, frame, hudSize, autocvar_hud_panel_bg_color, autocvar_hud_panel_bg_alpha, DRAWFLAG_NORMAL); + drawpic(vehicleHud_Pos, frame, vehicleHud_Size, autocvar_hud_panel_bg_color, autocvar_hud_panel_bg_alpha, DRAWFLAG_NORMAL); if(!autocvar__vehicles_shownchasemessage && time < vh_notice_time) { float tmpblinkValue = 0.55 + sin(time * 3) * 0.45; - tmpPos.x = hudPos.x + hudSize.x * (96/256) - tmpSize.x; - tmpPos.y = hudPos.y; + tmpPos.x = vehicleHud_Pos.x + vehicleHud_Size.x * (96/256) - tmpSize.x; + tmpPos.y = vehicleHud_Pos.y; tmpSize = '1 1 1' * hud_fontsize; drawstring(tmpPos, sprintf(_("Press %s"), getcommandkey("dropweapon", "dropweapon")), tmpSize, '1 0 0' + '0 1 1' * tmpblinkValue, hudAlpha, DRAWFLAG_NORMAL); } // Model - tmpSize.x = hudSize.x / 3; - tmpSize.y = hudSize.y; - tmpPos.x = hudPos.x + hudSize.x / 3; - tmpPos.y = hudPos.y; + tmpSize.x = vehicleHud_Size.x / 3; + tmpSize.y = vehicleHud_Size.y; + tmpPos.x = vehicleHud_Pos.x + vehicleHud_Size.x / 3; + tmpPos.y = vehicleHud_Pos.y; if(health < 0.25) drawpic_skin(tmpPos, vehicle, tmpSize, '1 0 0' + '0 1 1' * blinkValue, hudAlpha, DRAWFLAG_NORMAL); @@ -186,22 +186,22 @@ void Vehicles_drawHUD( drawpic_skin(tmpPos, "vehicle_shield", tmpSize, '1 1 1' * shield + '1 0 0' * (1 - shield), hudAlpha * shield, DRAWFLAG_NORMAL); // Health bar - tmpSize.y = hudSize.y / 2; - tmpPos.x = hudPos.x + hudSize.x * (32/768); - tmpPos.y = hudPos.y; + tmpSize.y = vehicleHud_Size.y / 2; + tmpPos.x = vehicleHud_Pos.x + vehicleHud_Size.x * (32/768); + tmpPos.y = vehicleHud_Pos.y; drawsetcliparea(tmpPos.x + (tmpSize.x * (1 - health)), tmpPos.y, tmpSize.x, tmpSize.y); drawpic_skin(tmpPos, "vehicle_bar_northwest", tmpSize, autocvar_hud_progressbar_health_color, barAlpha, DRAWFLAG_NORMAL); // Shield bar - tmpPos.y = hudPos.y + hudSize.y / 2; + tmpPos.y = vehicleHud_Pos.y + vehicleHud_Size.y / 2; drawsetcliparea(tmpPos.x + (tmpSize.x * (1 - shield)), tmpPos.y, tmpSize.x, tmpSize.y); drawpic_skin(tmpPos, "vehicle_bar_southwest", tmpSize, autocvar_hud_progressbar_armor_color, barAlpha, DRAWFLAG_NORMAL); // Ammo1 bar - tmpPos.x = hudPos.x + hudSize.x * (480/768); - tmpPos.y = hudPos.y; + tmpPos.x = vehicleHud_Pos.x + vehicleHud_Size.x * (480/768); + tmpPos.y = vehicleHud_Pos.y; if(ammo1) drawsetcliparea(tmpPos.x, tmpPos.y, tmpSize.x * ammo1, tmpSize.y); @@ -211,7 +211,7 @@ void Vehicles_drawHUD( drawpic_skin(tmpPos, "vehicle_bar_northeast", tmpSize, colorAmmo1, barAlpha, DRAWFLAG_NORMAL); // Ammo2 bar - tmpPos.y = hudPos.y + hudSize.y / 2; + tmpPos.y = vehicleHud_Pos.y + vehicleHud_Size.y / 2; if(ammo2) drawsetcliparea(tmpPos.x, tmpPos.y, tmpSize.x * ammo2, tmpSize.y); @@ -222,10 +222,10 @@ void Vehicles_drawHUD( drawresetcliparea(); // Health icon - tmpSize.x = hudSize.x * (80/768); - tmpSize.y = hudSize.y * (80/256); - tmpPos.x = hudPos.x + hudSize.x * (64/768); - tmpPos.y = hudPos.y + hudSize.y * (48/256); + tmpSize.x = vehicleHud_Size.x * (80/768); + tmpSize.y = vehicleHud_Size.y * (80/256); + tmpPos.x = vehicleHud_Pos.x + vehicleHud_Size.x * (64/768); + tmpPos.y = vehicleHud_Pos.y + vehicleHud_Size.y * (48/256); if(health < 0.25) { @@ -247,7 +247,7 @@ void Vehicles_drawHUD( } // Shield icon - tmpPos.y = hudPos.y + hudSize.y / 2; + tmpPos.y = vehicleHud_Pos.y + vehicleHud_Size.y / 2; if(shield < 0.25) { @@ -269,8 +269,8 @@ void Vehicles_drawHUD( } // Ammo1 icon - tmpPos.x = hudPos.x + hudSize.x * (624/768); - tmpPos.y = hudPos.y + hudSize.y * (48/256); + tmpPos.x = vehicleHud_Pos.x + vehicleHud_Size.x * (624/768); + tmpPos.y = vehicleHud_Pos.y + vehicleHud_Size.y * (48/256); if(iconAmmo1) { @@ -281,7 +281,7 @@ void Vehicles_drawHUD( } // Ammo2 icon - tmpPos.y = hudPos.y + hudSize.y / 2; + tmpPos.y = vehicleHud_Pos.y + vehicleHud_Size.y / 2; if(iconAmmo2) { diff --git a/qcsrc/common/vehicles/cl_vehicles.qh b/qcsrc/common/vehicles/cl_vehicles.qh index 646b6c9d8..87f0751af 100644 --- a/qcsrc/common/vehicles/cl_vehicles.qh +++ b/qcsrc/common/vehicles/cl_vehicles.qh @@ -1,8 +1,8 @@ #ifndef CL_VEHICLES_H #define CL_VEHICLES_H -vector hudSize; -vector hudPos; +vector vehicleHud_Size; +vector vehicleHud_Pos; void Net_AuXair2(float bIsNew); diff --git a/qcsrc/common/vehicles/vehicle/bumblebee.qc b/qcsrc/common/vehicles/vehicle/bumblebee.qc index 5b8df88c4..6c114ab46 100644 --- a/qcsrc/common/vehicles/vehicle/bumblebee.qc +++ b/qcsrc/common/vehicles/vehicle/bumblebee.qc @@ -966,17 +966,17 @@ void CSQC_BUMBLE_GUN_HUD() float blinkValue = 0.55 + sin(time * 7) * 0.45; vector tmpPos = '0 0 0'; vector tmpSize = '1 1 1' * hud_fontsize; - tmpPos.x = hudPos.x + hudSize.x * (520/768); + tmpPos.x = vehicleHud_Pos.x + vehicleHud_Size.x * (520/768); if(!AuxiliaryXhair[1].draw2d) { - tmpPos.y = hudPos.y + hudSize.y * (96/256) - tmpSize.y; + tmpPos.y = vehicleHud_Pos.y + vehicleHud_Size.y * (96/256) - tmpSize.y; drawstring(tmpPos, _("No right gunner!"), tmpSize, '1 1 1', hudAlpha * blinkValue, DRAWFLAG_NORMAL); } if(!AuxiliaryXhair[2].draw2d) { - tmpPos.y = hudPos.y + hudSize.y * (160/256); + tmpPos.y = vehicleHud_Pos.y + vehicleHud_Size.y * (160/256); drawstring(tmpPos, _("No left gunner!"), tmpSize, '1 1 1', hudAlpha * blinkValue, DRAWFLAG_NORMAL); } }