Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Load the new terrain textures when going from cam1->cam2 or cam2->cam3. This fixes bug #299. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6831 4a71c877-e1ca-e34f-864e-861f7616d084
master
Gerard Krol 2009-03-11 11:50:55 +00:00
parent 811bb12786
commit 73d4569733
5 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/base/wrf/cam2/cam2change.wrf
View File

@ -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"

13
data/base/wrf/cam3/cam3change.wrf
View File

@ -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"

1
data/base/wrf/vidmem2.wrf
View File

@ -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"

1
data/base/wrf/vidmem3.wrf
View File

@ -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"

5
src/init.c
View File

@ -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;
}