1
0
forked from 0ad/0ad

New terrain properties stuff, gcc compatability and updated unix debugging stuff

This was SVN commit r2582.
This commit is contained in:
Simon Brenner 2005-08-07 22:00:16 +00:00
parent b3a9ed2886
commit 43baf6ada6
20 changed files with 68 additions and 266 deletions

View File

@ -1,38 +0,0 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain tag="aaa.dds" groups="cliff" skin="art/textures/terrain/types/cliff/aaa.dds">
</Terrain>
<Terrain tag="cliff volcanic coarse.dds" groups="cliff" skin="art/textures/terrain/types/cliff/cliff volcanic coarse.dds">
</Terrain>
<Terrain tag="cliff volcanic ground.dds" groups="cliff" skin="art/textures/terrain/types/cliff/cliff volcanic ground.dds">
</Terrain>
<Terrain tag="cliff volcanic light.dds" groups="cliff" skin="art/textures/terrain/types/cliff/cliff volcanic light.dds">
</Terrain>
<Terrain tag="cliff1.dds" groups="cliff" skin="art/textures/terrain/types/cliff/cliff1.dds">
</Terrain>
<Terrain tag="cliff1_moss.dds" groups="cliff" skin="art/textures/terrain/types/cliff/cliff1_moss.dds">
</Terrain>
<Terrain tag="cliff2.dds" groups="cliff" skin="art/textures/terrain/types/cliff/cliff2.dds">
</Terrain>
<Terrain tag="cliff2_moss.dds" groups="cliff" skin="art/textures/terrain/types/cliff/cliff2_moss.dds">
</Terrain>
<Terrain tag="cliff_greek_moss.dds" groups="cliff" skin="art/textures/terrain/types/cliff/cliff_greek_moss.dds">
</Terrain>
<Terrain tag="cliff_greeka.dds" groups="cliff" skin="art/textures/terrain/types/cliff/cliff_greeka.dds">
</Terrain>
<Terrain tag="cliff_greeka_moss.dds" groups="cliff" skin="art/textures/terrain/types/cliff/cliff_greeka_moss.dds">
</Terrain>
<Terrain tag="cliff_greekb.dds" groups="cliff" skin="art/textures/terrain/types/cliff/cliff_greekb.dds">
</Terrain>
<Terrain tag="cliff_greekb_moss.dds" groups="cliff" skin="art/textures/terrain/types/cliff/cliff_greekb_moss.dds">
</Terrain>
<Terrain tag="cliff_mountain.dds" groups="cliff" skin="art/textures/terrain/types/cliff/cliff_mountain.dds">
</Terrain>
<Terrain tag="cliff_ridges.dds" groups="cliff" skin="art/textures/terrain/types/cliff/cliff_ridges.dds">
</Terrain>
<Terrain tag="cliff_soft.dds" groups="cliff" skin="art/textures/terrain/types/cliff/cliff_soft.dds">
</Terrain>
</Terrains>

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain groups="cliff" />
</Terrains>

View File

@ -1,40 +0,0 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain tag="desert_coarse.dds" groups="dirt" skin="art/textures/terrain/types/dirt/desert_coarse.dds">
</Terrain>
<Terrain tag="dirt_beach.dds" groups="dirt" skin="art/textures/terrain/types/dirt/dirt_beach.dds">
</Terrain>
<Terrain tag="dirt_brown_a.dds" groups="dirt" skin="art/textures/terrain/types/dirt/dirt_brown_a.dds">
</Terrain>
<Terrain tag="dirt_brown_b.dds" groups="dirt" skin="art/textures/terrain/types/dirt/dirt_brown_b.dds">
</Terrain>
<Terrain tag="dirt_brown_c.dds" groups="dirt" skin="art/textures/terrain/types/dirt/dirt_brown_c.dds">
</Terrain>
<Terrain tag="dirt_brown_d.dds" groups="dirt" skin="art/textures/terrain/types/dirt/dirt_brown_d.dds">
</Terrain>
<Terrain tag="dirt_brown_e.dds" groups="dirt" skin="art/textures/terrain/types/dirt/dirt_brown_e.dds">
</Terrain>
<Terrain tag="dirt_brown_rocks.dds" groups="dirt" skin="art/textures/terrain/types/dirt/dirt_brown_rocks.dds">
</Terrain>
<Terrain tag="dirt_cracks.dds" groups="dirt" skin="art/textures/terrain/types/dirt/dirt_cracks.dds">
</Terrain>
<Terrain tag="dirt_mud_a.dds" groups="dirt" skin="art/textures/terrain/types/dirt/dirt_mud_a.dds">
</Terrain>
<Terrain tag="dirt_river.dds" groups="dirt" skin="art/textures/terrain/types/dirt/dirt_river.dds">
</Terrain>
<Terrain tag="dirt_soft.dds" groups="dirt" skin="art/textures/terrain/types/dirt/dirt_soft.dds">
</Terrain>
<Terrain tag="dirta.dds" groups="dirt" skin="art/textures/terrain/types/dirt/dirta.dds">
</Terrain>
<Terrain tag="dirta_stones.dds" groups="dirt" skin="art/textures/terrain/types/dirt/dirta_stones.dds">
</Terrain>
<Terrain tag="dirtc.dds" groups="dirt" skin="art/textures/terrain/types/dirt/dirtc.dds">
</Terrain>
<Terrain tag="dirtd.dds" groups="dirt" skin="art/textures/terrain/types/dirt/dirtd.dds">
</Terrain>
<Terrain tag="dirte.dds" groups="dirt" skin="art/textures/terrain/types/dirt/dirte.dds">
</Terrain>
</Terrains>

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain groups="dirt" />
</Terrains>

View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain tag="dirt_forest.dds" groups="forestfloor" skin="art/textures/terrain/types/forestfloor/dirt_forest.dds">
</Terrain>
<Terrain tag="forrestfloor.dds" groups="forestfloor" skin="art/textures/terrain/types/forestfloor/forrestfloor.dds">
</Terrain>
<Terrain tag="grass_foliage.dds" groups="forestfloor" skin="art/textures/terrain/types/forestfloor/grass_foliage.dds">
</Terrain>
<Terrain tag="grass_forest_dead.dds" groups="forestfloor" skin="art/textures/terrain/types/forestfloor/grass_forest_dead.dds">
</Terrain>
<Terrain tag="grass_forest_floor_oak.dds" groups="forestfloor" skin="art/textures/terrain/types/forestfloor/grass_forest_floor_oak.dds">
</Terrain>
<Terrain tag="grass_foresta.dds" groups="forestfloor" skin="art/textures/terrain/types/forestfloor/grass_foresta.dds">
</Terrain>
<Terrain tag="grass_forestb.dds" groups="forestfloor" skin="art/textures/terrain/types/forestfloor/grass_forestb.dds">
</Terrain>
</Terrains>

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain groups="forestfloor" />
</Terrains>

View File

@ -1,58 +0,0 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain tag="grass dirt 25.dds" groups="grass" skin="art/textures/terrain/types/grass/grass dirt 25.dds">
</Terrain>
<Terrain tag="grass dirt 50.dds" groups="grass" skin="art/textures/terrain/types/grass/grass dirt 50.dds">
</Terrain>
<Terrain tag="grass dirt 75.dds" groups="grass" skin="art/textures/terrain/types/grass/grass dirt 75.dds">
</Terrain>
<Terrain tag="grass1_a.dds" groups="grass" skin="art/textures/terrain/types/grass/grass1_a.dds">
</Terrain>
<Terrain tag="grass1_autumn.dds" groups="grass" skin="art/textures/terrain/types/grass/grass1_autumn.dds">
</Terrain>
<Terrain tag="grass1_dense.dds" groups="grass" skin="art/textures/terrain/types/grass/grass1_dense.dds">
</Terrain>
<Terrain tag="grass1_spring.dds" groups="grass" skin="art/textures/terrain/types/grass/grass1_spring.dds">
</Terrain>
<Terrain tag="grass2.dds" groups="grass" skin="art/textures/terrain/types/grass/grass2.dds">
</Terrain>
<Terrain tag="grass2_light.dds" groups="grass" skin="art/textures/terrain/types/grass/grass2_light.dds">
</Terrain>
<Terrain tag="grass2_patchy_dirt.dds" groups="grass" skin="art/textures/terrain/types/grass/grass2_patchy_dirt.dds">
</Terrain>
<Terrain tag="grass2_patchy_grass.dds" groups="grass" skin="art/textures/terrain/types/grass/grass2_patchy_grass.dds">
</Terrain>
<Terrain tag="grass_dirt.dds" groups="grass" skin="art/textures/terrain/types/grass/grass_dirt.dds">
</Terrain>
<Terrain tag="grass_dirt_light 50.dds" groups="grass" skin="art/textures/terrain/types/grass/grass_dirt_light 50.dds">
</Terrain>
<Terrain tag="grass_dry_100.dds" groups="grass" skin="art/textures/terrain/types/grass/grass_dry_100.dds">
</Terrain>
<Terrain tag="grass_dry_25.dds" groups="grass" skin="art/textures/terrain/types/grass/grass_dry_25.dds">
</Terrain>
<Terrain tag="grass_dry_50.dds" groups="grass" skin="art/textures/terrain/types/grass/grass_dry_50.dds">
</Terrain>
<Terrain tag="grass_dry_75.dds" groups="grass" skin="art/textures/terrain/types/grass/grass_dry_75.dds">
</Terrain>
<Terrain tag="grass_dry_dead.dds" groups="grass" skin="art/textures/terrain/types/grass/grass_dry_dead.dds">
</Terrain>
<Terrain tag="grass_highlands_a.dds" groups="grass" skin="art/textures/terrain/types/grass/grass_highlands_a.dds">
</Terrain>
<Terrain tag="grass_misc.dds" groups="grass" skin="art/textures/terrain/types/grass/grass_misc.dds">
</Terrain>
<Terrain tag="grass_mud_50.dds" groups="grass" skin="art/textures/terrain/types/grass/grass_mud_50.dds">
</Terrain>
<Terrain tag="grass_sand_100.dds" groups="grass" skin="art/textures/terrain/types/grass/grass_sand_100.dds">
</Terrain>
<Terrain tag="grass_sand_25_2.dds" groups="grass" skin="art/textures/terrain/types/grass/grass_sand_25_2.dds">
</Terrain>
<Terrain tag="grass_sand_50.dds" groups="grass" skin="art/textures/terrain/types/grass/grass_sand_50.dds">
</Terrain>
<Terrain tag="grass_sand_75.dds" groups="grass" skin="art/textures/terrain/types/grass/grass_sand_75.dds">
</Terrain>
<Terrain tag="grass_soft.dds" groups="grass" skin="art/textures/terrain/types/grass/grass_soft.dds">
</Terrain>
</Terrains>

View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain
groups="grass">
</Terrain>
</Terrains>

View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain tag="road1.dds" groups="road" skin="art/textures/terrain/types/road/road1.dds">
</Terrain>
<Terrain tag="road2.dds" groups="road" skin="art/textures/terrain/types/road/road2.dds">
</Terrain>
<Terrain tag="road3.dds" groups="road" skin="art/textures/terrain/types/road/road3.dds">
</Terrain>
<Terrain tag="road_5.dds" groups="road" skin="art/textures/terrain/types/road/road_5.dds">
</Terrain>
<Terrain tag="road_med.dds" groups="road" skin="art/textures/terrain/types/road/road_med.dds">
</Terrain>
<Terrain tag="road_med_a.dds" groups="road" skin="art/textures/terrain/types/road/road_med_a.dds">
</Terrain>
<Terrain tag="road_roman.dds" groups="road" skin="art/textures/terrain/types/road/road_roman.dds">
</Terrain>
<Terrain tag="road_rome_a.dds" groups="road" skin="art/textures/terrain/types/road/road_rome_a.dds">
</Terrain>
</Terrains>

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain groups="road" />
</Terrains>

View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain tag="desert_coarse.dds" groups="sand" skin="art/textures/terrain/types/sand/desert_coarse.dds">
</Terrain>
<Terrain tag="desert_rough.dds" groups="sand" skin="art/textures/terrain/types/sand/desert_rough.dds">
</Terrain>
<Terrain tag="desert_sahara.dds" groups="sand" skin="art/textures/terrain/types/sand/desert_sahara.dds">
</Terrain>
<Terrain tag="desert_wave.dds" groups="sand" skin="art/textures/terrain/types/sand/desert_wave.dds">
</Terrain>
<Terrain tag="sand.dds" groups="sand" skin="art/textures/terrain/types/sand/sand.dds">
</Terrain>
<Terrain tag="sand_dunes.dds" groups="sand" skin="art/textures/terrain/types/sand/sand_dunes.dds">
</Terrain>
<Terrain tag="sand_scrub_100.dds" groups="sand" skin="art/textures/terrain/types/sand/sand_scrub_100.dds">
</Terrain>
<Terrain tag="sand_scrub_25.dds" groups="sand" skin="art/textures/terrain/types/sand/sand_scrub_25.dds">
</Terrain>
<Terrain tag="sand_scrub_50.dds" groups="sand" skin="art/textures/terrain/types/sand/sand_scrub_50.dds">
</Terrain>
<Terrain tag="sand_scrub_75.dds" groups="sand" skin="art/textures/terrain/types/sand/sand_scrub_75.dds">
</Terrain>
</Terrains>

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain groups="sand" />
</Terrains>

View File

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain tag="snow 50.dds" groups="snow" skin="art/textures/terrain/types/snow/snow 50.dds">
</Terrain>
<Terrain tag="snow forest frost.dds" groups="snow" skin="art/textures/terrain/types/snow/snow forest frost.dds">
</Terrain>
<Terrain tag="snow forest.dds" groups="snow" skin="art/textures/terrain/types/snow/snow forest.dds">
</Terrain>
<Terrain tag="snow grass 100.dds" groups="snow" skin="art/textures/terrain/types/snow/snow grass 100.dds">
</Terrain>
<Terrain tag="snow grass 2.dds" groups="snow" skin="art/textures/terrain/types/snow/snow grass 2.dds">
</Terrain>
<Terrain tag="snow grass 25bmp.dds" groups="snow" skin="art/textures/terrain/types/snow/snow grass 25bmp.dds">
</Terrain>
<Terrain tag="snow grass 75.dds" groups="snow" skin="art/textures/terrain/types/snow/snow grass 75.dds">
</Terrain>
<Terrain tag="snow rocks.dds" groups="snow" skin="art/textures/terrain/types/snow/snow rocks.dds">
</Terrain>
<Terrain tag="snow rough.dds" groups="snow" skin="art/textures/terrain/types/snow/snow rough.dds">
</Terrain>
<Terrain tag="snow.dds" groups="snow" skin="art/textures/terrain/types/snow/snow.dds">
</Terrain>
<Terrain tag="snow_c.dds" groups="snow" skin="art/textures/terrain/types/snow/snow_c.dds">
</Terrain>
</Terrains>

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain groups="snow" />
</Terrains>

View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain tag="blackness.dds" groups="special" skin="art/textures/terrain/types/special/blackness.dds">
</Terrain>
<Terrain tag="furrows_dirt.dds" groups="special" skin="art/textures/terrain/types/special/furrows_dirt.dds">
</Terrain>
<Terrain tag="furrows_fall.dds" groups="special" skin="art/textures/terrain/types/special/furrows_fall.dds">
</Terrain>
<Terrain tag="furrows_spring.dds" groups="special" skin="art/textures/terrain/types/special/furrows_spring.dds">
</Terrain>
<Terrain tag="furrows_spring_b.dds" groups="special" skin="art/textures/terrain/types/special/furrows_spring_b.dds">
</Terrain>
<Terrain tag="furrows_summer.dds" groups="special" skin="art/textures/terrain/types/special/furrows_summer.dds">
</Terrain>
</Terrains>

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain groups="special" />
</Terrains>

View File

@ -1,10 +1,7 @@
<!ELEMENT Terrains (Terrain+)>
<!ELEMENT Terrains (Terrain)>
<!ELEMENT Terrain (Passable*,Doodad*,Event*)>
<!ATTLIST Terrain
tag CDATA #REQUIRED
skin CDATA ""
parent CDATA ""
mmap CDATA #IMPLIED
groups CDATA ""
properties CDATA "">

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain groups="water" />
</Terrains>

View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
<!DOCTYPE Terrains SYSTEM "/art/textures/terrain/types/terrains.dtd">
<Terrains>
<Terrain tag="water_1.dds" groups="water" skin="art/textures/terrain/types/water/water_1.dds">
</Terrain>
<Terrain tag="water_2.dds" groups="water" skin="art/textures/terrain/types/water/water_2.dds">
</Terrain>
<Terrain tag="water_3.dds" groups="water" skin="art/textures/terrain/types/water/water_3.dds">
</Terrain>
</Terrains>

View File

@ -46,6 +46,8 @@ function worldClickHandler(event)
{
cmd = NMT_AddWaypoint;
}
args[0]=event.x;
args[1]=event.y;
break;
case NMT_AddWaypoint:
args[0]=event.x;