empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify market time left handling in a few places

Browse source
This commit is contained in:
Markus Armbruster 2013-01-14 21:03:51 +01:00
parent c5f76e5853
commit 375e5170e4
3 changed files with 14 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/commands/buy.c
View file

@ -30,6 +30,7 @@
* Dave Pare, 1986
* Pat Loney, 1992
* Steve McClure, 1996-2000
* Markus Armbruster, 2004-2013
*/
#include <config.h>
@ -190,7 +191,6 @@ check_market(void)
int m;
int n;
time_t now;
double tleft;
double gain;
double price;
@ -198,10 +198,7 @@ check_market(void)
if (comm.com_maxbidder == comm.com_owner || comm.com_owner == 0)
continue;
(void)time(&now);
tleft = MARK_DELAY / 3600.0 - (now - comm.com_markettime) / 3600.0;
if (tleft < 0)
tleft = 0;
if (tleft > 0.0)
if (comm.com_markettime + MARK_DELAY > now)
continue;
if (CANT_HAPPEN(comm.com_type <= I_NONE || comm.com_type > I_MAX))
continue;