Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental
This commit is contained in:
		@@ -2721,10 +2721,9 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int p
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
uint32_t Calculator::GetDurationForPrice(Configuration *cfg, int price) const {
 | 
					uint32_t Calculator::GetDurationForPrice(Configuration *cfg, int price) const {
 | 
				
			||||||
    int const pop_id = cfg->getPaymentOptions().pop_id;
 | 
					    int const pop_id = cfg->getPaymentOptions().pop_id;
 | 
				
			||||||
 | 
					    int const pop_accumulate_prices = cfg->getPaymentOptions().pop_accumulate_prices;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
 | 
					    int new_price = 0;
 | 
				
			||||||
 | 
					 | 
				
			||||||
    uint32_t new_price = 0;
 | 
					 | 
				
			||||||
    uint32_t duration = 0;
 | 
					    uint32_t duration = 0;
 | 
				
			||||||
    uint32_t duration_previous = 0;
 | 
					    uint32_t duration_previous = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user