Changeset 26e7d6d in mainline for uspace/app/tetris/screen.c

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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/screen.c (modified) (2 diffs)

uspace/app/tetris/screen.c

@@ -95 +95 @@
 {
         console_flush(console);
-        console_set_rgb_color(console, 0xffffff,
-            use_color ? color : 0x000000);
+        console_set_rgb_color(console, use_color ? color : 0x000000,
+            0xffffff);
 }
 
@@ -153 +153 @@
                 return false;
         
-        return (ccap >= CONSOLE_CCAP_RGB);
+        return ((ccap & CONSOLE_CAP_RGB) == CONSOLE_CAP_RGB);
 }