Skip to content

Commit

Permalink
Fix wrf files to make it more clear what is going on.
Browse files Browse the repository at this point in the history 
    Frontend.wrf is *NOT* the main texture loader for MP games, we are
    using limiter_tex.wrf for that, which is hardcoded in the sourcecode.
    (This is same behavior as trunk)
(cherry picked from commit fb4a9e2)
  • Loading branch information
@buginator
buginator committed Oct 17, 2010
1 parent 6b296db commit e70c367
Show file tree
Hide file tree
Showing 9 changed files with 125 additions and 59 deletions.
18 changes: 9 additions & 9 deletions data/base/wrf/cam2/cam2change.wrf
View file
Expand Up @@ -7,11 +7,11 @@


directory "texpages"
file TERTILES "tertilesc2hw"
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"
file TERTILES "tertilesc2hw"
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"
Expand All @@ -23,12 +23,12 @@ file TEXPAGE "page-81-water-2.png"

directory "stats/research/cam2"
file RESCH "research.txt"
file RPREREQ "prresearch.txt"
file RPREREQ "prresearch.txt"

file RCOMPRED "redcomponents.txt"
file RCOMPRES "resultcomponent.txt"
file RSTRREQ "researchstruct.txt"
file RSTRRED "redstructure.txt"
file RSTRRES "resultstructure.txt"
file RSTRREQ "researchstruct.txt"
file RSTRRED "redstructure.txt"
file RSTRRES "resultstructure.txt"
file RFUNC "researchfunctions.txt"

18 changes: 9 additions & 9 deletions data/base/wrf/cam3/cam3change.wrf
View file
Expand Up @@ -7,11 +7,11 @@


directory "texpages"
file TERTILES "tertilesc3hw"
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"
file TERTILES "tertilesc3hw"
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"
Expand All @@ -28,12 +28,12 @@ file TEXPAGE "page-81-water-2.png"

directory "stats/research/cam3"
file RESCH "research.txt"
file RPREREQ "prresearch.txt"
file RPREREQ "prresearch.txt"

file RCOMPRED "redcomponents.txt"
file RCOMPRES "resultcomponent.txt"
file RSTRREQ "researchstruct.txt"
file RSTRRED "redstructure.txt"
file RSTRRES "resultstructure.txt"
file RSTRREQ "researchstruct.txt"
file RSTRRED "redstructure.txt"
file RSTRRES "resultstructure.txt"
file RFUNC "researchfunctions.txt"

19 changes: 14 additions & 5 deletions data/base/wrf/limiter_tex.wrf
View file
@@ -1,27 +1,36 @@
/***********************************************************/
/* Used by structlimits screen. */
/* Preload textures */
/********** WRF\limiter.wrf *******************/
/* Used by structlimits screen, and when loading MP games */
/*This is called within the sourcecode to preload textures */
/********** wrf\limiter.wrf *******************/
/***********************************************************/

directory "texpages"
file TEXPAGE "page-6-features-arizona.png"
file TEXPAGE "page-7-barbarians-arizona.png"
file TEXPAGE "page-8-player-buildings-bases.png"
file TEXPAGE "page-9-player-buildings-bases.png"
file TEXPAGE "page-10-laboratories.png"
file TCMASK "page-10_tcmask.png"
file TEXPAGE "page-11-player-buildings.png"
file TCMASK "page-11_tcmask.png"
file TEXPAGE "page-12-player-buildings.png"
file TCMASK "page-12_tcmask.png"
file TEXPAGE "page-13-player-buildings.png"
file TCMASK "page-13_tcmask.png"
file TEXPAGE "page-14-droid-hubs.png"
file TCMASK "page-14_tcmask.png"
file TEXPAGE "page-15-droid-hubs.png"
file TCMASK "page-15_tcmask.png"
file TEXPAGE "page-16-droid-drives.png"
file TCMASK "page-16_tcmask.png"
file TEXPAGE "page-17-droid-weapons.png"
file TCMASK "page-17_tcmask.png"
file TEXPAGE "page-18-fx.png"
file TEXPAGE "page-19-fx.png"
file TEXPAGE "page-20-fx.png"
file TEXPAGE "page-21-fx.png"
file TEXPAGE "page-22-fx.png"
file TEXPAGE "page-23-fx.png"
file TEXPAGE "page-24-fx.png"
file TEXPAGE "page-28-naval.png"
file TEXPAGE "page-59-more-weapons.png"
file TEXPAGE "page-28-naval.png"
file TEXPAGE "page-59-more-weapons.png"
20 changes: 15 additions & 5 deletions data/base/wrf/vidmem.wrf
View file
@@ -1,7 +1,6 @@
/***********************************************************/
/* You may have to modify this file for it to be correct! */
/******************* wrf\VidMem.wrf *******************/

/******************* wrf\VidMem.wrf *******************/
/***********************************************************/

directory "images"
file IMGPAGE "intfac0.png"
Expand All @@ -10,33 +9,44 @@ file IMGPAGE "intfac2.png"
file IMGPAGE "intfac3.png"
file IMGPAGE "intfac4.png"
file IMGPAGE "intfac5.png"
file IMG "intfac.img"
// must load resources before IMG file
file IMG "intfac.img"

directory "texpages"
file TERTILES "tertilesc1hw"
file TEXPAGE "page-6-features-arizona.png"
file TEXPAGE "page-7-barbarians-arizona.png"
file TEXPAGE "page-8-player-buildings-bases.png"
file TEXPAGE "page-9-player-buildings-bases.png"
file TEXPAGE "page-10-laboratories.png"
file TCMASK "page-10_tcmask.png"
file TEXPAGE "page-11-player-buildings.png"
file TCMASK "page-11_tcmask.png"
file TEXPAGE "page-12-player-buildings.png"
file TCMASK "page-12_tcmask.png"
file TEXPAGE "page-13-player-buildings.png"
file TCMASK "page-13_tcmask.png"
file TEXPAGE "page-14-droid-hubs.png"
file TCMASK "page-14_tcmask.png"
file TEXPAGE "page-15-droid-hubs.png"
file TCMASK "page-15_tcmask.png"
file TEXPAGE "page-16-droid-drives.png"
file TCMASK "page-16_tcmask.png"
file TEXPAGE "page-17-droid-weapons.png"
file TCMASK "page-17_tcmask.png"
file TEXPAGE "page-18-fx.png"
file TEXPAGE "page-19-fx.png"
file TEXPAGE "page-20-fx.png"
file TEXPAGE "page-21-fx.png"
file TEXPAGE "page-22-fx.png"
file TEXPAGE "page-23-fx.png"
file TEXPAGE "page-24-fx.png"
/* Below is terrain specific */
file TEXPAGE "page-25-sky-arizona.png"
file TEXPAGE "page-42-rock.png"
file TEXPAGE "page-44-mud.png"
file TEXPAGE "page-45-yellow-sand.png"
file TEXPAGE "page-46-cliff.png"
file TEXPAGE "page-47-tiles.png"
file TEXPAGE "page-42-rock.png"
file TEXPAGE "page-80-water-1.png"
file TEXPAGE "page-81-water-2.png"
20 changes: 15 additions & 5 deletions data/base/wrf/vidmem2.wrf
View file
@@ -1,7 +1,7 @@
/***********************************************************/
/* You may have to modify this file for it to be correct! */
/******************* wrf\vidmem2.wrf *******************/

/******************* wrf\vidmem2.wrf *******************/
/* When you change these, also update cam2/cam2change.wrf */
/***********************************************************/

directory "images"
file IMGPAGE "intfac0.png"
Expand All @@ -10,29 +10,39 @@ file IMGPAGE "intfac2.png"
file IMGPAGE "intfac3.png"
file IMGPAGE "intfac4.png"
file IMGPAGE "intfac5.png"
file IMG "intfac.img"
// must load resources before IMG file
file IMG "intfac.img"

directory "texpages"
file TERTILES "tertilesc2hw"
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"
file TEXPAGE "page-10-laboratories.png"
file TCMASK "page-10_tcmask.png"
file TEXPAGE "page-11-player-buildings.png"
file TCMASK "page-11_tcmask.png"
file TEXPAGE "page-12-player-buildings.png"
file TCMASK "page-12_tcmask.png"
file TEXPAGE "page-13-player-buildings.png"
file TCMASK "page-13_tcmask.png"
file TEXPAGE "page-14-droid-hubs.png"
file TCMASK "page-14_tcmask.png"
file TEXPAGE "page-15-droid-hubs.png"
file TCMASK "page-15_tcmask.png"
file TEXPAGE "page-16-droid-drives.png"
file TCMASK "page-16_tcmask.png"
file TEXPAGE "page-17-droid-weapons.png"
file TCMASK "page-17_tcmask.png"
file TEXPAGE "page-18-fx.png"
file TEXPAGE "page-19-fx.png"
file TEXPAGE "page-20-fx.png"
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 */
/* Below is terrain specific, see note at top! */
file TEXPAGE "page-25-sky-urban.png"
file TEXPAGE "page-47-tiles.png"
file TEXPAGE "page-49-dirt.png"
Expand Down
21 changes: 15 additions & 6 deletions data/base/wrf/vidmem3.wrf
View file
@@ -1,7 +1,7 @@
/***********************************************************/
/* You may have to modify this file for it to be correct! */
/******************* wrf\vidmem3.wrf *******************/

/******************* wrf\vidmem3.wrf *******************/
/* When you change these, also update cam3/cam3change.wrf */
/***********************************************************/

directory "images"
file IMGPAGE "intfac0.png"
Expand All @@ -10,39 +10,48 @@ file IMGPAGE "intfac2.png"
file IMGPAGE "intfac3.png"
file IMGPAGE "intfac4.png"
file IMGPAGE "intfac5.png"
file IMG "intfac.img"
// must load resources before IMG file
file IMG "intfac.img"
directory "texpages"
file TERTILES "tertilesc3hw"
file TEXPAGE "page-6-features-rockies.png"
file TEXPAGE "page-7-barbarians-arizona.png"
file TEXPAGE "page-8-player-buildings-bases-rockies.png"
file TEXPAGE "page-9-player-buildings-bases-rockies.png"
file TEXPAGE "page-10-laboratories.png"
file TCMASK "page-10_tcmask.png"
file TEXPAGE "page-11-player-buildings.png"
file TCMASK "page-11_tcmask.png"
file TEXPAGE "page-12-player-buildings.png"
file TCMASK "page-12_tcmask.png"
file TEXPAGE "page-13-player-buildings.png"
file TCMASK "page-13_tcmask.png"
file TEXPAGE "page-14-droid-hubs.png"
file TCMASK "page-14_tcmask.png"
file TEXPAGE "page-15-droid-hubs.png"
file TCMASK "page-15_tcmask.png"
file TEXPAGE "page-16-droid-drives.png"
file TCMASK "page-16_tcmask.png"
file TEXPAGE "page-17-droid-weapons.png"
file TCMASK "page-17_tcmask.png"
file TEXPAGE "page-18-fx.png"
file TEXPAGE "page-19-fx.png"
file TEXPAGE "page-20-fx.png"
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 */
/* Below is terrain specific, see note at top! */
file TEXPAGE "page-25-sky-urban.png"
file TEXPAGE "page-42-rock.png"
file TEXPAGE "page-46-cliff.png"
file TEXPAGE "page-47-tiles.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"

24 changes: 17 additions & 7 deletions data/mp/wrf/vidmem.wrf
View file
@@ -1,7 +1,6 @@
/***********************************************************/
/* You may have to modify this file for it to be correct! */
/******************* wrf\VidMem.wrf *******************/

/******************* wrf\VidMem.wrf *******************/
/***********************************************************/

directory "images"
file IMGPAGE "intfac0.png"
Expand All @@ -10,22 +9,31 @@ file IMGPAGE "intfac2.png"
file IMGPAGE "intfac3.png"
file IMGPAGE "intfac4.png"
file IMGPAGE "intfac5.png"
file IMG "intfac.img"
// must load resources before IMG file
file IMG "intfac.img"

directory "texpages"
file TERTILES "tertilesc1hw"
file TEXPAGE "page-59-more-weapons.png"
file TEXPAGE "page-6-features-arizona.png"
file TEXPAGE "page-7-barbarians-arizona.png"
file TEXPAGE "page-8-player-buildings-bases.png"
file TEXPAGE "page-9-player-buildings-bases.png"
file TEXPAGE "page-10-laboratories.png"
file TCMASK "page-10_tcmask.png"
file TEXPAGE "page-11-player-buildings.png"
file TCMASK "page-11_tcmask.png"
file TEXPAGE "page-12-player-buildings.png"
file TCMASK "page-12_tcmask.png"
file TEXPAGE "page-13-player-buildings.png"
file TCMASK "page-13_tcmask.png"
file TEXPAGE "page-14-droid-hubs.png"
file TCMASK "page-14_tcmask.png"
file TEXPAGE "page-15-droid-hubs.png"
file TCMASK "page-15_tcmask.png"
file TEXPAGE "page-16-droid-drives.png"
file TCMASK "page-16_tcmask.png"
file TEXPAGE "page-17-droid-weapons.png"
file TCMASK "page-17_tcmask.png"
file TEXPAGE "page-18-fx.png"
file TEXPAGE "page-19-fx.png"
file TEXPAGE "page-20-fx.png"
Expand All @@ -34,11 +42,13 @@ file TEXPAGE "page-22-fx.png"
file TEXPAGE "page-23-fx.png"
file TEXPAGE "page-24-fx.png"
file TEXPAGE "page-25-sky-arizona.png"
file TEXPAGE "page-28-naval.png"
file TEXPAGE "page-42-rock.png"
file TEXPAGE "page-44-mud.png"
file TEXPAGE "page-45-yellow-sand.png"
file TEXPAGE "page-46-cliff.png"
file TEXPAGE "page-47-tiles.png"
file TEXPAGE "page-42-rock.png"
file TEXPAGE "page-80-water-1.png"
file TEXPAGE "page-81-water-2.png"
/* These are MP specific *./
file TEXPAGE "page-28-naval.png"
file TEXPAGE "page-59-more-weapons.png"

0 comments on commit e70c367

Please sign in to comment.