Changeset 57Tweet

Timestamp:

Jul 4, 2010, 10:33:29 AM (12 years ago)

Author:

sam

Message:

Various fixes.

Location:

trunk

Files:

• art/test/groundtest.png (modified) (previous)
• art/test/groundtest.xcf (modified) (previous)
• maps/testmap-coll.tmx (modified) (1 diff)
• maps/testmap-grass.tmx (modified) (1 diff)
• maps/testmap.tmx (modified) (1 diff)
• src/layer.cpp (modified) (1 diff)

trunk/maps/testmap-coll.tmx

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="32" height="32" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="20" height="11" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="Road" tilewidth="32" tileheight="32">
   <image source="../art/test/groundtest.png"/>
  </tileset>
- <layer name="Layer 0" width="32" height="32">
+ <layer name="Layer 0" width="20" height="11">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3DAQkAAAwEocv2/UOtx1Bw1VRVVdXXD/3ApwYAEAAA
+   H4sIAAAAAAAAA3NiYGBwGsWjeBTTBQMAOaZl33ADAAA=
   </data>
  </layer>
- <layer name="Props" width="32" height="32">
+ <layer name="Props" width="20" height="11">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGHjQRCQ9GEACGl8KiLmAmJMCM0nxfwGUVoTS7EBsBcTiFNg/0ICS+G9CwvQAtEijo+kfO40NDMf0PwpGwSgYBaNgFIyCUTAKRgG9AADTn/sEABAAAA==
+   H4sIAAAAAAAAA2NgoD5oIpKmBUhA40sBMRcQcyKJkeK+AiitCKXZgdgKiMUpdSgeQEn4NSFhWthNqfsoBQlofFLiFxugd/wCAAKxUp5wAwAA
   </data>
  </layer>
- <layer name="Layer 1" width="32" height="32">
+ <layer name="Layer 1" width="20" height="11">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3SSwtAQBSG4ZnC//9r7raue9e15JuikIU5lO/ZvKnB6TRKva9Ac9TTayM8D8LzSPPREm3QGB1lxxEXoh2aoRXq6PN3l90Fm2/YZmZxUXN3i8PT9/Souf8JWqv9v77oif23aIpOF2dt7J+IiIiI6C9mu1t86AAQAAA=
+   H4sIAAAAAAAAA73RSQuAIBCGYYXq//+19q7Zcm89R/QKRgsJ5nd5EJzRYYRwH4U1RvIw4zz/8KZNYmywxxwXv9+5JMURK2wxkM+1+2yJ0cM2uneIepfKuDOh3m+BnTjX+sjdvAOWuL7Uf5nXZTbp20PJcAMAAA==
   </data>
  </layer>

trunk/maps/testmap-grass.tmx

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="32" height="32" tilewidth="32" tileheight="32">
+<map version="1.0" orientation="orthogonal" width="20" height="15" tilewidth="32" tileheight="32">
  <tileset firstgid="1" name="Road" tilewidth="32" tileheight="32">
   <image source="../art/test/groundtest.png"/>
  </tileset>
- <layer name="Ground 0" width="32" height="32">
+ <layer name="Ground 0" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3QyQ2AMAxEUSuQAsJWQCD0XyITyWnBIPQPT5ZPY08xs/IBSSaZJfueA/MXWWWTKofsgTdU//3yzL43uV/oYMzkPUTl959P72DMFpgPAAAAAH/2ACvSWwAAEAAA
+   H4sIAAAAAAAAAxNkYGAQHMWjeBSP4iGAAXa2kMCwBAAA
   </data>
  </layer>
- <layer name="Layer 1" width="32" height="32">
+ <layer name="Ground Decal 0" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAUw4DjQDiAAYO5TpKEdpJhNLXcYUckcWthPjzRhhOYGWsYvPvsHMh6McLAHyv6BDouBtn+kA0YkPApGwSgYBaNgFIyCUTCcAABQE1isABAAAA==
+   H4sIAAAAAAAAA2NgoA1gAmJmIGYBYlYon5UC84SAWBiIRYBYCYjFgFiUAjOVoG5TgZoB4qsCsRoV3AijmaDuJBeA3KQMdSOMVqXAvFEwCoY6AAA8w2LgsAQAAA==
   </data>
  </layer>
- <layer name="Wall 0" width="32" height="32">
+ <layer name="Object 0" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAWjYBQQAiZomF724XMHPewnBtMCsAOxFRCrI9mDzh+ouIDxQW4Rp6P9tPQ3PnPpYT8svmHhyYiEQXLqUAxLA7QOd2T7R8EoGAWjYBSMglEwCoYTAACc6uxXABAAAA==
+   H4sIAAAAAAAAA2NgGDrAcYDsU6SR+bjMNaKyPfjMIydMjdDMpDR8jBgwzaQUGOFgU8s8aruVVn4frIARCZMCAAtPgriwBAAA
   </data>
  </layer>
- <layer name="Ground 1" width="32" height="32">
+ <layer name="Wall 0" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2SwQnAIAwA7bMdoRNEF2jdf7FGUAih35jPHdwnCBfFUgDAc6tnYr+rol5T+Tkz5lE7PmqdyrS69pi1oL6lu856m7HPm9TfcW/b839hZ9/+hWX0ux/GDDLbAAAAAJF8EOMQKwAQAAA=
+   H4sIAAAAAAAAA2NgGAWjgIHBBA2Tqx+fuZS4Bx8mBrADsRUQqyPpQ+dTy+8wPshscQrMI8Vd+NSRYx4svGDuZ0TCIDl1KIaFIan+RDaPFAAAATWdT7AEAAA=
   </data>
  </layer>
- <layer name="Object 1" width="32" height="32">
+ <layer name="Ground 1" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3QsQ0AIAwDQa/CCLD/cGko6CjtwJ9kpX1FyjHdARfpfS/i59mGO+ATa0/HdTQAAACgtwJ8x6WQABAAAA==
+   H4sIAAAAAAAAA2NgGAUjEUgBMScVzbMEYg0g5oJiDSxquEiw0xyINaFYA4o10cwCiWmR6VYtND7MfAsqmUeOu9DdgxyWlJiHHJYwTKo/GZEwNQC5ZgEAj7AOJ7AEAAA=
   </data>
  </layer>
- <layer name="Wall 1" width="32" height="32">
+ <layer name="Object 1" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3RsQkAIAxE0XS6gTiBC1jp/nt5tjZ2ich/8OsLxAzATT/yllQLvmGraqgStP+rF/46VQ7aBwAAgI8FOcHtzAAQAAA=
+   H4sIAAAAAAAAA2NgoB0wpKHZg8G+gQAjwY+kAMWBdgCNgBEUMyDR1DBzqAMAjCH/frAEAAA=
   </data>
  </layer>
- <layer name="Ground 2" width="32" height="32">
+ <layer name="Wall 1" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3OsQ0AIAwDwbQwAhPABGT/yXCRgg0M0p/0tR0BvG+oXjXD/lZLzcrx4f6Rpn0AAAAA/zpR9K8YABAAAA==
+   H4sIAAAAAAAAA2NgGAWjgIHBBA1TCtiBWJ3KZoKAJBBbAbE4lcwbKECLcLEGYg4qmTdYAQCub7nWsAQAAA==
   </data>
  </layer>
- <layer name="Object 2" width="32" height="32">
+ <layer name="Ground 2" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3OQQkAAAgEQTPZwP6l/NhBDmZg/1sFGfqa7xEAAIBAC7dEfuMAEAAA
+   H4sIAAAAAAAAA2NgGAVDEUgBMRcUc1LBPHMg1gRiDSimhpnI5lpQybxRMLIBANElvy+wBAAA
   </data>
  </layer>
- <layer name="Wall 2" width="32" height="32">
+ <layer name="Object 2" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3NoREAMAgAMSQrdI869t+ryG6AILl7/REAu92vCaerLof+AADs8ABYXepiABAAAA==
+   H4sIAAAAAAAAA2NgGAVDFRhBseNAO2QUjAI6AQDJ5AfJsAQAAA==
   </data>
  </layer>
- <layer name="Ground 3" width="32" height="32">
+ <layer name="Wall 2" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3NMREAIBAEsW9BAg5QAP6VcSr4JpnZeqsAeq0002j6n7TTbfoDAMAPD4e462AAEAAA
+   H4sIAAAAAAAAA2NgGAWjYBQQAiZImBpAEoitgZiDSuaNFAAAEtPDprAEAAA=
   </data>
  </layer>
- <layer name="Object 3" width="32" height="32">
+ <layer name="Ground 3" width="20" height="15">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3OMQEAAAwCICutf7ll8PKBBCTQuXUAAACA2gPEOzOTABAAAA==
+   H4sIAAAAAAAAA2NgGAWjYPgBKSDmAmJOKplnDsSaQGxBJfNGAXkAACtdiWSwBAAA
+  </data>
+ </layer>
+ <layer name="Object 3" width="20" height="15">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgGAX0BoYD7YBRMAqGKAAAeZc2/bAEAAA=
   </data>
  </layer>

trunk/maps/testmap.tmx

@@ -6 +6 @@
  <layer name="Layer 0" width="32" height="32">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+2UOQ6DMBREHUg4ACIHoEubK+UMXIA1ZAUpF864QKLx8pEwFDPS67715PGiFDOlWMhNAP30008/Y84lICZ/AuIA2Py/aH1cflNv+cG/T2l8/Ned+NcI/f7+EjMVqEEDWtCBO+jBAzzBC7zBB3zBAEbL/c/Utu/vrGT/yFE4rzlZ+pfuf0lfmcWfOs5/jp5z3RfTGvr352fC5Q/tYutaABAAAA==
+   H4sIAAAAAAAAA+3UOwqEMBhF4ehO7GxnS67BDajz8K3ghj2NYBP4HTBkmHvh6yQHAsY57Vj5peIC9dVXX33NvzwgX39Lw4i977u3LLHf59VZ+o9I+ndMfXu/4psaDZ544Y0PWnToMWDEhBkL1h/4//69b3nDz+dZ33314+1r4bYDtL0ryQAQAAA=
   </data>
  </layer>
  <layer name="Layer 1" width="32" height="32">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA+3VV1KDUBiG4RPLAszonXXU2EtU7L333mvsvcSusd27J5fgBlyCm/BlBkYGgUBULJN/5hng5PB/nASIENH6LbWMJ6w5sBnm83WFemxVQTzbvNYXZXthc76dCjqY++pifsjiHDfyH3XHAZfz9XX0w/na+k/5f6FWPEKsetzPlZTtsUG29HHIdNxsrr5iEPvFkmmaglSkIT3GPN9r8zq1lUW/bPiQg1zkIR8FKEQRilGCUhv5CczxGpArU/kt1O+0gnEJlahCNWpQizrUowGNaEKzzfVLJtty8lvo0Yo2tKMDnehCN3rQiz70YwCDGMKwg+9fzSzTjMn5I/QYxRjGMYFJTGEaM5jFHOaxgEUsIeBw/fp9OX+ZHitYxRrWsYFNbGEbO9jFHvZxgEMcmeRLunx1zW2ed/J7QM4P0uMYJzjFGc5xgUtc4Roh3OAWd7jHQwT3v7p+v5L/XRXJ8/eVlSTsv1cyEadsnbyP4i3yEx1er9P5fotztPd4rrB+Z6uf+TRjGQZ9tM+t3LNFRP4bG12Pz2SO1X+QnXyzNYTLN6oyXb/P3uPaXmbr1+9r66efsWgJ8Qa0sAPYABAAAA==
+   H4sIAAAAAAAAA+3VZ1LCQACG4WA5gIwewEERu6DYG2LvvRewYRfsiu2/d/IIXsAjeAnfzCTjzkpC4mgs4zfzTCBZ9tulBEX5z09JFI9YtyGW5vqGRn9ulgSeLK71WTueWxxvJQkbY18c7E+avMaJ/gfpecThfjnxb+4X85f6f0NWXYqy5nK+N6gdj1J0B9+fMjxvNFZOBjIdYBS3xXWKKWDRhfCiCD4UowSlKEM5KlCJqoz0/TmMcaegxqN9Fvp7WsP5IGpRh3o0oBFNaEYLWtGGdgv94vzysZr+EHN0IIxOdKEbPehFH/oxgEEMYRgjGLXYL3YGhHNq/xhzjGMCk5jCNGYwiznMYwGLWMIyVhCxuX/5sdofZY5VrGEdG9hEDFvYxg52sYd9HOAQcYP+oNSv7znseqPeB9T+BHMc4RgnOMUZznGBS1whiWvc4BZ3uLfx/sv792v9X5WP/P4+M3mK9XuIB1na0c69J9ukP9fmeu2O95u8Rvz++RTze7Z+zSucy5euqRF/t+qcIcX8Mza7lmo9XoMxZv9BVvqN9pCuP1UC0nwf3b8ecS6j/cuP7Xb852vzCqxLzPcAEAAA
   </data>
  </layer>
  <layer name="Layer 2" width="32" height="32">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAUwEAjEQUAcQiQOh+JQPNiWEUI/gPJpAQqJUPOBRnaPgsEL7g+0A0bBKBgFo2AUjAIygOFAO2AUjIJRMAqGMQAAIGS6LQAQAAA=
+   H4sIAAAAAAAAA2NgGAUwEAjEQUAcQiQOh+JQPNiWEUI/gPJpAQqJUPOBRnaPgsEL7g+0A0bBKBgFo2AUjAIygOEA2+84wPaPglEwCkYBLQEAVGjjeQAQAAA=
   </data>
  </layer>

trunk/src/layer.cpp

@@ -13 +13 @@
         ;
     else if (sscanf(name, "Object %d", &z) == 1)
-        ;
+        z++;
     else if (sscanf(name, "Wall %d", &z) == 1)
         z++;