diff --git a/data/base/wrf/cam2/cam2change.wrf b/data/base/wrf/cam2/cam2change.wrf index e8eb8c4a9..a38023c11 100644 --- a/data/base/wrf/cam2/cam2change.wrf +++ b/data/base/wrf/cam2/cam2change.wrf @@ -12,6 +12,14 @@ file TEXPAGE "page-6-features-urban.png" file TEXPAGE "page-7-barbarians-urban.png" file TEXPAGE "page-8-player-buildings-bases-urban.png" file TEXPAGE "page-9-player-buildings-bases-urban.png" +/* These come from ../vidmem2.wrf */ +file TEXPAGE "page-25-sky-urban.png" +file TEXPAGE "page-47-tiles.png" +file TEXPAGE "page-49-dirt.png" +file TEXPAGE "page-51-debris.png" +file TEXPAGE "page-52-plants-on-rock.png" +file TEXPAGE "page-80-water-1.png" +file TEXPAGE "page-81-water-2.png" directory "stats/research/cam2" file RESCH "research.txt" diff --git a/data/base/wrf/cam3/cam3change.wrf b/data/base/wrf/cam3/cam3change.wrf index 970edc7ee..c51be1a04 100644 --- a/data/base/wrf/cam3/cam3change.wrf +++ b/data/base/wrf/cam3/cam3change.wrf @@ -12,6 +12,19 @@ file TEXPAGE "page-6-features-rockies.png" file TEXPAGE "page-7-barbarians-kevlar.png" file TEXPAGE "page-8-player-buildings-bases-rockies.png" file TEXPAGE "page-9-player-buildings-bases-rockies.png" +/* These come from ../vidmem3.wrf */ +file TEXPAGE "page-25-sky-urban.png" +file TEXPAGE "page-42-rock.png" +file TEXPAGE "page-46-cliff.png" +file TEXPAGE "page-49-dirt.png" +file TEXPAGE "page-54-snow-grass.png" +file TEXPAGE "page-55-grass.png" +file TEXPAGE "page-56-gravel.png" +file TEXPAGE "page-57-snow.png" +file TEXPAGE "page-58-snow-gravel.png" +file TEXPAGE "page-47-tiles.png" +file TEXPAGE "page-80-water-1.png" +file TEXPAGE "page-81-water-2.png" directory "stats/research/cam3" file RESCH "research.txt" diff --git a/data/base/wrf/vidmem2.wrf b/data/base/wrf/vidmem2.wrf index 372cfee2f..1ddfae848 100644 --- a/data/base/wrf/vidmem2.wrf +++ b/data/base/wrf/vidmem2.wrf @@ -32,6 +32,7 @@ file TEXPAGE "page-21-fx.png" file TEXPAGE "page-22-fx.png" file TEXPAGE "page-23-fx.png" file TEXPAGE "page-24-fx.png" +/* When you change these, also update cam2/cam2change.wrf */ file TEXPAGE "page-25-sky-urban.png" file TEXPAGE "page-47-tiles.png" file TEXPAGE "page-49-dirt.png" diff --git a/data/base/wrf/vidmem3.wrf b/data/base/wrf/vidmem3.wrf index 3efa07e33..8a97db3e6 100644 --- a/data/base/wrf/vidmem3.wrf +++ b/data/base/wrf/vidmem3.wrf @@ -32,6 +32,7 @@ file TEXPAGE "page-21-fx.png" file TEXPAGE "page-22-fx.png" file TEXPAGE "page-23-fx.png" file TEXPAGE "page-24-fx.png" +/* When you change these, also update cam3/cam3change.wrf */ file TEXPAGE "page-25-sky-urban.png" file TEXPAGE "page-42-rock.png" file TEXPAGE "page-46-cliff.png" diff --git a/src/init.c b/src/init.c index 5906e40ac..49834eed1 100644 --- a/src/init.c +++ b/src/init.c @@ -1157,6 +1157,11 @@ BOOL campaignReset(void) debug(LOG_MAIN, "campaignReset"); gwShutDown(); mapShutdown(); + shutdownTerrain(); + // when the terrain textures are reloaded we need to reset the radar + // otherwise it will end up as a terrain texture somehow + ShutdownRadar(); + InitRadar(); return true; }