[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] rev 2333 - in trunk: data/data src src/editor
|
From: |
Ingo Ruhnke |
|
Subject: |
[Pingus-CVS] rev 2333 - in trunk: data/data src src/editor |
|
Date: |
Tue, 11 May 2004 02:58:49 +0200 |
Author: grumbel
Date: 2004-05-11 02:58:46 +0200 (Tue, 11 May 2004)
New Revision: 2333
Modified:
trunk/data/data/alias.xml
trunk/data/data/game.xml
trunk/data/data/pingus.xml
trunk/src/editor/object_selector.cxx
trunk/src/resource.cxx
trunk/src/resource.hxx
Log:
- some more resource stuff
Modified: trunk/data/data/alias.xml
===================================================================
--- trunk/data/data/alias.xml 2004-05-10 23:28:32 UTC (rev 2332)
+++ trunk/data/data/alias.xml 2004-05-11 00:58:46 UTC (rev 2333)
@@ -1,408 +1,442 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<resources>
- <alias name="buttons/pause" link="Buttons/pause" />
- <alias name="entrances/cloud" link="Entrances/cloud" />
- <alias name="entrances/entrance" link="Entrances/entrance" />
- <alias name="entrances/entrance_eyes" link="Entrances/entrance_eyes" />
- <alias name="entrances/entrance_eyes_anim"
link="Entrances/entrance_eyes_anim" />
- <alias name="entrances/underlay_eyes" link="Entrances/underlay_eyes" />
- <alias name="entrances/generic" link="Entrances/generic" />
- <alias name="entrances/industrial" link="Entrances/industrial" />
- <alias name="entrances/industrial_top" link="Entrances/industrial_top" />
- <alias name="entrances/space" link="Entrances/space" />
- <alias name="entrances/wood_bottom" link="Entrances/wood_bottom" />
- <alias name="entrances/wood_top" link="Entrances/wood_top" />
- <alias name="entrances/woodthing_mov" link="Entrances/woodthing_mov" />
- <alias name="entrances/woodthing_nmov" link="Entrances/woodthing_nmov" />
- <alias name="exits/crystal" link="Exits/crystal" />
- <alias name="exits/desert_tut" link="Exits/desert_tut" />
- <alias name="exits/desert" link="Exits/desert" />
- <alias name="exits/ice" link="Exits/ice" />
- <alias name="exits/industrial" link="Exits/industrial" />
- <alias name="exits/ordina" link="Exits/sortie_1" />
- <alias name="exits/sortie" link="Exits/sortie" />
- <alias name="exits/sortie_anim" link="Exits/sortie_anim" />
- <alias name="exits/space" link="Exits/space" />
- <alias name="exits/stone" link="Exits/stone" />
- <alias name="exits/sweetexit" link="Exits/sweetexit" />
- <alias name="misc/bridge_left" link="Misc/bridge_left" />
- <alias name="misc/bridge_right" link="Misc/bridge_right" />
- <alias name="space/grid1" link="Space/grid1" />
- <alias name="space/grid2" link="Space/grid2" />
- <alias name="space/grid3" link="Space/grid3" />
- <alias name="crystal/block" link="Crystal/block" />
- <alias name="crystal/column" link="Crystal/column" />
- <alias name="crystal/diagcrystal" link="Crystal/diagcrystal" />
- <alias name="crystal/hexcrystal" link="Crystal/hexcrystal" />
- <alias name="crystal/horiz" link="Crystal/horiz" />
- <alias name="crystal/horiz2" link="Crystal/horiz2" />
- <alias name="crystal/pipe" link="Crystal/pipe" />
- <alias name="crystal/pipeend" link="Crystal/pipeend" />
- <alias name="crystal/platform" link="Crystal/platform" />
- <alias name="crystal/platform2" link="Crystal/platform2" />
- <alias name="crystal/pointleft" link="Crystal/pointleft" />
- <alias name="crystal/pointright" link="Crystal/pointright" />
- <alias name="crystal/skinnycrystal" link="Crystal/skinnycrystal" />
- <alias name="crystal/smcrystal" link="Crystal/smcrystal" />
- <alias name="crystal/tesselate" link="Crystal/tesselate" />
- <alias name="desert/bigblock-broken1" link="Desert/bigblock-broken1" />
- <alias name="desert/bigblock-broken2" link="Desert/bigblock-broken2" />
- <alias name="desert/bigdune1" link="Desert/bigdune1" />
- <alias name="desert/bigprickpiece" link="Desert/bigprickpiece" />
- <alias name="desert/bigprickpiece" link="Misc/bigprickpiece" />
- <alias name="desert/bigsand" link="Ywlam/bigsand" />
- <alias name="desert/blobdune" link="Desert/blobdune" />
- <alias name="desert/column_piece1" link="Hotspots/colum_pice1" />
- <alias name="desert/column_piece1" link="Hotspots/colum_piece1" />
- <alias name="desert/column_piece2" link="Hotspots/colum_pice2" />
- <alias name="desert/column_piece2" link="Hotspots/colum_piece2" />
- <alias name="desert/column_piece3" link="Hotspots/colum_pice3" />
- <alias name="desert/column_piece3" link="Hotspots/colum_piece3" />
- <alias name="desert/domedune" link="Desert/domedune" />
- <alias name="desert/flatdune" link="Desert/flatdune" />
- <alias name="desert/leftsmallbrick" link="Ywlam/leftsmallbrick" />
- <alias name="desert/leftsmallsand" link="Ywlam/leftsmallsand" />
- <alias name="desert/mediumsand" link="Ywlam/mediumsand" />
- <alias name="desert/middleprickpiece" link="Desert/middleprickpiece" />
- <alias name="desert/middleprickpiece" link="Misc/middleprickpiece" />
- <alias name="desert/peakdune" link="Desert/peakdune" />
- <alias name="desert/pillar1" link="Desert/pillar1" />
- <alias name="desert/pillar1" link="Hotspots/pillar1" />
- <alias name="desert/pillar2" link="Desert/pillar2" />
- <alias name="desert/pillar2" link="Hotspots/pillar2" />
- <alias name="desert/pillar3" link="Desert/pillar3" />
- <alias name="desert/pillar3" link="Hotspots/pillar3" />
- <alias name="desert/platform" link="Misc/way" />
- <alias name="desert/platform_left" link="Misc/way_left" />
- <alias name="desert/platform_right" link="Misc/way_right" />
- <alias name="desert/rightsmallbrick" link="Ywlam/rightsmallbrick" />
- <alias name="desert/rightsmallsand" link="Ywlam/rightsmallsand" />
- <alias name="desert/sluggydu" link="Desert/Sluggydu" />
- <alias name="desert/smallbrickpiece" link="Desert/smallbrickpiece" />
- <alias name="desert/smallbrickpiece" link="Misc/smallbrickpiece" />
- <alias name="desert/smallsand" link="Ywlam/smallsand" />
- <alias name="foliage/flax1" link="Foliage/flax1" />
- <alias name="foliage/flax2" link="Foliage/flax2" />
- <alias name="foliage/midtree1" link="Foliage/midtree1" />
- <alias name="foliage/midtree2" link="Foliage/midtree2" />
- <alias name="foliage/oak1" link="Foliage/oak1" />
- <alias name="foliage/rock1" link="Rock/rock1" />
- <alias name="foliage/rock2" link="Rock/rock2" />
- <alias name="foliage/rock3" link="Rock/rock3" />
- <alias name="foliage/rock4" link="Rock/rock4" />
- <alias name="foliage/rock5" link="Rock/rock5" />
- <alias name="foliage/rock6" link="Rock/rock6" />
- <alias name="foliage/smallbush" link="Foliage/smallbush" />
- <alias name="foliage/smallbush2" link="Foliage/smallbush2" />
- <alias name="foliage/smallbush3" link="Foliage/smallbush3" />
- <alias name="foliage/talltree" link="Foliage/talltree" />
- <alias name="industrial/pipe1" link="GroundPieces/pipe_h" />
- <alias name="industrial/pipe1" link="Industrial/pipe_h" />
- <alias name="industrial/pipe2" link="GroundPieces/pipe_v" />
- <alias name="industrial/pipe2" link="Industrial/pipe_v" />
- <alias name="industrial/pipe4" link="GroundPieces/pipe_ph" />
- <alias name="industrial/pipe4" link="Industrial/pipe_ph" />
- <alias name="industrial/pipe5" link="GroundPieces/pipe_pv" />
- <alias name="industrial/pipe5" link="Industrial/pipe_pv" />
- <alias name="industrial/pipe_bl" link="GroundPieces/pipe_dl" />
- <alias name="industrial/pipe_bl" link="Industrial/pipe_dl" />
- <alias name="industrial/pipe_br" link="GroundPieces/pipe_dr" />
- <alias name="industrial/pipe_br" link="Industrial/pipe_dr" />
- <alias name="industrial/pipe_ul" link="GroundPieces/pipe_ul" />
- <alias name="industrial/pipe_ul" link="Industrial/pipe_ul" />
- <alias name="industrial/pipe_ur" link="GroundPieces/pipe_ur" />
- <alias name="industrial/pipe_ur" link="Industrial/pipe_ur" />
- <alias name="jungle/branch1" link="Jungle/branch1" />
- <alias name="jungle/branch2" link="Jungle/branch2" />
- <alias name="jungle/branch3" link="Jungle/branch3" />
- <alias name="jungle/branch4" link="Jungle/branch4" />
- <alias name="jungle/branch5" link="Jungle/branch5" />
- <alias name="jungle/branch6" link="Jungle/branch6" />
- <alias name="jungle/carabatree" link="Jungle/carabatree" />
- <alias name="jungle/carabatreemedium" link="Jungle/carabatreemedium" />
- <alias name="jungle/carabatreesmall" link="Jungle/carabatreesmall" />
- <alias name="jungle/stick1" link="Jungle/stick1" />
- <alias name="jungle/stick2" link="Jungle/stick2" />
- <alias name="jungle/stick3" link="Jungle/stick3" />
- <alias name="jungle/stick4" link="Jungle/stick4" />
- <alias name="jungle/stick5" link="Jungle/stick5" />
- <alias name="jungle/twist" link="Jungle/twist" />
- <alias name="jungle/twistsmooth" link="Jungle/twistsmooth" />
- <alias name="misc/bpiece1" link="GroundPieces/bpice1" />
- <alias name="misc/bpiece1" link="GroundPieces/bpiece1" />
- <alias name="misc/bpiece2" link="GroundPieces/bpice2" />
- <alias name="misc/bpiece2" link="GroundPieces/bpiece2" />
- <alias name="misc/bpiece3" link="GroundPieces/bpice3" />
- <alias name="misc/bpiece3" link="GroundPieces/bpiece3" />
- <alias name="misc/bpiece4" link="GroundPieces/bpice4" />
- <alias name="misc/bpiece4" link="GroundPieces/bpiece4" />
- <alias name="misc/bpiece5" link="GroundPieces/bpice5" />
- <alias name="misc/bpiece5" link="GroundPieces/bpiece5" />
- <alias name="misc/bpiece6" link="GroundPieces/bpice6" />
- <alias name="misc/bpiece6" link="GroundPieces/bpiece6" />
- <alias name="misc/brick1" link="Misc/brick1" />
- <alias name="misc/brick2" link="Misc/brick2" />
- <alias name="misc/brick3" link="Misc/brick3" />
- <alias name="misc/brick4" link="Misc/brick4" />
- <alias name="misc/bridge1" link="Misc/bridge1" />
- <alias name="misc/column" link="Hotspots/colum" />
- <alias name="misc/column_flat" link="Hotspots/colum_flat" />
- <alias name="misc/dragon" link="Hotspots/dragon" />
- <alias name="misc/green1" link="GroundPieces/green1" />
- <alias name="misc/green2" link="GroundPieces/green2" />
- <alias name="misc/grey_stone1" link="GroundPieces/pice1" />
- <alias name="misc/grey_stone1" link="GroundPieces/piece1" />
- <alias name="misc/grey_stone2" link="GroundPieces/pice2" />
- <alias name="misc/grey_stone2" link="GroundPieces/piece2" />
- <alias name="misc/grey_stone3" link="GroundPieces/pice3" />
- <alias name="misc/grey_stone3" link="GroundPieces/piece3" />
- <alias name="misc/grey_stone4" link="GroundPieces/pice4" />
- <alias name="misc/grey_stone4" link="GroundPieces/piece4" />
- <alias name="misc/grey_stone5" link="GroundPieces/pice5" />
- <alias name="misc/grey_stone5" link="GroundPieces/piece5" />
- <alias name="misc/pfosten" link="Misc/pfosten" />
- <alias name="misc/piece1" link="Misc/piece1" />
- <alias name="misc/piece2" link="Misc/piece2" />
- <alias name="misc/spike" link="Misc/spike" />
- <alias name="misc/stone0" link="Hotspots/stone0" />
- <alias name="misc/stone1" link="Hotspots/stone1" />
- <alias name="misc/stone2" link="Hotspots/stone2" />
- <alias name="misc/stoneblock1" link="Misc/stoneblock1" />
- <alias name="misc/stoneblock2" link="Misc/stoneblock2" />
- <alias name="misc/stoneblock3" link="Misc/stoneblock3" />
- <alias name="misc/stoneblock5" link="Misc/stoneblock5" />
- <alias name="misc/stoneblock6" link="Misc/stoneblock6" />
- <alias name="misc/well" link="Hotspots/well" />
- <alias name="mushroom/toadstool1" link="Mushroom/toadstool1" />
- <alias name="mushroom/toadstool2" link="Mushroom/toadstool2" />
- <alias name="mushroom/toadstool3" link="Mushroom/toadstool3" />
- <alias name="mushroom/toadstool4" link="Mushroom/toadstool4" />
- <alias name="ordina/cable1" link="GroundPieces/cable1" />
- <alias name="ordina/cable2" link="GroundPieces/cable2" />
- <alias name="ordina/cdrom1" link="GroundPieces/cdrom1" />
- <alias name="ordina/clavier1" link="GroundPieces/clavier1" />
- <alias name="ordina/cpu1" link="GroundPieces/cpu1" />
- <alias name="ordina/ecran" link="GroundPieces/ecran" />
- <alias name="ordina/sol2" link="GroundPieces/sol1" />
- <alias name="ordina/sol3" link="GroundPieces/sol2" />
- <alias name="ordina/sol4" link="GroundPieces/sol3" />
- <alias name="real/fish" link="Rock/fish" />
- <alias name="real/green1" link="Rock/green1" />
- <alias name="real/green2" link="Rock/green2" />
- <alias name="real/real1" link="Rock/real1" />
- <alias name="real/real10" link="Rock/real10" />
- <alias name="real/real11" link="Rock/real11" />
- <alias name="real/real12" link="Rock/real12" />
- <alias name="real/real13" link="Rock/real13" />
- <alias name="real/real14" link="Rock/real14" />
- <alias name="real/real15" link="Rock/real15" />
- <alias name="real/real16" link="Rock/real16" />
- <alias name="real/real17" link="Rock/real17" />
- <alias name="real/real18" link="Rock/real18" />
- <alias name="real/real19" link="Rock/real19" />
- <alias name="real/real2" link="Rock/real2" />
- <alias name="real/real20" link="Rock/real20" />
- <alias name="real/real21" link="Rock/real21" />
- <alias name="real/real22" link="Rock/real22" />
- <alias name="real/real23" link="Rock/real23" />
- <alias name="real/real24" link="Rock/real24" />
- <alias name="real/real25" link="Rock/real25" />
- <alias name="real/real26" link="Rock/real26" />
- <alias name="real/real27" link="Rock/real27" />
- <alias name="real/real28" link="Rock/real28" />
- <alias name="real/real29" link="Rock/real29" />
- <alias name="real/real3" link="Rock/real3" />
- <alias name="real/real30" link="Rock/real30" />
- <alias name="real/real35" link="Rock/real35" />
- <alias name="real/real36" link="Rock/real36" />
- <alias name="real/real37" link="Rock/real37" />
- <alias name="real/real4" link="Rock/real4" />
- <alias name="real/real5" link="Rock/real5" />
- <alias name="real/real6" link="Rock/real6" />
- <alias name="real/real7" link="Rock/real7" />
- <alias name="real/real8" link="Rock/real8" />
- <alias name="real/real9" link="Rock/real9" />
- <alias name="rock/blackrock1" link="Rock/real31" />
- <alias name="rock/blackrock2" link="Rock/real32" />
- <alias name="rock/blackrock3" link="Rock/real33" />
- <alias name="rock/blackrock4" link="Rock/real34" />
- <alias name="signposts/danger" link="Hotspots/danger" />
- <alias name="snow/cabin" link="Hotspots/cabin" />
- <alias name="snow/cabin_winter" link="Hotspots/cabin_winter" />
- <alias name="snow/gpiece1" link="Snow/gpiece1" />
- <alias name="snow/ice1" link="Snow/ice1" />
- <alias name="snow/ice2" link="Snow/ice2" />
- <alias name="snow/igloo" link="Snow/igloo" />
- <alias name="snow/piece1" link="Snow/piece1" />
- <alias name="snow/piece2" link="Snow/piece2" />
- <alias name="snow/piece3" link="Misc/piece3" />
- <alias name="snow/piece3" link="Snow/piece3" />
- <alias name="snow/piece7" link="Misc/piece7" />
- <alias name="snow/piece8" link="Misc/piece8" />
- <alias name="snow/piece9" link="Misc/piece9" />
- <alias name="snow/slopedr" link="Snow/slopedr" />
- <alias name="snow/snowman" link="Snow/snowman" />
- <alias name="snow/xmas-tree" link="Snow/xmas-tree" />
- <alias name="sortie/column" link="Sortie/column1" />
- <alias name="sortie/column2" link="Sortie/column2" />
- <alias name="sortie/column3" link="Sortie/column3" />
- <alias name="sortie/plate_forme" link="Sortie/plate_forme" />
- <alias name="sortie/plate_forme_left" link="Sortie/plate_forme_left" />
- <alias name="sortie/plate_forme_right" link="Sortie/plate_forme_right" />
- <alias name="space/block1" link="Space/block1" />
- <alias name="space/diagonal" link="Space/diagonal" />
- <alias name="space/diagonalr" link="Space/diagonalr" />
- <alias name="space/smallblock1" link="Space/smallblock1" />
- <alias name="space/smallblock2" link="Space/smallblock2" />
- <alias name="space/smallblock3" link="Space/smallblock3" />
- <alias name="space/smalltower" link="Space/smalltower" />
- <alias name="space/tower1" link="Space/tower1" />
- <alias name="space/way" link="Space/way" />
- <alias name="sweets/allsort1" link="Sweets/allsort1" />
- <alias name="sweets/allsort2" link="Sweets/allsort2" />
- <alias name="sweets/aquachoc" link="Sweets/aquachoc" />
- <alias name="sweets/cake1" link="Sweets/cake1" />
- <alias name="sweets/cake2" link="Sweets/cake2" />
- <alias name="sweets/cake3" link="Sweets/cake3" />
- <alias name="sweets/cake4" link="Sweets/cake4" />
- <alias name="sweets/cake5" link="Sweets/cake5" />
- <alias name="sweets/canestalk" link="Sweets/canestalk" />
- <alias name="sweets/canestub" link="Sweets/canestub" />
- <alias name="sweets/canetop" link="Sweets/canetop" />
- <alias name="sweets/chocbar" link="Sweets/chocbar" />
- <alias name="sweets/chocbloc-lowleft" link="Sweets/chocbloc-lowleft" />
- <alias name="sweets/chocbloc-lowright" link="Sweets/chocbloc-lowright" />
- <alias name="sweets/chocbloc-topleft" link="Sweets/chocbloc-topleft" />
- <alias name="sweets/chocbloc-topright" link="Sweets/chocbloc-topright" />
- <alias name="sweets/chocbloc" link="Sweets/chocbloc" />
- <alias name="sweets/goldchoc" link="Sweets/goldchoc" />
- <alias name="sweets/greenjellybaby" link="Sweets/greenjellybaby" />
- <alias name="sweets/greenjellybaby" link="Sweets/jellybaby" />
- <alias name="sweets/icecream" link="Sweets/icecream" />
- <alias name="sweets/jube1" link="Sweets/jube1" />
- <alias name="sweets/jube2" link="Sweets/jube2" />
- <alias name="sweets/lollipop-purp" link="Sweets/lollipop-purp" />
- <alias name="sweets/lollipop" link="Sweets/lollipop" />
- <alias name="sweets/mmblue" link="Sweets/mmblue" />
- <alias name="sweets/mmbrown" link="Sweets/mmbrown" />
- <alias name="sweets/mmred" link="Sweets/mmred" />
- <alias name="sweets/mmyellow" link="Sweets/mmyellow" />
- <alias name="sweets/purpchoc" link="Sweets/purpchoc" />
- <alias name="sweets/purplechoc" link="Sweets/purplechoc" />
- <alias name="sweets/redjellybaby" link="Sweets/jellybaby2" />
- <alias name="sweets/redjellybaby" link="Sweets/redjellybaby" />
- <alias name="test/test1" link="Test/test1" />
- <alias name="test/test2" link="Test/test2" />
- <alias name="test/test3" link="Test/test3" />
- <alias name="test/test4" link="Test/test4" />
- <alias name="test/test5" link="Test/test5" />
- <alias name="test/test6" link="Test/test6" />
- <alias name="industrial/greybri1" link="Industrial/greybri1" />
- <alias name="industrial/greybri2" link="Industrial/greybri2" />
- <alias name="industrial/greybri3" link="Industrial/greybri3" />
- <alias name="industrial/greybri5" link="Industrial/greybri5" />
- <alias name="industrial/joint1" link="Industrial/joint1" />
- <alias name="industrial/joint2" link="Industrial/joint2" />
- <alias name="industrial/joint3" link="Industrial/joint3" />
- <alias name="industrial/joint4" link="Industrial/joint4" />
- <alias name="industrial/joint5" link="Industrial/joint5" />
- <alias name="industrial/rivet" link="Industrial/rivet" />
- <alias name="industrial/screw" link="Industrial/screw" />
- <alias name="industrial/steel1" link="Industrial/steel1" />
- <alias name="industrial/steel1" link="Steel/steel1" />
- <alias name="industrial/steel2" link="Industrial/steel2" />
- <alias name="industrial/steel2" link="Steel/steel2" />
- <alias name="industrial/steel3" link="Industrial/steel3" />
- <alias name="industrial/steel3" link="Steel/steel3" />
- <alias name="industrial/steel4" link="Industrial/steel4" />
- <alias name="industrial/steel4" link="Steel/steel4" />
- <alias name="industrial/steel5" link="Industrial/steel5" />
- <alias name="industrial/steel5" link="Steel/steel5" />
- <alias name="industrial/weld1" link="Industrial/weld1" />
- <alias name="industrial/weld2" link="Industrial/weld2" />
- <alias name="industrial/weld3" link="Industrial/weld3" />
- <alias name="industrial/weld4" link="Industrial/weld4" />
- <alias name="industrial/weld5" link="Industrial/weld5" />
- <alias name="industrial/weld6" link="Industrial/weld6" />
- <alias name="industrial/weld7" link="Industrial/weld7" />
- <alias name="misc/metalplate_horiz" link="Hotspots/plate" />
- <alias name="misc/metalplate_large" link="Hotspots/plate2" />
- <alias name="misc/metalplate_small" link="Hotspots/plate_small" />
- <alias name="rock/granit1" link="Rock/granit1" />
- <alias name="rock/granit2" link="Rock/granit2" />
- <alias name="rock/granit3" link="Rock/granit3" />
- <alias name="rock/granit4" link="Rock/granit4" />
- <alias name="rock/granit5" link="Rock/granit5" />
- <alias name="rock/granit6" link="Rock/granit6" />
- <alias name="foliage/grass1" link="Grass/grass1" />
- <alias name="foliage/grass10" link="Grass/grass10" />
- <alias name="foliage/grass11" link="Grass/grass11" />
- <alias name="foliage/grass12" link="Grass/grass12" />
- <alias name="foliage/grass13" link="Grass/grass13" />
- <alias name="foliage/grass14" link="Grass/grass14" />
- <alias name="foliage/grass15" link="Grass/grass15" />
- <alias name="foliage/grass16" link="Grass/grass16" />
- <alias name="foliage/grass2" link="Grass/grass2" />
- <alias name="foliage/grass3" link="Grass/grass3" />
- <alias name="foliage/grass4" link="Grass/grass4" />
- <alias name="foliage/grass5" link="Grass/grass5" />
- <alias name="foliage/grass6" link="Grass/grass6" />
- <alias name="foliage/grass7" link="Grass/grass7" />
- <alias name="foliage/grass8" link="Grass/grass8" />
- <alias name="foliage/grass9" link="Grass/grass9" />
- <alias name="foliage/turfconcave" link="Foliage/turfconcave" />
- <alias name="foliage/turfflat" link="Foliage/turfflat" />
- <alias name="foliage/turfslopeleft" link="Foliage/turfslopeleft" />
- <alias name="foliage/turfslopeleft20" link="Foliage/turfslopeleft20" />
- <alias name="foliage/turfsloperight" link="Foliage/turfsloperight" />
- <alias name="foliage/turfsloperight20" link="Foliage/turfsloperight20" />
- <alias name="foliage/turfsmallbump" link="Foliage/turfsmallbump" />
- <alias name="foliage/turfsmallnook" link="Foliage/turfsmallnook" />
- <alias name="foliage/turftufty" link="Foliage/turftufty" />
- <alias name="industrial/gunge1" link="Gunge/gunge1" />
- <alias name="industrial/gunge10" link="Gunge/gunge10" />
- <alias name="industrial/gunge11" link="Gunge/gunge11" />
- <alias name="industrial/gunge12" link="Gunge/gunge12" />
- <alias name="industrial/gunge13" link="Gunge/gunge13" />
- <alias name="industrial/gunge14" link="Gunge/gunge14" />
- <alias name="industrial/gunge15" link="Gunge/gunge15" />
- <alias name="industrial/gunge2" link="Gunge/gunge2" />
- <alias name="industrial/gunge3" link="Gunge/gunge3" />
- <alias name="industrial/gunge4" link="Gunge/gunge4" />
- <alias name="industrial/gunge5" link="Gunge/gunge5" />
- <alias name="industrial/gunge6" link="Gunge/gunge6" />
- <alias name="industrial/gunge7" link="Gunge/gunge7" />
- <alias name="industrial/gunge8" link="Gunge/gunge8" />
- <alias name="industrial/gunge9" link="Gunge/gunge9" />
- <alias name="desert/bigdimwall" link="Ywlam/bigdimwall" />
- <alias name="desert/mediumdimwall" link="Ywlam/mediumdimwall" />
- <alias name="desert/mediumegyptpic" link="Ywlam/mediumegpytpict" />
- <alias name="desert/mediummummy" link="Ywlam/mediummummy" />
- <alias name="desert/mediumsphinx" link="Ywlam/mediumsphinx" />
- <alias name="desert/smallD" link="Ywlam/smallD" />
- <alias name="desert/smallE" link="Ywlam/smallE" />
- <alias name="desert/smallG" link="Ywlam/smallG" />
- <alias name="desert/smallO" link="Ywlam/smallO" />
- <alias name="desert/smalldimwall" link="Ywlam/smalldimwall" />
- <alias name="desert/smallegyptpic" link="Ywlam/smallegpytpict" />
- <alias name="desert/smallsphinx" link="Ywlam/smallsphinx" />
- <alias name="signposts/basher" link="signposts/basher" />
- <alias name="signposts/blocker" link="signposts/blocker" />
- <alias name="signposts/bomber" link="signposts/bomber" />
- <alias name="signposts/bridger" link="signposts/bridger" />
- <alias name="signposts/climber" link="signposts/climber" />
- <alias name="signposts/digger" link="signposts/digger" />
- <alias name="signposts/floater" link="signposts/floater" />
- <alias name="signposts/miner" link="signposts/miner" />
- <alias name="signposts/nogo" link="signposts/nogo" />
- <alias name="space/engine" link="Hotspots/engine" />
- <alias name="liquids/lava" link="Liquid/lava" />
- <alias name="liquids/slime" link="Liquid/slime" />
- <alias name="liquids/swater" link="Liquid/swater" />
- <alias name="liquids/water" link="Liquid/water" />
- <alias name="liquids/water2" link="Liquid/water2" />
- <alias name="liquids/water3" link="Liquid/water3" />
- <alias name="liquids/water3" link="Liquid/water5" />
- <alias name="liquids/water4" link="Liquid/water4" />
- <alias name="liquids/water_cmap" link="Liquid/water_cmap" />
+ <!-- Pre 0.6.0 Stuff -->
+ <alias name="global/Buttons/pause" link="buttons/pause" />
+ <alias name="global/Entrances/cloud" link="entrances/cloud" />
+ <alias name="global/Entrances/entrance" link="entrances/entrance" />
+ <alias name="global/Entrances/entrance_eyes" link="entrances/entrance_eyes"
/>
+ <alias name="global/Entrances/entrance_eyes_anim"
link="entrances/entrance_eyes_anim" />
+ <alias name="global/Entrances/underlay_eyes" link="entrances/underlay_eyes"
/>
+ <alias name="global/Entrances/generic" link="entrances/generic" />
+ <alias name="global/Entrances/industrial" link="entrances/industrial" />
+ <alias name="global/Entrances/industrial_top"
link="entrances/industrial_top" />
+ <alias name="global/Entrances/space" link="entrances/space" />
+ <alias name="global/Entrances/wood_bottom" link="entrances/wood_bottom" />
+ <alias name="global/Entrances/wood_top" link="entrances/wood_top" />
+ <alias name="global/Entrances/woodthing_mov" link="entrances/woodthing_mov"
/>
+ <alias name="global/Entrances/woodthing_nmov"
link="entrances/woodthing_nmov" />
+ <alias name="global/Exits/crystal" link="exits/crystal" />
+ <alias name="global/Exits/desert_tut" link="exits/desert_tut" />
+ <alias name="global/Exits/desert" link="exits/desert" />
+ <alias name="global/Exits/ice" link="exits/ice" />
+ <alias name="global/Exits/industrial" link="exits/industrial" />
+ <alias name="global/Exits/sortie_1" link="exits/ordina" />
+ <alias name="global/Exits/sortie" link="exits/sortie" />
+ <alias name="global/Exits/sortie_anim" link="exits/sortie_anim" />
+ <alias name="global/Exits/space" link="exits/space" />
+ <alias name="global/Exits/stone" link="exits/stone" />
+ <alias name="global/Exits/sweetexit" link="exits/sweetexit" />
+ <alias name="global/Misc/bridge_left" link="misc/bridge_left" />
+ <alias name="global/Misc/bridge_right" link="misc/bridge_right" />
+ <alias name="global/GroundPieces/Space/grid1" link="space/grid1" />
+ <alias name="global/GroundPieces/Space/grid2" link="space/grid2" />
+ <alias name="global/GroundPieces/Space/grid3" link="space/grid3" />
+ <alias name="global/Crystal/block" link="crystal/block" />
+ <alias name="global/Crystal/column" link="crystal/column" />
+ <alias name="global/Crystal/diagcrystal" link="crystal/diagcrystal" />
+ <alias name="global/Crystal/hexcrystal" link="crystal/hexcrystal" />
+ <alias name="global/Crystal/horiz" link="crystal/horiz" />
+ <alias name="global/Crystal/horiz2" link="crystal/horiz2" />
+ <alias name="global/Crystal/pipe" link="crystal/pipe" />
+ <alias name="global/Crystal/pipeend" link="crystal/pipeend" />
+ <alias name="global/Crystal/platform" link="crystal/platform" />
+ <alias name="global/Crystal/platform2" link="crystal/platform2" />
+ <alias name="global/Crystal/pointleft" link="crystal/pointleft" />
+ <alias name="global/Crystal/pointright" link="crystal/pointright" />
+ <alias name="global/Crystal/skinnycrystal" link="crystal/skinnycrystal" />
+ <alias name="global/Crystal/smcrystal" link="crystal/smcrystal" />
+ <alias name="global/Crystal/tesselate" link="crystal/tesselate" />
+ <alias name="global/Desert/bigblock-broken1" link="desert/bigblock-broken1"
/>
+ <alias name="global/Desert/bigblock-broken2" link="desert/bigblock-broken2"
/>
+ <alias name="global/Desert/bigdune1" link="desert/bigdune1" />
+ <alias name="global/Desert/bigprickpiece" link="desert/bigprickpiece" />
+ <alias name="global/Misc/bigprickpiece" link="desert/bigprickpiece" />
+ <alias name="global/Ywlam/bigsand" link="desert/bigsand" />
+ <alias name="global/Desert/blobdune" link="desert/blobdune" />
+ <alias name="global/Hotspots/colum_pice1" link="desert/column_piece1" />
+ <alias name="global/Hotspots/colum_piece1" link="desert/column_piece1" />
+ <alias name="global/Hotspots/colum_pice2" link="desert/column_piece2" />
+ <alias name="global/Hotspots/colum_piece2" link="desert/column_piece2" />
+ <alias name="global/Hotspots/colum_pice3" link="desert/column_piece3" />
+ <alias name="global/Hotspots/colum_piece3" link="desert/column_piece3" />
+ <alias name="global/Desert/domedune" link="desert/domedune" />
+ <alias name="global/Desert/flatdune" link="desert/flatdune" />
+ <alias name="global/Ywlam/leftsmallbrick" link="desert/leftsmallbrick" />
+ <alias name="global/Ywlam/leftsmallsand" link="desert/leftsmallsand" />
+ <alias name="global/Ywlam/mediumsand" link="desert/mediumsand" />
+ <alias name="global/Desert/middleprickpiece" link="desert/middleprickpiece"
/>
+ <alias name="global/Misc/middleprickpiece" link="desert/middleprickpiece" />
+ <alias name="global/Desert/peakdune" link="desert/peakdune" />
+ <alias name="global/Desert/pillar1" link="desert/pillar1" />
+ <alias name="global/Hotspots/pillar1" link="desert/pillar1" />
+ <alias name="global/Desert/pillar2" link="desert/pillar2" />
+ <alias name="global/Hotspots/pillar2" link="desert/pillar2" />
+ <alias name="global/Desert/pillar3" link="desert/pillar3" />
+ <alias name="global/Hotspots/pillar3" link="desert/pillar3" />
+ <alias name="global/Misc/way" link="desert/platform" />
+ <alias name="global/Misc/way_left" link="desert/platform_left" />
+ <alias name="global/Misc/way_right" link="desert/platform_right" />
+ <alias name="global/Ywlam/rightsmallbrick" link="desert/rightsmallbrick" />
+ <alias name="global/Ywlam/rightsmallsand" link="desert/rightsmallsand" />
+ <alias name="global/Desert/Sluggydu" link="desert/sluggydu" />
+ <alias name="global/Desert/smallbrickpiece" link="desert/smallbrickpiece" />
+ <alias name="global/Misc/smallbrickpiece" link="desert/smallbrickpiece" />
+ <alias name="global/Ywlam/smallsand" link="desert/smallsand" />
+ <alias name="global/Foliage/flax1" link="foliage/flax1" />
+ <alias name="global/Foliage/flax2" link="foliage/flax2" />
+ <alias name="global/Foliage/midtree1" link="foliage/midtree1" />
+ <alias name="global/Foliage/midtree2" link="foliage/midtree2" />
+ <alias name="global/Foliage/oak1" link="foliage/oak1" />
+ <alias name="global/Rock/rock1" link="foliage/rock1" />
+ <alias name="global/Rock/rock2" link="foliage/rock2" />
+ <alias name="global/Rock/rock3" link="foliage/rock3" />
+ <alias name="global/Rock/rock4" link="foliage/rock4" />
+ <alias name="global/Rock/rock5" link="foliage/rock5" />
+ <alias name="global/Rock/rock6" link="foliage/rock6" />
+ <alias name="global/Foliage/smallbush" link="foliage/smallbush" />
+ <alias name="global/Foliage/smallbush2" link="foliage/smallbush2" />
+ <alias name="global/Foliage/smallbush3" link="foliage/smallbush3" />
+ <alias name="global/Foliage/talltree" link="foliage/talltree" />
+ <alias name="global/GroundPieces/pipe_h" link="industrial/pipe1" />
+ <alias name="global/Industrial/pipe_h" link="industrial/pipe1" />
+ <alias name="global/GroundPieces/pipe_v" link="industrial/pipe2" />
+ <alias name="global/Industrial/pipe_v" link="industrial/pipe2" />
+ <alias name="global/GroundPieces/pipe_ph" link="industrial/pipe4" />
+ <alias name="global/Industrial/pipe_ph" link="industrial/pipe4" />
+ <alias name="global/GroundPieces/pipe_pv" link="industrial/pipe5" />
+ <alias name="global/Industrial/pipe_pv" link="industrial/pipe5" />
+ <alias name="global/GroundPieces/pipe_dl" link="industrial/pipe_bl" />
+ <alias name="global/Industrial/pipe_dl" link="industrial/pipe_bl" />
+ <alias name="global/GroundPieces/pipe_dr" link="industrial/pipe_br" />
+ <alias name="global/Industrial/pipe_dr" link="industrial/pipe_br" />
+ <alias name="global/GroundPieces/pipe_ul" link="industrial/pipe_ul" />
+ <alias name="global/Industrial/pipe_ul" link="industrial/pipe_ul" />
+ <alias name="global/GroundPieces/pipe_ur" link="industrial/pipe_ur" />
+ <alias name="global/Industrial/pipe_ur" link="industrial/pipe_ur" />
+ <alias name="global/Jungle/branch1" link="jungle/branch1" />
+ <alias name="global/Jungle/branch2" link="jungle/branch2" />
+ <alias name="global/Jungle/branch3" link="jungle/branch3" />
+ <alias name="global/Jungle/branch4" link="jungle/branch4" />
+ <alias name="global/Jungle/branch5" link="jungle/branch5" />
+ <alias name="global/Jungle/branch6" link="jungle/branch6" />
+ <alias name="global/Jungle/carabatree" link="jungle/carabatree" />
+ <alias name="global/Jungle/carabatreemedium" link="jungle/carabatreemedium"
/>
+ <alias name="global/Jungle/carabatreesmall" link="jungle/carabatreesmall" />
+ <alias name="global/Jungle/stick1" link="jungle/stick1" />
+ <alias name="global/Jungle/stick2" link="jungle/stick2" />
+ <alias name="global/Jungle/stick3" link="jungle/stick3" />
+ <alias name="global/Jungle/stick4" link="jungle/stick4" />
+ <alias name="global/Jungle/stick5" link="jungle/stick5" />
+ <alias name="global/Jungle/twist" link="jungle/twist" />
+ <alias name="global/Jungle/twistsmooth" link="jungle/twistsmooth" />
+ <alias name="global/GroundPieces/bpice1" link="misc/bpiece1" />
+ <alias name="global/GroundPieces/bpiece1" link="misc/bpiece1" />
+ <alias name="global/GroundPieces/bpice2" link="misc/bpiece2" />
+ <alias name="global/GroundPieces/bpiece2" link="misc/bpiece2" />
+ <alias name="global/GroundPieces/bpice3" link="misc/bpiece3" />
+ <alias name="global/GroundPieces/bpiece3" link="misc/bpiece3" />
+ <alias name="global/GroundPieces/bpice4" link="misc/bpiece4" />
+ <alias name="global/GroundPieces/bpiece4" link="misc/bpiece4" />
+ <alias name="global/GroundPieces/bpice5" link="misc/bpiece5" />
+ <alias name="global/GroundPieces/bpiece5" link="misc/bpiece5" />
+ <alias name="global/GroundPieces/bpice6" link="misc/bpiece6" />
+ <alias name="global/GroundPieces/bpiece6" link="misc/bpiece6" />
+ <alias name="global/Misc/brick1" link="misc/brick1" />
+ <alias name="global/Misc/brick2" link="misc/brick2" />
+ <alias name="global/Misc/brick3" link="misc/brick3" />
+ <alias name="global/Misc/brick4" link="misc/brick4" />
+ <alias name="global/Misc/bridge1" link="misc/bridge1" />
+ <alias name="global/Hotspots/colum" link="misc/column" />
+ <alias name="global/Hotspots/colum_flat" link="misc/column_flat" />
+ <alias name="global/Hotspots/dragon" link="misc/dragon" />
+ <alias name="global/GroundPieces/green1" link="misc/green1" />
+ <alias name="global/GroundPieces/green2" link="misc/green2" />
+ <alias name="global/GroundPieces/pice1" link="misc/grey_stone1" />
+ <alias name="global/GroundPieces/piece1" link="misc/grey_stone1" />
+ <alias name="global/GroundPieces/pice2" link="misc/grey_stone2" />
+ <alias name="global/GroundPieces/piece2" link="misc/grey_stone2" />
+ <alias name="global/GroundPieces/pice3" link="misc/grey_stone3" />
+ <alias name="global/GroundPieces/piece3" link="misc/grey_stone3" />
+ <alias name="global/GroundPieces/pice4" link="misc/grey_stone4" />
+ <alias name="global/GroundPieces/piece4" link="misc/grey_stone4" />
+ <alias name="global/GroundPieces/pice5" link="misc/grey_stone5" />
+ <alias name="global/GroundPieces/piece5" link="misc/grey_stone5" />
+ <alias name="global/Misc/pfosten" link="misc/pfosten" />
+ <alias name="global/Misc/piece1" link="misc/piece1" />
+ <alias name="global/Misc/piece2" link="misc/piece2" />
+ <alias name="global/Misc/spike" link="misc/spike" />
+ <alias name="global/Hotspots/stone0" link="misc/stone0" />
+ <alias name="global/Hotspots/stone1" link="misc/stone1" />
+ <alias name="global/Hotspots/stone2" link="misc/stone2" />
+ <alias name="global/Misc/stoneblock1" link="misc/stoneblock1" />
+ <alias name="global/Misc/stoneblock2" link="misc/stoneblock2" />
+ <alias name="global/Misc/stoneblock3" link="misc/stoneblock3" />
+ <alias name="global/Misc/stoneblock5" link="misc/stoneblock5" />
+ <alias name="global/Misc/stoneblock6" link="misc/stoneblock6" />
+ <alias name="global/Hotspots/well" link="misc/well" />
+ <alias name="global/Mushroom/toadstool1" link="mushroom/toadstool1" />
+ <alias name="global/Mushroom/toadstool2" link="mushroom/toadstool2" />
+ <alias name="global/Mushroom/toadstool3" link="mushroom/toadstool3" />
+ <alias name="global/Mushroom/toadstool4" link="mushroom/toadstool4" />
+ <alias name="global/GroundPieces/cable1" link="ordina/cable1" />
+ <alias name="global/GroundPieces/cable2" link="ordina/cable2" />
+ <alias name="global/GroundPieces/cdrom1" link="ordina/cdrom1" />
+ <alias name="global/GroundPieces/clavier1" link="ordina/clavier1" />
+ <alias name="global/GroundPieces/cpu1" link="ordina/cpu1" />
+ <alias name="global/GroundPieces/ecran" link="ordina/ecran" />
+ <alias name="global/GroundPieces/sol1" link="ordina/sol2" />
+ <alias name="global/GroundPieces/sol2" link="ordina/sol3" />
+ <alias name="global/GroundPieces/sol3" link="ordina/sol4" />
+ <alias name="global/Rock/fish" link="real/fish" />
+ <alias name="global/Rock/green1" link="real/green1" />
+ <alias name="global/Rock/green2" link="real/green2" />
+ <alias name="global/Rock/real1" link="real/real1" />
+ <alias name="global/Rock/real10" link="real/real10" />
+ <alias name="global/Rock/real11" link="real/real11" />
+ <alias name="global/Rock/real12" link="real/real12" />
+ <alias name="global/Rock/real13" link="real/real13" />
+ <alias name="global/Rock/real14" link="real/real14" />
+ <alias name="global/Rock/real15" link="real/real15" />
+ <alias name="global/Rock/real16" link="real/real16" />
+ <alias name="global/Rock/real17" link="real/real17" />
+ <alias name="global/Rock/real18" link="real/real18" />
+ <alias name="global/Rock/real19" link="real/real19" />
+ <alias name="global/Rock/real2" link="real/real2" />
+ <alias name="global/Rock/real20" link="real/real20" />
+ <alias name="global/Rock/real21" link="real/real21" />
+ <alias name="global/Rock/real22" link="real/real22" />
+ <alias name="global/Rock/real23" link="real/real23" />
+ <alias name="global/Rock/real24" link="real/real24" />
+ <alias name="global/Rock/real25" link="real/real25" />
+ <alias name="global/Rock/real26" link="real/real26" />
+ <alias name="global/Rock/real27" link="real/real27" />
+ <alias name="global/Rock/real28" link="real/real28" />
+ <alias name="global/Rock/real29" link="real/real29" />
+ <alias name="global/Rock/real3" link="real/real3" />
+ <alias name="global/Rock/real30" link="real/real30" />
+ <alias name="global/Rock/real35" link="real/real35" />
+ <alias name="global/Rock/real36" link="real/real36" />
+ <alias name="global/Rock/real37" link="real/real37" />
+ <alias name="global/Rock/real4" link="real/real4" />
+ <alias name="global/Rock/real5" link="real/real5" />
+ <alias name="global/Rock/real6" link="real/real6" />
+ <alias name="global/Rock/real7" link="real/real7" />
+ <alias name="global/Rock/real8" link="real/real8" />
+ <alias name="global/Rock/real9" link="real/real9" />
+ <alias name="global/Rock/real31" link="rock/blackrock1" />
+ <alias name="global/Rock/real32" link="rock/blackrock2" />
+ <alias name="global/Rock/real33" link="rock/blackrock3" />
+ <alias name="global/Rock/real34" link="rock/blackrock4" />
+ <alias name="global/Hotspots/danger" link="signposts/danger" />
+ <alias name="global/Hotspots/cabin" link="snow/cabin" />
+ <alias name="global/Hotspots/cabin_winter" link="snow/cabin_winter" />
+ <alias name="global/Snow/gpiece1" link="snow/gpiece1" />
+ <alias name="global/Snow/ice1" link="snow/ice1" />
+ <alias name="global/Snow/ice2" link="snow/ice2" />
+ <alias name="global/Snow/igloo" link="snow/igloo" />
+ <alias name="global/Snow/piece1" link="snow/piece1" />
+ <alias name="global/Snow/piece2" link="snow/piece2" />
+ <alias name="global/Misc/piece3" link="snow/piece3" />
+ <alias name="global/Snow/piece3" link="snow/piece3" />
+ <alias name="global/Misc/piece7" link="snow/piece7" />
+ <alias name="global/Misc/piece8" link="snow/piece8" />
+ <alias name="global/Misc/piece9" link="snow/piece9" />
+ <alias name="global/Snow/slopedr" link="snow/slopedr" />
+ <alias name="global/Snow/snowman" link="snow/snowman" />
+ <alias name="global/Snow/xmas-tree" link="snow/xmas-tree" />
+ <alias name="global/Sortie/column1" link="sortie/column" />
+ <alias name="global/Sortie/column2" link="sortie/column2" />
+ <alias name="global/Sortie/column3" link="sortie/column3" />
+ <alias name="global/Sortie/plate_forme" link="sortie/plate_forme" />
+ <alias name="global/Sortie/plate_forme_left" link="sortie/plate_forme_left"
/>
+ <alias name="global/Sortie/plate_forme_right"
link="sortie/plate_forme_right" />
+ <alias name="global/GroundPieces/Space/block1" link="space/block1" />
+ <alias name="global/GroundPieces/Space/diagonal" link="space/diagonal" />
+ <alias name="global/GroundPieces/Space/diagonalr" link="space/diagonalr" />
+ <alias name="global/GroundPieces/Space/smallblock1" link="space/smallblock1"
/>
+ <alias name="global/GroundPieces/Space/smallblock2" link="space/smallblock2"
/>
+ <alias name="global/GroundPieces/Space/smallblock3" link="space/smallblock3"
/>
+ <alias name="global/GroundPieces/Space/smalltower" link="space/smalltower" />
+ <alias name="global/GroundPieces/Space/tower1" link="space/tower1" />
+ <alias name="global/GroundPieces/Space/way" link="space/way" />
+ <alias name="global/Sweets/allsort1" link="sweets/allsort1" />
+ <alias name="global/Sweets/allsort2" link="sweets/allsort2" />
+ <alias name="global/Sweets/aquachoc" link="sweets/aquachoc" />
+ <alias name="global/Sweets/cake1" link="sweets/cake1" />
+ <alias name="global/Sweets/cake2" link="sweets/cake2" />
+ <alias name="global/Sweets/cake3" link="sweets/cake3" />
+ <alias name="global/Sweets/cake4" link="sweets/cake4" />
+ <alias name="global/Sweets/cake5" link="sweets/cake5" />
+ <alias name="global/Sweets/canestalk" link="sweets/canestalk" />
+ <alias name="global/Sweets/canestub" link="sweets/canestub" />
+ <alias name="global/Sweets/canetop" link="sweets/canetop" />
+ <alias name="global/Sweets/chocbar" link="sweets/chocbar" />
+ <alias name="global/Sweets/chocbloc-lowleft" link="sweets/chocbloc-lowleft"
/>
+ <alias name="global/Sweets/chocbloc-lowright"
link="sweets/chocbloc-lowright" />
+ <alias name="global/Sweets/chocbloc-topleft" link="sweets/chocbloc-topleft"
/>
+ <alias name="global/Sweets/chocbloc-topright"
link="sweets/chocbloc-topright" />
+ <alias name="global/Sweets/chocbloc" link="sweets/chocbloc" />
+ <alias name="global/Sweets/goldchoc" link="sweets/goldchoc" />
+ <alias name="global/Sweets/greenjellybaby" link="sweets/greenjellybaby" />
+ <alias name="global/Sweets/jellybaby" link="sweets/greenjellybaby" />
+ <alias name="global/Sweets/icecream" link="sweets/icecream" />
+ <alias name="global/Sweets/jube1" link="sweets/jube1" />
+ <alias name="global/Sweets/jube2" link="sweets/jube2" />
+ <alias name="global/Sweets/lollipop-purp" link="sweets/lollipop-purp" />
+ <alias name="global/Sweets/lollipop" link="sweets/lollipop" />
+ <alias name="global/Sweets/mmblue" link="sweets/mmblue" />
+ <alias name="global/Sweets/mmbrown" link="sweets/mmbrown" />
+ <alias name="global/Sweets/mmred" link="sweets/mmred" />
+ <alias name="global/Sweets/mmyellow" link="sweets/mmyellow" />
+ <alias name="global/Sweets/purpchoc" link="sweets/purpchoc" />
+ <alias name="global/Sweets/purplechoc" link="sweets/purplechoc" />
+ <alias name="global/Sweets/jellybaby2" link="sweets/redjellybaby" />
+ <alias name="global/Sweets/redjellybaby" link="sweets/redjellybaby" />
+ <alias name="global/Test/test1" link="test/test1" />
+ <alias name="global/Test/test2" link="test/test2" />
+ <alias name="global/Test/test3" link="test/test3" />
+ <alias name="global/Test/test4" link="test/test4" />
+ <alias name="global/Test/test5" link="test/test5" />
+ <alias name="global/Test/test6" link="test/test6" />
+ <alias name="global/Industrial/greybri1" link="industrial/greybri1" />
+ <alias name="global/Industrial/greybri2" link="industrial/greybri2" />
+ <alias name="global/Industrial/greybri3" link="industrial/greybri3" />
+ <alias name="global/Industrial/greybri5" link="industrial/greybri5" />
+ <alias name="global/Industrial/joint1" link="industrial/joint1" />
+ <alias name="global/Industrial/joint2" link="industrial/joint2" />
+ <alias name="global/Industrial/joint3" link="industrial/joint3" />
+ <alias name="global/Industrial/joint4" link="industrial/joint4" />
+ <alias name="global/Industrial/joint5" link="industrial/joint5" />
+ <alias name="global/Industrial/rivet" link="industrial/rivet" />
+ <alias name="global/Industrial/screw" link="industrial/screw" />
+ <alias name="global/Industrial/steel1" link="industrial/steel1" />
+ <alias name="global/Steel/steel1" link="industrial/steel1" />
+ <alias name="global/Industrial/steel2" link="industrial/steel2" />
+ <alias name="global/Steel/steel2" link="industrial/steel2" />
+ <alias name="global/Industrial/steel3" link="industrial/steel3" />
+ <alias name="global/Steel/steel3" link="industrial/steel3" />
+ <alias name="global/Industrial/steel4" link="industrial/steel4" />
+ <alias name="global/Steel/steel4" link="industrial/steel4" />
+ <alias name="global/Industrial/steel5" link="industrial/steel5" />
+ <alias name="global/Steel/steel5" link="industrial/steel5" />
+ <alias name="global/Industrial/weld1" link="industrial/weld1" />
+ <alias name="global/Industrial/weld2" link="industrial/weld2" />
+ <alias name="global/Industrial/weld3" link="industrial/weld3" />
+ <alias name="global/Industrial/weld4" link="industrial/weld4" />
+ <alias name="global/Industrial/weld5" link="industrial/weld5" />
+ <alias name="global/Industrial/weld6" link="industrial/weld6" />
+ <alias name="global/Industrial/weld7" link="industrial/weld7" />
+ <alias name="global/Hotspots/plate" link="misc/metalplate_horiz" />
+ <alias name="global/Hotspots/plate2" link="misc/metalplate_large" />
+ <alias name="global/Hotspots/plate_small" link="misc/metalplate_small" />
+ <alias name="global/Rock/granit1" link="rock/granit1" />
+ <alias name="global/Rock/granit2" link="rock/granit2" />
+ <alias name="global/Rock/granit3" link="rock/granit3" />
+ <alias name="global/Rock/granit4" link="rock/granit4" />
+ <alias name="global/Rock/granit5" link="rock/granit5" />
+ <alias name="global/Rock/granit6" link="rock/granit6" />
+ <alias name="global/Grass/grass1" link="foliage/grass1" />
+ <alias name="global/Grass/grass10" link="foliage/grass10" />
+ <alias name="global/Grass/grass11" link="foliage/grass11" />
+ <alias name="global/Grass/grass12" link="foliage/grass12" />
+ <alias name="global/Grass/grass13" link="foliage/grass13" />
+ <alias name="global/Grass/grass14" link="foliage/grass14" />
+ <alias name="global/Grass/grass15" link="foliage/grass15" />
+ <alias name="global/Grass/grass16" link="foliage/grass16" />
+ <alias name="global/Grass/grass2" link="foliage/grass2" />
+ <alias name="global/Grass/grass3" link="foliage/grass3" />
+ <alias name="global/Grass/grass4" link="foliage/grass4" />
+ <alias name="global/Grass/grass5" link="foliage/grass5" />
+ <alias name="global/Grass/grass6" link="foliage/grass6" />
+ <alias name="global/Grass/grass7" link="foliage/grass7" />
+ <alias name="global/Grass/grass8" link="foliage/grass8" />
+ <alias name="global/Grass/grass9" link="foliage/grass9" />
+ <alias name="global/Foliage/turfconcave" link="foliage/turfconcave" />
+ <alias name="global/Foliage/turfflat" link="foliage/turfflat" />
+ <alias name="global/Foliage/turfslopeleft" link="foliage/turfslopeleft" />
+ <alias name="global/Foliage/turfslopeleft20" link="foliage/turfslopeleft20"
/>
+ <alias name="global/Foliage/turfsloperight" link="foliage/turfsloperight" />
+ <alias name="global/Foliage/turfsloperight20"
link="foliage/turfsloperight20" />
+ <alias name="global/Foliage/turfsmallbump" link="foliage/turfsmallbump" />
+ <alias name="global/Foliage/turfsmallnook" link="foliage/turfsmallnook" />
+ <alias name="global/Foliage/turftufty" link="foliage/turftufty" />
+ <alias name="global/Gunge/gunge1" link="industrial/gunge1" />
+ <alias name="global/Gunge/gunge10" link="industrial/gunge10" />
+ <alias name="global/Gunge/gunge11" link="industrial/gunge11" />
+ <alias name="global/Gunge/gunge12" link="industrial/gunge12" />
+ <alias name="global/Gunge/gunge13" link="industrial/gunge13" />
+ <alias name="global/Gunge/gunge14" link="industrial/gunge14" />
+ <alias name="global/Gunge/gunge15" link="industrial/gunge15" />
+ <alias name="global/Gunge/gunge2" link="industrial/gunge2" />
+ <alias name="global/Gunge/gunge3" link="industrial/gunge3" />
+ <alias name="global/Gunge/gunge4" link="industrial/gunge4" />
+ <alias name="global/Gunge/gunge5" link="industrial/gunge5" />
+ <alias name="global/Gunge/gunge6" link="industrial/gunge6" />
+ <alias name="global/Gunge/gunge7" link="industrial/gunge7" />
+ <alias name="global/Gunge/gunge8" link="industrial/gunge8" />
+ <alias name="global/Gunge/gunge9" link="industrial/gunge9" />
+ <alias name="global/Ywlam/bigdimwall" link="desert/bigdimwall" />
+ <alias name="global/Ywlam/mediumdimwall" link="desert/mediumdimwall" />
+ <alias name="global/Ywlam/mediumegpytpict" link="desert/mediumegyptpic" />
+ <alias name="global/Ywlam/mediummummy" link="desert/mediummummy" />
+ <alias name="global/Ywlam/mediumsphinx" link="desert/mediumsphinx" />
+ <alias name="global/Ywlam/smallD" link="desert/smallD" />
+ <alias name="global/Ywlam/smallE" link="desert/smallE" />
+ <alias name="global/Ywlam/smallG" link="desert/smallG" />
+ <alias name="global/Ywlam/smallO" link="desert/smallO" />
+ <alias name="global/Ywlam/smalldimwall" link="desert/smalldimwall" />
+ <alias name="global/Ywlam/smallegpytpict" link="desert/smallegyptpic" />
+ <alias name="global/Ywlam/smallsphinx" link="desert/smallsphinx" />
+ <alias name="global/signposts/basher" link="signposts/basher" />
+ <alias name="global/signposts/blocker" link="signposts/blocker" />
+ <alias name="global/signposts/bomber" link="signposts/bomber" />
+ <alias name="global/signposts/bridger" link="signposts/bridger" />
+ <alias name="global/signposts/climber" link="signposts/climber" />
+ <alias name="global/signposts/digger" link="signposts/digger" />
+ <alias name="global/signposts/floater" link="signposts/floater" />
+ <alias name="global/signposts/miner" link="signposts/miner" />
+ <alias name="global/signposts/nogo" link="signposts/nogo" />
+ <alias name="global/Hotspots/engine" link="space/engine" />
+ <alias name="global/Liquid/lava" link="liquids/lava" />
+ <alias name="global/Liquid/slime" link="liquids/slime" />
+ <alias name="global/Liquid/swater" link="liquids/swater" />
+ <alias name="global/Liquid/water" link="liquids/water" />
+ <alias name="global/Liquid/water2" link="liquids/water2" />
+ <alias name="global/Liquid/water3" link="liquids/water3" />
+ <alias name="global/Liquid/water5" link="liquids/water3" />
+ <alias name="global/Liquid/water4" link="liquids/water4" />
+ <alias name="global/Liquid/water_cmap" link="liquids/water_cmap" />
+
+ <!-- 0.6.0 - 0.7.0 translation -->
+<alias name="entrances/entrances/entrance" link="entrances/entrance" />
+<alias name="entrances/entrances/generic" link="entrances/generic" />
+<alias name="entrances/entrances/woodthing_nmov"
link="entrances/woodthing_nmov" />
+<alias name="entrances/entrances/woodthing_mov" link="entrances/woodthing_mov"
/>
+<alias name="entrances/entrances/cloud" link="entrances/cloud" />
+<alias name="entrances/entrances/space" link="entrances/space" />
+<alias name="entrances/entrances/wood_bottom" link="entrances/wood_bottom" />
+<alias name="entrances/entrances/wood_top" link="entrances/wood_top" />
+<alias name="entrances/entrances/entrance_eyes" link="entrances/entrance_eyes"
/>
+<alias name="entrances/entrances/entrance_eyes_anim"
link="entrances/entrance_eyes_anim" />
+<alias name="entrances/entrances/underlay_eyes" link="entrances/underlay_eyes"
/>
+<alias name="entrances/entrances/industrial" link="entrances/industrial" />
+<alias name="entrances/entrances/industrial_top"
link="entrances/industrial_top" />
+<alias name="entrances/entrances/snow_front" link="entrances/snow_front" />
+<alias name="entrances/entrances/snow_back" link="entrances/snow_back" />
+
+<alias name="exits/exits/desert_tut" link="exits/desert_tut" />
+<alias name="exits/exits/ice" link="exits/ice" />
+<alias name="exits/exits/ice2" link="exits/ice2" />
+<alias name="exits/exits/stone" link="exits/stone" />
+<alias name="exits/exits/desert" link="exits/desert" />
+<alias name="exits/exits/space" link="exits/space" />
+<alias name="exits/exits/sweetexit" link="exits/sweetexit" />
+<alias name="exits/exits/sortie" link="exits/sortie" />
+<alias name="exits/exits/sortie_anim" link="exits/sortie_anim" />
+<alias name="exits/exits/industrial" link="exits/industrial" />
+<alias name="exits/exits/crystal" link="exits/crystal" />
+<alias name="exits/exits/ordina" link="exits/ordina" />
+<alias name="exits/exits/mud" link="exits/mud" />
+
+<alias name="textures/textures/clouds2" link="textures/clouds2" />
</resources>
\ No newline at end of file
Modified: trunk/data/data/game.xml
===================================================================
--- trunk/data/data/game.xml 2004-05-10 23:28:32 UTC (rev 2332)
+++ trunk/data/data/game.xml 2004-05-11 00:58:46 UTC (rev 2333)
@@ -18,53 +18,54 @@
<sprite name="dot_border">
<image file="../images/core/worldmap/dot_border.png"/>
</sprite>
+
+ <section name="cursors">
+ <sprite name="editor">
+ <image file="../images/core/cursors/editor.png"/>
+ </sprite>
+ <sprite name="cursor">
+ <image file="../images/core/cursors/cursor.png"/>
+ </sprite>
+ <sprite name="scroll_cur">
+ <image file="../images/core/cursors/scroll.png"/>
+ </sprite>
+ <sprite name="capgood">
+ <image file="../images/core/cursors/cap.png"/>
+ </sprite>
+ <sprite name="capbad">
+ <image file="../images/core/cursors/capwrong.png"/>
+ </sprite>
+ <sprite name="cross">
+ <image file="../images/core/cursors/cross.png"/>
+ </sprite>
+ <sprite name="arrow_right">
+ <image file="../images/core/cursors/arrow_right.png"/>
+ </sprite>
+ <sprite name="arrow_left">
+ <image file="../images/core/cursors/arrow_left.png"/>
+ </sprite>
+ </section>
+ <section name="smallmap">
+ <sprite name="entrance">
+ <image file="../images/core/misc/smallmap_entrance.png"/>
+ </sprite>
+ <sprite name="exit">
+ <image file="../images/core/misc/smallmap_exit.png"/>
+ </sprite>
+ </section>
+ <section name="stars">
+ <sprite name="large_star">
+ <image file="../images/backgrounds/large_star.png"/>
+ </sprite>
+ <sprite name="middle_star">
+ <image file="../images/backgrounds/middle_star.png"/>
+ </sprite>
+ <sprite name="small_star">
+ <image file="../images/backgrounds/small_star.png"/>
+ </sprite>
+ <sprite name="starfield_icon">
+ <image file="../images/backgrounds/starfield_icon.png"/>
+ </sprite>
+ </section>
</section>
- <section name="Cursors">
- <sprite name="editor">
- <image file="../images/core/cursors/editor.png"/>
- </sprite>
- <sprite name="cursor">
- <image file="../images/core/cursors/cursor.png"/>
- </sprite>
- <sprite name="scroll_cur">
- <image file="../images/core/cursors/scroll.png"/>
- </sprite>
- <sprite name="capgood">
- <image file="../images/core/cursors/cap.png"/>
- </sprite>
- <sprite name="capbad">
- <image file="../images/core/cursors/capwrong.png"/>
- </sprite>
- <sprite name="cross">
- <image file="../images/core/cursors/cross.png"/>
- </sprite>
- <sprite name="arrow_right">
- <image file="../images/core/cursors/arrow_right.png"/>
- </sprite>
- <sprite name="arrow_left">
- <image file="../images/core/cursors/arrow_left.png"/>
- </sprite>
- </section>
- <section name="SmallMap">
- <sprite name="entrance">
- <image file="../images/core/misc/smallmap_entrance.png"/>
- </sprite>
- <sprite name="exit">
- <image file="../images/core/misc/smallmap_exit.png"/>
- </sprite>
- </section>
- <section name="Stars">
- <sprite name="large_star">
- <image file="../images/backgrounds/large_star.png"/>
- </sprite>
- <sprite name="middle_star">
- <image file="../images/backgrounds/middle_star.png"/>
- </sprite>
- <sprite name="small_star">
- <image file="../images/backgrounds/small_star.png"/>
- </sprite>
- <sprite name="starfield_icon">
- <image file="../images/backgrounds/starfield_icon.png"/>
- </sprite>
- </section>
</resources>
Modified: trunk/data/data/pingus.xml
===================================================================
--- trunk/data/data/pingus.xml 2004-05-10 23:28:32 UTC (rev 2332)
+++ trunk/data/data/pingus.xml 2004-05-11 00:58:46 UTC (rev 2333)
@@ -298,13 +298,13 @@
</image>
</sprite>
- <sprite name="splash_debris0">
+ <sprite name="splash_debris">
<image file="../images/pingus/splash_debris.png">
<grid pos="0,0" size="32,32" array="6,2"/>
</image>
</sprite>
- <sprite name="splat0">
+ <sprite name="splat">
<image file="../images/pingus/splat.png">
<grid pos="0,0" size="32,32" array="16,1"/>
</image>
Modified: trunk/src/editor/object_selector.cxx
===================================================================
--- trunk/src/editor/object_selector.cxx 2004-05-10 23:28:32 UTC (rev
2332)
+++ trunk/src/editor/object_selector.cxx 2004-05-11 00:58:46 UTC (rev
2333)
@@ -611,14 +611,13 @@
{
std::string str;
bool datafile_loaded;
- CL_ResourceManager res = Resource::get(resource_file);
GroundpieceData data;
datafile_loaded = data_loaded[resource_file];
data.pos = pos;
- std::list<std::string> liste = res.get_resources_of_type("sprite");
+ std::list<std::string> liste =
Resource::resmgr.get_resources_of_type("sprite", resource_file);
surface_obj sur_obj;
std::vector<surface_obj> sur_list;
int j = 0;
@@ -665,10 +664,10 @@
}
std::string
-ObjectSelector::read_string (const std::string & description, const
std::string & def_str)
+ObjectSelector::read_string(const std::string & description, const std::string
& def_str)
{
StringReader reader(description, def_str);
- reader.set_strings(Resource::get("global").get_resources_of_type("surface"));
+ reader.set_strings(Resource::resmgr.get_resources_of_type("sprite",
"global"));
return reader.read_string();
}
Modified: trunk/src/resource.cxx
===================================================================
--- trunk/src/resource.cxx 2004-05-10 23:28:32 UTC (rev 2332)
+++ trunk/src/resource.cxx 2004-05-11 00:58:46 UTC (rev 2333)
@@ -38,7 +38,6 @@
namespace Pingus {
CL_ResourceManager Resource::resmgr;
-std::map<std::string, CL_ResourceManager> Resource::resource_map;
std::map<ResDescriptor, CL_Surface> Resource::surface_map;
std::string
@@ -81,47 +80,16 @@
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/traps.xml")));
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/worldmaps.xml")));
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/worldobjs.xml")));
+
resmgr.add_resources(CL_ResourceManager(path_manager.complete("data/alias.xml")));
+
}
void
Resource::deinit()
{
- resource_map.clear();
surface_map.clear();
}
-CL_ResourceManager
-Resource::get(const std::string& arg_filename)
-{
- if (arg_filename.empty())
- {
- return resmgr;
- }
- else
- {
- std::string filename = arg_filename + ".xml";
-
- std::map<std::string, CL_ResourceManager>::iterator i =
resource_map.find(filename);
-
- if (i != resource_map.end())
- {
- return i->second;
- }
- else
- {
- std::string res_filename;
-
- res_filename = "data/" + filename;
-
- CL_ResourceManager res_manager =
CL_ResourceManager(path_manager.complete(res_filename));
-
- resource_map[filename] = res_manager;
-
- return res_manager;
- }
- }
-}
-
CL_Surface
Resource::load_surface(const std::string& res_name,
const std::string& datafile,
@@ -322,8 +290,7 @@
pout << "Resource:" << res_desc
<< ":-404-:" << err.message << std::endl;
try {
- CL_ResourceManager res_mgr = get("core");
- return CL_Surface ("core/misc/404", &res_mgr);
+ return CL_Surface ("core/misc/404", &resmgr);
} catch (CL_Error err2) {
pout << "Resource: Fatal error, important gfx files (404.pcx) couldn't
be loaded!" << std::endl;
throw err;
Modified: trunk/src/resource.hxx
===================================================================
--- trunk/src/resource.hxx 2004-05-10 23:28:32 UTC (rev 2332)
+++ trunk/src/resource.hxx 2004-05-11 00:58:46 UTC (rev 2333)
@@ -33,9 +33,8 @@
needed to do a better handling of the resources. */
class Resource
{
-private:
+public:
static CL_ResourceManager resmgr;
- static std::map<std::string, CL_ResourceManager> resource_map;
static std::map<ResDescriptor, CL_Surface> surface_map;
static CL_Surface load_from_source (const ResDescriptor& res_desc);
@@ -74,9 +73,6 @@
/** Cleanup all currently unused surfaces */
static void cleanup ();
- /** */
- static CL_ResourceManager get(const std::string&);
-
private:
Resource (const Resource&);
Resource& operator= (const Resource&);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] rev 2333 - in trunk: data/data src src/editor,
Ingo Ruhnke <=