Use decal for forest worldmap.

SVN-Revision: 6381

diff --git a/data/images/worldmap.strf b/data/images/worldmap.strf
index 9f82b1a..d099cf5 100644 (file)
--- a/data/images/worldmap.strf
+++ b/data/images/worldmap.strf
@@ -768,76 +768,6 @@
   (image "worldmap/antarctica/pier.png")
 )
 (tiles
-  (width 13)
-  (height 18)
-  (ids
-    1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512
-    1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525
-    1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538
-    1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551
-    1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564
-    1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577
-    1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590
-    1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603
-    1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616
-    1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629
-    1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642
-    1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655
-    1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668
-    1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681
-    1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694
-    1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707
-    1708 1709 1710 1711 1712 1713 1714 1715 1717 1718 1719 1720 1721
-    1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734
-  )
-  (image "worldmap/forest/castlemap.png")
-)
-(tiles
-  (width 13)
-  (height 18)
-  (ids
-       0    0    0    0    0    0    0    0    0    0    0    0    0
-       0    0    0    0    0    0    0    0    0    0    0    0    0
-       0    0    0    0    0    0    0    0 1735    0    0    0    0
-       0    0    0    0    0    0    0    0 1736    0    0    0    0
-       0    0    0    0    0    0    0    0 1737    0    0    0    0
-       0    0    0    0    0    0    0    0 1738    0    0    0    0
-       0    0    0 1739 1740 1741 1742    0 1743 1744    0    0    0
-       0    0    0 1745    0    0 1746    0    0 1747    0    0 1748
-       0    0    0 1749 1750    0 1751    0    0 1752    0    0    0
-       0    0    0    0 1753    0 1754    0 1755 1756    0    0    0
-       0    0    0    0 1757    0 1758 1759 1760 1761    0    0    0
-    1762    0    0    0 1763    0    0    0    0    0    0    0    0
-    1764    0    0    0 1765    0    0    0    0    0    0    0    0
-       0    0    0    0 1766 1767 1768 1769    0    0    0    0    0
-       0    0    0    0    0    0    0 1770    0    0    0    0    0
-       0    0    0    0    0    0    0 1771    0    0    0    0    0
-       0    0    0    0    0    0    0 1772    0    0    0    0    0
-       0    0    0    0    0    0    0 1773    0    0    0    0    0
-  )
-  (datas
-       0    0    0    0    0    0    0    0    0    0    0    0    0
-       0    0    0    0    0    0    0    0    0    0    0    0    0
-       0    0    0    0    0    0    0    0   26    0    0    0    0
-       0    0    0    0    0    0    0    0    3    0    0    0    0
-       0    0    0    0    0    0    0    0    3    0    0    0    0
-       0    0    0    0    0    0    0    0    3    0    0    0    0
-       0    0    0   22   12   12   10    0    5   10    0    0    0
-       0    0    0    3    0    0    3    0    0    3    0    0    3
-       0    0    0    5   10    0    3    0    0    3    0    0    0
-       0    0    0    0    3    0    3    0    3    3    0    0    0
-       0    0    0    0    3    0    5   12   12    9    0    0    0
-       3    0    0    0    3    0    0    0    0    0    0    0    0
-       3    0    0    0    3    0    0    0    0    0    0    0    0
-       0    0    0    0    5   12   12   10    0    0    0    0    0
-       0    0    0    0    0    0    0    7    0    0    0    0    0
-       0    0    0    0    0    0    0    7    0    0    0    0    0
-       0    0    0    0    0    0    0    7    0    0    0    0    0
-       0    0    0    0    0    0    0    7    0    0    0    0    0
-  )
-  (image "worldmap/forest/castlemap.png")
-)
-(tiles
   (width 9)
   (height 14)
   (ids
@@ -858,22 +788,4 @@
   )
   (image "worldmap/forest/darker_forest.png")
 )
-(tiles
-  (width 8)
-  (height 11)
-  (ids
-    1930 1931 1932 1933 1934 1935 1936 1937
-    1938 1939 1940 1941 1942 1943 1944 1945
-    1946 1947 1948 1949 1950 1951 1952 1953
-    1954 1955 1956 1957 1958 1959 1960 1961
-    1962 1963 1964 1965 1966 1967 1968 1969
-    1970 1971 1972 1973 1974 1975 1976 1977
-    1978 1979 1980 1981 1982 1983 1984 1985
-    1986 1987 1988 1989 1990 1991 1992 1993
-    1994 1995 1996 1997 1998 1999 2000 2001
-    2002 2003 2004 2005 2006 2007 2008 2009
-    2010 2011 2012 2013 2014 2015 2016 2017
-  )
-  (image "worldmap/forest/castlemap_overlay.png")
-)
 )

diff --git a/data/images/worldmap/forest/castlemap_overlay.png b/data/images/worldmap/forest/castlemap_overlay.png
index 41314db..3f9485a 100644 (file)
Binary files a/data/images/worldmap/forest/castlemap_overlay.png and b/data/images/worldmap/forest/castlemap_overlay.png differ

diff --git a/data/levels/world2/worldmap.stwm b/data/levels/world2/worldmap.stwm
index d40f0c6..ae8f7ba 100644 (file)
--- a/data/levels/world2/worldmap.stwm
+++ b/data/levels/world2/worldmap.stwm
@@ -8,6 +8,18 @@
     (name "main")
     (music "music/forestmap.ogg")
     (ambient-light 1 1 1)
+    (decal
+      (x 928)
+      (y 32)
+      (layer -199)
+      (sprite "images/worldmap/forest/castlemap.png")
+    )
+    (decal
+      (x 992)
+      (y 96)
+      (layer 101)
+      (sprite "images/worldmap/forest/castlemap_overlay.png")
+    )
     (special-tile
       (invisible-tile #t)
       (script "fadeout_screen( 2 );
@@ -62,24 +74,24 @@ state.world <- \"levels/world1/worldmap.stwm\";")
       (height 50)
       (tiles
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1539 1539 1539 1539 1539 1539 1506 1507 1508 1509 1510 1539 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1539 1537 1539 1539 1537 1537 1519 1520 1521 1522 1523 1539 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1539 1527 1539 1539 1539 1537 1537 1533 1735 1535 1539 1539 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1539 1540 1541 1542 1543 1544 1537 1546 1736 1548 1549 1550 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1539 1553 1554 1555 1556 1557 1537 1559 1737 1561 1562 1563 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1565 1566 1567 1568 1569 1570 1571 1572 1738 1574 1575 1576 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1578 1579 1580 1739 1740 1741 1742 1585 1743 1744 1588 1589 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1604 1605 1606 1749 1750 1609 1751 1611 1612 1752 1614 1615 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1617 1618 1619 1620 1753 1622 1754 1624 1625 1756 1627 1628 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1630 1631 1632 1633 1757 1635 1758 1637 1638 1639 1640 1641 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1643 1644 1645 1646 1763 1648 1649 1650 1651 1652 1653 1654 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1656 1657 1658 1659 1765 1661 1662 1663 1664 1665 1666 1667 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1669 1670 1671 1672 1766 1767 1768 1769 1677 1678 1679 1680 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1682 1683 1684 1685 1686 1687 1688 1770 1690 1691 1692 1693 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1695 1696 1697 1698 1699 1700 1701 1771 1703 1704 1705 1706 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1708 1709 1710 1711 1712 1713 1714 1772 1717 1718 1719 1720 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 1722 1723 1724 1725 1726 1727 1728 1773 1730 1731 1732 1733 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
@@ -132,11 +144,11 @@ state.world <- \"levels/world1/worldmap.stwm\";")
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 641 765 564 564 564 765 564 0 0 0 0 109 0 109 0 0 109 0 0 559 564 564 564 564 614 655 655 655 655 656 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 654 655 655 655 633 765 564 564 564 765 564 0 0 0 0 109 0 109 0 0 109 0 0 559 564 743 564 564 564 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 765 564 758 762 769 564 0 0 0 0 109 0 104 110 110 105 0 0 559 758 762 762 762 762 762 761 564 564 614 655 656 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 654 655 633 564 564 564 564 765 564 765 564 564 564 0 0 0 0 109 0 0 0 0 0 0 0 1668 765 564 564 564 564 564 765 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 758 762 769 564 760 762 761 559 0 0 0 0 104 110 110 101 0 0 0 0 1681 765 564 564 564 564 564 765 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 765 564 564 564 564 564 765 559 0 0 0 0 0 0 0 109 0 0 0 0 1694 760 761 564 564 564 564 765 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 760 761 564 564 564 564 765 564 0 0 0 0 0 0 0 109 0 0 0 0 1707 564 765 564 564 564 758 769 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
-      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 564 715 564 564 564 564 715 564 0 0 0 0 0 0 0 109 0 0 0 0 1721 564 765 564 564 758 769 564 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 654 655 633 564 564 564 564 765 564 765 564 564 564 0 0 0 0 109 0 0 0 0 0 0 0 0 765 564 564 564 564 564 765 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 758 762 769 564 760 762 761 559 0 0 0 0 104 110 110 101 0 0 0 0 0 765 564 564 564 564 564 765 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 765 564 564 564 564 564 765 559 0 0 0 0 0 0 0 109 0 0 0 0 0 760 761 564 564 564 564 765 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 760 761 564 564 564 564 765 564 0 0 0 0 0 0 0 109 0 0 0 0 0 564 765 564 564 564 758 769 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
+      9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 564 564 564 564 715 564 564 564 564 715 564 0 0 0 0 0 0 0 109 0 0 0 0 0 564 765 564 564 758 769 564 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 654 655 633 1882 1883 708 712 712 718 712 712 713 712 718 711 0 0 0 0 0 0 0 109 0 0 0 0 559 564 765 564 564 765 564 564 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 564 1882 1883 1893 409 410 410 410 410 410 409 410 410 717 712 711 559 559 559 559 559 715 1874 1875 564 564 564 564 765 564 564 765 564 564 564 564 564 615 653 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
       9 9 9 9 9 9 9 9 9 9 9 9 9 9 649 1882 1883 1893 798 409 410 410 410 410 410 409 410 410 693 410 717 712 712 712 712 712 714 410 698 733 689 564 564 765 564 758 769 564 564 564 564 564 652 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
@@ -180,19 +192,19 @@ state.world <- \"levels/world1/worldmap.stwm\";")
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1932 1933 1934 1935 1936 1937 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1938 1939 1940 1941 1942 1943 1944 1945 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1946 1947 1948 1949 1950 1951 1952 1953 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1954 1955 1956 1957 1958 1959 1960 1961 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1962 1963 1964 1965 1966 1967 1968 1969 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1970 1971 1972 1973 1974 1975 1976 1977 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1978 1979 1980 1981 1982 1983 1984 1985 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1619 1987 1988 1989 1990 1991 1992 1993 0 0 0 0 0 825 826 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 819 0 0 0 1994 1995 1996 1997 1998 1999 2000 2001 0 0 0 0 0 834 835 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 828 0 0 0 2002 2003 2004 2005 2006 2007 2008 2009 0 0 0 0 0 843 844 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 843 844 0 0 0 0 0 0 2010 2011 0 0 0 0 2016 2017 0 0 0 0 0 852 853 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 852 853 0 0 0 0 0 0 0 0 0 0 0 1931 0 0 0 0 0 0 0 861 862 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 861 862 0 819 0 0 0 0 0 0 0 0 0 1930 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 825 826 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 819 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 834 835 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 828 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 843 844 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 843 844 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 852 853 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 852 853 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 861 862 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+      0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 861 862 0 819 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 828 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 843 844 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 843 844 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 852 853 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
       0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 843 844 0 0 0 0 852 853 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 861 862 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

diff --git a/src/worldmap/worldmap.cpp b/src/worldmap/worldmap.cpp
index 372196d..e508596 100644 (file)
--- a/src/worldmap/worldmap.cpp
+++ b/src/worldmap/worldmap.cpp
@@ -37,6 +37,7 @@
 #include "lisp/list_iterator.hpp"
 #include "lisp/parser.hpp"
 #include "object/background.hpp"
+#include "object/decal.hpp"
 #include "object/tilemap.hpp"
 #include "physfs/ifile_stream.hpp"
 #include "scripting/squirrel_error.hpp"
@@ -310,6 +311,9 @@ WorldMap::load(const std::string& filename)
         Teleporter* teleporter = new Teleporter(*iter.lisp());
         teleporters.push_back(teleporter);
         add_object(teleporter);
+      } else if(iter.item() == "decal") {
+        Decal* decal = new Decal(*iter.lisp());
+        add_object(decal);
       } else if(iter.item() == "ambient-light") {
         std::vector<float> vColor;
         sector->get( "ambient-light", vColor );