Merge branch 'master' into terencehill/centerprint_stuff
authorterencehill <piuntn@gmail.com>
Wed, 22 Jun 2011 23:04:33 +0000 (01:04 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 22 Jun 2011 23:04:33 +0000 (01:04 +0200)
Conflicts:
qcsrc/client/View.qc

14 files changed:
1  2 
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/main.qh
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
qcsrc/server/ctf.qc
qcsrc/server/defs.qh
qcsrc/server/gamecommand.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/gamemode_keepaway.qc
qcsrc/server/mutators/gamemode_keyhunt.qc
qcsrc/server/t_items.qc

Simple merge
@@@ -1299,337 -1299,54 +1299,42 @@@ void CSQC_UpdateView(float w, float h
        R_SetView(VF_SIZE, '1 0 0' * w + '0 1 0' * h);
  }
  
- #define spider_h "gfx/vehicles/hud_bg.tga"
- #define spider_b "gfx/vehicles/sbot.tga"
- #define spider_r "gfx/vehicles/sbot_rpods.tga"
- #define spider_g "gfx/vehicles/sbot_mguns.tga"
- #define spider_s "gfx/vehicles/shiled.tga"
- #define spider_a1 "gfx/hud/sb_rocket.tga"
- #define spider_a2 "gfx/sb_bullets.tga"
- void CSQC_SPIDER_HUD()
- {
-       float rockets, reload, heat, hp, shield;
-       vector picsize, hudloc;
-     // Fetch health & ammo stats
-     hp      = bound(0,getstatf(STAT_VEHICLESTAT_HEALTH), 1);
-       shield  = bound(0,getstatf(STAT_VEHICLESTAT_SHIELD), 1);
-       heat    = min(getstatf(STAT_VEHICLESTAT_RELOAD1), 2);
-       rockets =     getstati(STAT_VEHICLESTAT_AMMO2);
-       reload  = min(getstatf(STAT_VEHICLESTAT_RELOAD2), 1);
-     // Draw the crosshairs
-     picsize = drawgetimagesize(SPIDER_CROSS);
-     picsize_x *= autocvar_cl_vehicle_spiderbot_cross_size;
-     picsize_y *= autocvar_cl_vehicle_spiderbot_cross_size;
-     drawpic('0.5 0 0' * (vid_conwidth - picsize_x) + '0 0.5 0' * (vid_conheight - picsize_y), SPIDER_CROSS, picsize, '1 1 1', autocvar_cl_vehicle_spiderbot_cross_alpha, DRAWFLAG_NORMAL);
-     hudloc_y =  4;
-     hudloc_x = 4;
-     picsize = drawgetimagesize(spider_h) * 0.5;
-     drawpic(hudloc, spider_h, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
-     picsize = drawgetimagesize(spider_a2) * 0.5;
-     drawpic(hudloc + '120 96  0', spider_a2, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
-     drawstring(hudloc + '145 19  0', strcat(ftos(rint(hp * 100)), "%"),'15 15 0','0 1 0', 1, DRAWFLAG_NORMAL);
-     drawstring(hudloc + '175 34  0', strcat(ftos(rint(shield * 100)), "%"),'15 15 0','0 0 1', 1, DRAWFLAG_NORMAL);
-     drawstring(hudloc + '136 102  0', strcat(ftos(100 - rint(heat * 100)), "%"),'14 14 0','1 1 0', 1, DRAWFLAG_NORMAL);
-     picsize = drawgetimagesize(spider_a1) * 0.85;
-     if(rockets == 9)
-     {
-         drawpic(hudloc + '132 54  0', spider_a1, picsize, '-1 -1 -1', 1, DRAWFLAG_NORMAL);
-         drawstring(hudloc + '179 69 0', strcat(ftos(rint(reload * 100)), "%"),'14 14 0','1 1 0', 1, DRAWFLAG_NORMAL);
-     }
-     else
-     {
-         drawpic(hudloc + '132 54  0', spider_a1, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
-         drawstring(hudloc + '179 69  0', strcat(ftos(9 - rockets), "/8"),'14 14 0','1 1 0', 1, DRAWFLAG_NORMAL);
-     }
-     picsize = drawgetimagesize(spider_b) * 0.5;
-     hudloc_y = 10.5;
-     hudloc_x = 10.5;
-     drawpic(hudloc, spider_s, picsize, '1 1 1', shield, DRAWFLAG_NORMAL);
-     drawpic(hudloc, spider_b, picsize, '0 1 0' * hp + '1 0 0' * (1 - hp), 1, DRAWFLAG_NORMAL);
-     drawpic(hudloc, spider_r, picsize, '1 1 1' * reload + '1 0 0' * (1 - reload), 1, DRAWFLAG_NORMAL);
-     drawpic(hudloc, spider_g, picsize, '1 1 1' * (1 - heat) + '1 0 0' *  heat, 1, DRAWFLAG_NORMAL);
-       /*
-       // Draw health bar
-       p = '0.5 0 0' * (vid_conwidth - (rkt_size * 8));
-       p = p + '0 1 0' * vid_conheight - '0 32 0';
-       //pp = ('0 1 0' * hp) + ('1 0 0' * (1-hp));
-       drawfill(p, '256 0 0' * shield + '0 8 0' , '0.5 0.5 1', 0.75, DRAWFLAG_NORMAL);
-       p_y += 8;
-       drawfill(p, '256 0 0' * hp + '0 8 0' , '0 1 0', 0.75, DRAWFLAG_NORMAL);
-       p_x += 256 * hp;
-       drawfill(p, '256 0 0' * (1-hp) + '0 8 0' , '0 0 0', 0.75, DRAWFLAG_NORMAL);
-       // Draw minigun heat indicator
-       p = '0.5 0 0' * (vid_conwidth - 256);
-       p = p + '0 1 0' * vid_conheight - '0 34  0';
-       drawfill(p, '256 0 0' * (1-heat) + '0 2 0' ,'0 0 1', 0.5, DRAWFLAG_NORMAL);
-       p_x += 256 * (1-heat);
-       drawfill(p, '256 0 0' * heat  + '0 2 0' , '1 0 0', 0.5, DRAWFLAG_NORMAL);
-       // Draw rocket icons for loaded/empty tubes.
-       pp = '0.5 0 0' * (vid_conwidth - (rkt_size * 8));
-       pp += '0 1 0' * vid_conheight - '0 64 0';
-       for(i = 0; i < 8; ++i)
-       {
-               p = pp + '1 0 0' * (rkt_size * i);
-               if(rockets == 8)
-               {
-                       if(floor(reload * 8) == i)
-                       {
-                               drawpic(p, spider_rocket_icon, '1 1 0' * rkt_size, '1 0 0' + '0 1 0' * ((reload*8)-i), 0.75 , DRAWFLAG_NORMAL);
-                       }
-                       else if(i < reload * 8)
-                               drawpic(p, spider_rocket_icon, '1 1 0' * rkt_size, '1 1 0', 0.75 , DRAWFLAG_NORMAL);
-                       else
-                               drawpic(p, spider_rocket_icon, '1 1 0' * rkt_size, '0.5 0.5 0.5', 0.75, DRAWFLAG_NORMAL);
-               }
-               else
-               {
-                       if(i < rockets)
-                               drawpic(p, spider_rocket_icon, '1 1 0' * rkt_size, '0 0 0', 0.25, DRAWFLAG_NORMAL);
-                       else
-                               drawpic(p, spider_rocket_icon, '1 1 0' * rkt_size, '0 1 0' * reload, 0.75, DRAWFLAG_NORMAL);
-               }
-       }
-       */
-       if (scoreboard_showscores)
-       {
-               HUD_DrawScoreboard();
-       }
- }
- #define raptor_h "gfx/vehicles/hud_bg.tga"
- #define raptor_b "gfx/vehicles/raptor.tga"
- #define raptor_g1 "gfx/vehicles/raptor_guns.tga"
- #define raptor_g2 "gfx/vehicles/raptor_bombs.tga"
- #define raptor_s "gfx/vehicles/shiled.tga"
  
- void CSQC_RAPTOR_HUD()
+ void CSQC_common_hud(void)
  {
-       float reload, hp, shield, energy;
-       vector picsize, hudloc;
-     // Fetch health & ammo stats
-     hp      = bound(0,getstatf(STAT_VEHICLESTAT_HEALTH), 1);
-       shield  = bound(0,getstatf(STAT_VEHICLESTAT_SHIELD), 1);
-       reload  = min(getstatf(STAT_VEHICLESTAT_RELOAD1), 1);
-       energy  = min(getstatf(STAT_VEHICLESTAT_ENERGY),  1);
-     // Draw the crosshairs
-     picsize = drawgetimagesize(SPIDER_CROSS);
-     picsize_x *= autocvar_cl_vehicle_spiderbot_cross_size;
-     picsize_y *= autocvar_cl_vehicle_spiderbot_cross_size;
-     drawpic('0.5 0 0' * (vid_conwidth - picsize_x) + '0 0.5 0' * (vid_conheight - picsize_y), SPIDER_CROSS, picsize, '1 1 1', autocvar_cl_vehicle_spiderbot_cross_alpha, DRAWFLAG_NORMAL);
-     hudloc_y =  4;
-     hudloc_x = 4;
-     picsize = drawgetimagesize(raptor_h) * 0.5;
-     drawpic(hudloc, raptor_h, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
-     picsize = drawgetimagesize(spider_a2) * 0.5;
-     drawpic(hudloc + '120 96  0', spider_a2, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
-     drawstring(hudloc + '145 19  0', strcat(ftos(rint(hp * 100)), "%"),'15 15 0','0 1 0', 1, DRAWFLAG_NORMAL);
-     drawstring(hudloc + '175 34  0', strcat(ftos(rint(shield * 100)), "%"),'15 15 0','0 0 1', 1, DRAWFLAG_NORMAL);
-     drawstring(hudloc + '136 102 0', strcat(ftos(rint(energy * 100)), "%"),'15 15 0','0.5 0.5 1', 1, DRAWFLAG_NORMAL);
-     picsize = drawgetimagesize(spider_a1) * 0.85;
-     if(reload == 1)
+     // do some accuracy var caching
+     float i;
+     if(!(gametype == GAME_RACE || gametype == GAME_CTS))
      {
-         drawpic(hudloc + '132 54  0', spider_a1, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
-         drawstring(hudloc + '179 69  0', strcat(ftos(rint(reload * 100)), "%"),'14 14 0','0 1 0', 0.5, DRAWFLAG_NORMAL);
+         if(autocvar_accuracy_color_levels != acc_color_levels)
+         {
+             if(acc_color_levels)
+                 strunzone(acc_color_levels);
+             acc_color_levels = strzone(autocvar_accuracy_color_levels);
+             acc_levels = tokenize(acc_color_levels);
+             if (acc_levels > MAX_ACCURACY_LEVELS)
+                 acc_levels = MAX_ACCURACY_LEVELS;
+             for (i = 0; i < acc_levels; ++i)
+                 acc_lev[i] = stof(argv(i)) / 100.0;
+         }
+         // let know that acc_col[] needs to be loaded
+         acc_col_x[0] = -1;
      }
-     else
-     {
-         drawpic(hudloc + '132 54  0', spider_a1, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
-         drawstring(hudloc + '179 69  0', strcat(ftos(rint(reload * 100)), "%"),'14 14 0','0 0 1', 1, DRAWFLAG_NORMAL);
-     }
-     picsize = drawgetimagesize(raptor_b) * 0.5;
-     hudloc_y = 10.5;
-     hudloc_x = 10.5;
  
-     drawpic(hudloc, raptor_s, picsize, '1 1 1', shield, DRAWFLAG_NORMAL);
-     drawpic(hudloc, raptor_b, picsize, '0 1 0' * hp + '1 0 0' * (1 - hp), 1, DRAWFLAG_NORMAL);
-     drawpic(hudloc, raptor_g1, picsize, '1 1 1' * energy + '1 0 0' * (1 - energy), 1, DRAWFLAG_NORMAL);
-     drawpic(hudloc, raptor_g2, picsize, '1 1 1' * reload + '1 0 0' *  (1 - reload), 1, DRAWFLAG_NORMAL);
-       if (scoreboard_showscores)
-       {
-               HUD_DrawScoreboard();
-       }
+     HUD_Main(); // always run these functions for alpha checks
+     HUD_DrawScoreboard();
  
- }
- #define waki_h "gfx/vehicles/hud_bg.tga"
- #define waki_b "gfx/vehicles/waki.tga"
- #define waki_e "gfx/vehicles/waki_e.tga"
- #define waki_g "gfx/vehicles/waki_guns.tga"
- #define waki_r "gfx/vehicles/waki_rockets.tga"
- #define waki_s "gfx/vehicles/shiled.tga"
- #define waki_a1 "gfx/hud/sb_rocket.tga"
- #define waki_a2 "gfx/sb_cells.tga"
- void CSQC_WAKIZASHI_HUD()
- {
-       // 0--1 floats. 1 = 100%, 0.6 = 50%.
-       float health, shield, energy, rockets;
-       vector picsize, hudloc;
-     picsize = drawgetimagesize(SPIDER_CROSS);
-     picsize_x *= autocvar_cl_vehicle_spiderbot_cross_size;
-     picsize_y *= autocvar_cl_vehicle_spiderbot_cross_size;
-     drawpic('0.5 0 0' * (vid_conwidth - picsize_x) + '0 0.5 0' * (vid_conheight - picsize_y), SPIDER_CROSS, picsize, '1 1 1', autocvar_cl_vehicle_spiderbot_cross_alpha, DRAWFLAG_NORMAL);
- /*
- const float STAT_VEHICLESTAT_HEALTH  = 60;
- const float STAT_VEHICLESTAT_SHIELD  = 61;
- const float STAT_VEHICLESTAT_ENERGY  = 62;
- const float STAT_VEHICLESTAT_AMMO1   = 63;
- const float STAT_VEHICLESTAT_RELAOD1 = 64;
- const float STAT_VEHICLESTAT_AMMO2   = 65;
- const float STAT_VEHICLESTAT_RELOAD2 = 66;
- */
-     health  = min(getstatf(STAT_VEHICLESTAT_HEALTH),  1);
-       shield  = min(getstatf(STAT_VEHICLESTAT_SHIELD),  1);
-       energy  = min(getstatf(STAT_VEHICLESTAT_ENERGY),  1);
-       rockets = bound(0,getstatf(STAT_VEHICLESTAT_RELOAD1), 1);
-     hudloc_y =  4;
-     hudloc_x = 4;
-     picsize = drawgetimagesize(waki_h) * 0.5;
-     drawpic(hudloc, waki_h, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
-     picsize = drawgetimagesize(waki_a2) * 0.7;
-     drawpic(hudloc + '116 92  0', waki_a2, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
-     drawstring(hudloc + '145 19  0', strcat(ftos(rint(health * 100)), "%"),'15 15 0','0 1 0', 1, DRAWFLAG_NORMAL);
-     drawstring(hudloc + '175 34  0', strcat(ftos(rint(shield * 100)), "%"),'15 15 0','0 0 1', 1, DRAWFLAG_NORMAL);
-     drawstring(hudloc + '136 102  0', strcat(ftos(rint(energy * 100)), "%"),'14 14 0','1 1 1', 1, DRAWFLAG_NORMAL);
-     picsize = drawgetimagesize(waki_a1) * 0.75;
-     if(rockets == 1)
+     if (scoreboard_active) // scoreboard/accuracy
 -    {
+         HUD_Reset();
 -        // HUD_DrawScoreboard takes care of centerprint_start
 -    }
+     else if (intermission == 2) // map voting screen
      {
-         drawpic(hudloc + '140 55  0', waki_a1, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
-         drawpic(hudloc + '144 59  0', waki_a1, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+         HUD_FinaleOverlay();
+         HUD_Reset();
 -
 -        centerprint_start_x = 0;
 -        centerprint_start_y = autocvar_scr_centerpos * vid_conheight;
 -    }
 -    else // hud
 -    {
 -        centerprint_start_x = 0;
 -        centerprint_start_y = autocvar_scr_centerpos * vid_conheight;
      }
-     else
-     {
-         drawpic(hudloc + '140 55  0', waki_a1, picsize, '-1 -1 -1', 1, DRAWFLAG_NORMAL);
-         drawpic(hudloc + '144 59  0', waki_a1, picsize, '-1 -1 -1', 1, DRAWFLAG_NORMAL);
-         drawstring(hudloc + '165 69 0', strcat(ftos(rint(rockets * 100)), "%"),'14 14 0','1 1 0', 1, DRAWFLAG_NORMAL);
-     }
-     picsize = drawgetimagesize(waki_b) * 0.5;
-     hudloc_y = 10.5;
-     hudloc_x = 10.5;
-     drawpic(hudloc, waki_s, picsize, '1 1 1', shield, DRAWFLAG_NORMAL);
-     drawpic(hudloc, waki_b, picsize, '0 1 0' * health + '1 0 0' * (1 - health), 1, DRAWFLAG_NORMAL);
-     drawpic(hudloc, waki_r, picsize, '1 1 1' * rockets + '1 0 0' * (1 - rockets), 1, DRAWFLAG_NORMAL);
-     drawpic(hudloc, waki_e, picsize, '1 1 1' * energy + '1 0 0' *  (1 - energy), 1, DRAWFLAG_NORMAL);
--
        /*
-       p = '0.5 0 0' * (vid_conwidth - (rkt_size * 8));
-       p = p + '0 1 0' * vid_conheight - '0 32 0';
-       // Draw health bar
-       p_y += 8;
-       drawfill(p, '256 0 0' * health + '0 8 0' , '0 0.7 0', 0.75, DRAWFLAG_NORMAL);
-       p_x += 256 * health;
-       drawfill(p, '256 0 0' * (1 - health) + '0 8 0' , '0 0 0', 0.75, DRAWFLAG_NORMAL);
-       // Draw shiled bar
-       p_x -= 256 * health;
-       p_y += 4;
-       drawfill(p, '256 0 0' * shield + '0 4 0' , '0.25 0.25 1', 0.5, DRAWFLAG_NORMAL);
-       // Draw energy
-       //p_x -= 256 * health;
-       p_y -= 8;
-       drawfill(p, '256 0 0' * energy + '0 4 0' , '1 1 1', 0.75, DRAWFLAG_NORMAL);
-       // Draw rockets bar
-       p_y += 12;
-       drawfill(p, '256 0 0' * rockets + '0 4 0' , '1 0 0', 0.75, DRAWFLAG_NORMAL);
-       */
-       if (scoreboard_showscores)
-       {
-               HUD_DrawScoreboard();
-       }
- }
- void CSQC_common_hud(void)
- {
-       // HUD_SortFrags(); done in HUD_Draw
-       float hud;
-       hud = getstati(STAT_HUD);
-       //hud = 10;
        switch(hud)
        {
-               case HUD_NORMAL:
-                       // do some accuracy var caching
-                       float i;
-                       if(!(gametype == GAME_RACE || gametype == GAME_CTS))
-                       {
-                               if(autocvar_accuracy_color_levels != acc_color_levels)
-                               {
-                                       if(acc_color_levels)
-                                               strunzone(acc_color_levels);
-                                       acc_color_levels = strzone(autocvar_accuracy_color_levels);
-                                       acc_levels = tokenize(acc_color_levels);
-                                       if (acc_levels > MAX_ACCURACY_LEVELS)
-                                               acc_levels = MAX_ACCURACY_LEVELS;
-                                       for (i = 0; i < acc_levels; ++i)
-                                               acc_lev[i] = stof(argv(i)) / 100.0;
-                               }
-                               // let know that acc_col[] needs to be loaded
-                               acc_col_x[0] = -1;
-                       }
-                       HUD_Main(); // always run these functions for alpha checks
-                       HUD_DrawScoreboard();
-                       if (scoreboard_active) // scoreboard/accuracy
-                               HUD_Reset();
-                       else if (intermission == 2) // map voting screen
-                       {
-                               HUD_FinaleOverlay();
-                               HUD_Reset();
-                       }
-                       break;
                case HUD_SPIDERBOT:
                        CSQC_SPIDER_HUD();
                        break;
                case HUD_WAKIZASHI:
                        CSQC_WAKIZASHI_HUD();
                        break;
+         case HUD_BUMBLEBEE:
+             CSQC_BUMBLE_HUD();
+             break;
        }
 -      
 -    HUD_DrawCenterPrint();
 -    
+       */
  }
  
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge