Changeset 432a269 in mainline for uspace/app/tetris/shapes.c

Timestamp:

2011-09-16T21:13:57Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3a11f17

Parents:

c0e53ff (diff), fd07e526 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/app/tetris/shapes.c (modified) (1 diff)

uspace/app/tetris/shapes.c

@@ -69 +69 @@
 
 const struct shape shapes[] = {
-        /*  0 */  {  7,  7, { TL, TC, MR }, 0xff042d},
-        /*  1 */  {  8,  8, { TC, TR, ML }, 0xff9304},
-        /*  2 */  {  9, 11, { ML, MR, BC }, 0xbeff04},
-        /*  3 */  {  3,  3, { TL, TC, ML }, 0x63ff04},
-        /*  4 */  { 12, 14, { ML, BL, MR }, 0xce04ff},
-        /*  5 */  { 15, 17, { ML, BR, MR }, 0xff04cf},
-        /*  6 */  { 18, 18, { ML, MR, 2  }, 0x7604ff},  /* sticks out */
-        /*  7 */  {  0,  0, { TC, ML, BL }, 0xff042d},
-        /*  8 */  {  1,  1, { TC, MR, BR }, 0xff9304},
-        /*  9 */  { 10,  2, { TC, MR, BC }, 0xbeff04},
-        /* 10 */  { 11,  9, { TC, ML, MR }, 0xbeff04},
-        /* 11 */  {  2, 10, { TC, ML, BC }, 0xbeff04},
-        /* 12 */  { 13,  4, { TC, BC, BR }, 0xce04ff},
-        /* 13 */  { 14, 12, { TR, ML, MR }, 0xce04ff},
-        /* 14 */  {  4, 13, { TL, TC, BC }, 0xce04ff},
-        /* 15 */  { 16,  5, { TR, TC, BC }, 0xff04cf},
-        /* 16 */  { 17, 15, { TL, MR, ML }, 0xff04cf},
-        /* 17 */  {  5, 16, { TC, BC, BL }, 0xff04cf},
-        /* 18 */  {  6,  6, { TC, BC, 2 * B_COLS }, 0x7604ff}  /* sticks out */
+        /*  0 */  {  7,  7, { TL, TC, MR }, 0x00aaaa},
+        /*  1 */  {  8,  8, { TC, TR, ML }, 0x00aa00},
+        /*  2 */  {  9, 11, { ML, MR, BC }, 0xaa5500},
+        /*  3 */  {  3,  3, { TL, TC, ML }, 0x0000aa},
+        /*  4 */  { 12, 14, { ML, BL, MR }, 0xaa00aa},
+        /*  5 */  { 15, 17, { ML, BR, MR }, 0xffa500},
+        /*  6 */  { 18, 18, { ML, MR, 2  }, 0xaa0000},  /* sticks out */
+        /*  7 */  {  0,  0, { TC, ML, BL }, 0x00aaaa},
+        /*  8 */  {  1,  1, { TC, MR, BR }, 0x00aa00},
+        /*  9 */  { 10,  2, { TC, MR, BC }, 0xaa5500},
+        /* 10 */  { 11,  9, { TC, ML, MR }, 0xaa5500},
+        /* 11 */  {  2, 10, { TC, ML, BC }, 0xaa5500},
+        /* 12 */  { 13,  4, { TC, BC, BR }, 0xaa00aa},
+        /* 13 */  { 14, 12, { TR, ML, MR }, 0xaa00aa},
+        /* 14 */  {  4, 13, { TL, TC, BC }, 0xaa00aa},
+        /* 15 */  { 16,  5, { TR, TC, BC }, 0xffa500},
+        /* 16 */  { 17, 15, { TL, MR, ML }, 0xffa500},
+        /* 17 */  {  5, 16, { TC, BC, BL }, 0xffa500},
+        /* 18 */  {  6,  6, { TC, BC, 2 * B_COLS }, 0xaa0000}  /* sticks out */
 };