From f417d7a4df7a13d8971d84708b236f31caa3e622 Mon Sep 17 00:00:00 2001 From: jacksonmj Date: Sat, 18 Jun 2011 12:19:47 +0100 Subject: [PATCH] Include ambient heat in undo --- includes/air.h | 7 ++++--- src/air.c | 7 ++++--- src/main.c | 2 ++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/includes/air.h b/includes/air.h index dfa417c01..b00c6b8c9 100644 --- a/includes/air.h +++ b/includes/air.h @@ -16,9 +16,10 @@ extern float vx[YRES/CELL][XRES/CELL], ovx[YRES/CELL][XRES/CELL]; extern float vy[YRES/CELL][XRES/CELL], ovy[YRES/CELL][XRES/CELL]; extern float pv[YRES/CELL][XRES/CELL], opv[YRES/CELL][XRES/CELL]; -extern float cb_vx[YRES/CELL][XRES/CELL], cb_ovx[YRES/CELL][XRES/CELL]; -extern float cb_vy[YRES/CELL][XRES/CELL], cb_ovy[YRES/CELL][XRES/CELL]; -extern float cb_pv[YRES/CELL][XRES/CELL], cb_opv[YRES/CELL][XRES/CELL]; +extern float cb_vx[YRES/CELL][XRES/CELL]; +extern float cb_vy[YRES/CELL][XRES/CELL]; +extern float cb_pv[YRES/CELL][XRES/CELL]; +extern float cb_hv[YRES/CELL][XRES/CELL]; extern float fvx[YRES/CELL][XRES/CELL], fvy[YRES/CELL][XRES/CELL]; diff --git a/src/air.c b/src/air.c index 0fe404d51..c65e1a0c4 100644 --- a/src/air.c +++ b/src/air.c @@ -18,9 +18,10 @@ float vx[YRES/CELL][XRES/CELL], ovx[YRES/CELL][XRES/CELL]; float vy[YRES/CELL][XRES/CELL], ovy[YRES/CELL][XRES/CELL]; float pv[YRES/CELL][XRES/CELL], opv[YRES/CELL][XRES/CELL]; -float cb_vx[YRES/CELL][XRES/CELL], cb_ovx[YRES/CELL][XRES/CELL]; -float cb_vy[YRES/CELL][XRES/CELL], cb_ovy[YRES/CELL][XRES/CELL]; -float cb_pv[YRES/CELL][XRES/CELL], cb_opv[YRES/CELL][XRES/CELL]; +float cb_vx[YRES/CELL][XRES/CELL]; +float cb_vy[YRES/CELL][XRES/CELL]; +float cb_pv[YRES/CELL][XRES/CELL]; +float cb_hv[YRES/CELL][XRES/CELL]; float fvx[YRES/CELL][XRES/CELL], fvy[YRES/CELL][XRES/CELL]; diff --git a/src/main.c b/src/main.c index f19831960..b3d3f498d 100644 --- a/src/main.c +++ b/src/main.c @@ -2404,6 +2404,7 @@ int main(int argc, char *argv[]) vx[cby][cbx] = cb_vx[cby][cbx]; vy[cby][cbx] = cb_vy[cby][cbx]; pv[cby][cbx] = cb_pv[cby][cbx]; + hv[cby][cbx] = cb_hv[cby][cbx]; bmap[cby][cbx] = cb_bmap[cby][cbx]; emap[cby][cbx] = cb_emap[cby][cbx]; } @@ -3126,6 +3127,7 @@ int main(int argc, char *argv[]) cb_vx[cby][cbx] = vx[cby][cbx]; cb_vy[cby][cbx] = vy[cby][cbx]; cb_pv[cby][cbx] = pv[cby][cbx]; + cb_hv[cby][cbx] = hv[cby][cbx]; cb_bmap[cby][cbx] = bmap[cby][cbx]; cb_emap[cby][cbx] = emap[cby][cbx]; }