mirror of
				https://github.com/zenorogue/hyperrogue.git
				synced 2025-11-04 07:43:02 +00:00 
			
		
		
		
	Merge pull request #211 from jruderman/rop_atc
reduceOrbPowers: only call mine::auto_teleport_charges once
This commit is contained in:
		
							
								
								
									
										7
									
								
								orbs.cpp
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								orbs.cpp
									
									
									
									
									
								
							@@ -99,9 +99,6 @@ EX bool reduceOrbPower(eItem it, int cap) {
 | 
				
			|||||||
    return true;
 | 
					    return true;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  if(items[it] > cap && timerghost) items[it] = cap;
 | 
					  if(items[it] > cap && timerghost) items[it] = cap;
 | 
				
			||||||
  #if CAP_COMPLEX2
 | 
					 | 
				
			||||||
  mine::auto_teleport_charges();
 | 
					 | 
				
			||||||
  #endif
 | 
					 | 
				
			||||||
  return false;
 | 
					  return false;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -210,6 +207,10 @@ EX void reduceOrbPowers() {
 | 
				
			|||||||
  reduceOrbPower(itCurseRepulsion, 199);
 | 
					  reduceOrbPower(itCurseRepulsion, 199);
 | 
				
			||||||
  reduceOrbPower(itCurseGluttony, 199);
 | 
					  reduceOrbPower(itCurseGluttony, 199);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  #if CAP_COMPLEX2
 | 
				
			||||||
 | 
					  mine::auto_teleport_charges();
 | 
				
			||||||
 | 
					  #endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  whirlwind::calcdirs(cwt.at); 
 | 
					  whirlwind::calcdirs(cwt.at); 
 | 
				
			||||||
  items[itStrongWind] = !items[itOrbAether] && whirlwind::qdirs == 1;
 | 
					  items[itStrongWind] = !items[itOrbAether] && whirlwind::qdirs == 1;
 | 
				
			||||||
  items[itWarning] = 0;
 | 
					  items[itWarning] = 0;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user