Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 66718 | Differences between
and this patch

Collapse All | Expand All

(-)src/explosion.cc (-1 / +1 lines)
Lines 159-165 Link Here
159 
				}
 159 
				}
160 
				if (distance <= (radius + TANKHEIGHT/2) && tank->l > 0) {
 160 
				if (distance <= (radius + TANKHEIGHT/2) && tank->l > 0) {
161 
					_global->updateMenu = 1;
 161 
					_global->updateMenu = 1;
162 
					tank->damage = (int) ((float) damage * ((float) 1 - ((fabs (distance) / (float)radius) / 2)) * player->damageMultiplier);
 162 
					tank->damage = (int) ((player ? (float) damage * player->damageMultiplier : (float) damage) * ((float) 1 - ((fabs (distance) / (float)radius) / 2)));
163 

          163
          

        

        

          164
          
					tank->creditTo = player;

          164
          
					tank->creditTo = player;

        

        

          165
          
					tank->applyDamage ();

          165
          
					tank->applyDamage ();

        



(-)src/beam.cc
      (-1 / +1 lines)




  

    
      
            Lines 167-173
          
      
      
        Link Here
      
    
  

        

          167
          
		if (targetX > ltank->x - TANKWIDTH - radius && targetX < ltank->x + TANKWIDTH + radius && targetY > ltank->y - radius && targetY < ltank->y + TANKHEIGHT + radius && ltank->l > 0) {

          167
          
		if (targetX > ltank->x - TANKWIDTH - radius && targetX < ltank->x + TANKWIDTH + radius && targetY > ltank->y - radius && targetY < ltank->y + TANKHEIGHT + radius && ltank->l > 0) {

        

        

          168
          
			//hitSomething = 1;

          168
          
			//hitSomething = 1;

        

        

          169
          
			ltank->requireUpdate ();

          169
          
			ltank->requireUpdate ();

        

          
            

              170
              
			ltank->damage += damage * player->damageMultiplier;


              170
              
			ltank->damage += player ? damage * player->damageMultiplier : damage;

            

        

          171
          
			ltank->creditTo = player;

          171
          
			ltank->creditTo = player;

        

        

          172
          
			if (destroy)

          172
          
			if (destroy)

        

        

          173
          
				ltank->applyDamage ();

          173
          
				ltank->applyDamage ();

        






  

  Return to bug 66718