Changeset 1514 for branches/reyalp-flt/core/gui_reversi.c

Timestamp:

12/30/11 04:07:44 (17 months ago)

Author:

philmoz

Message:

Update for module system for review in reyalp-flt branch

• renamed camera_info to camera_sensor
• added camera_screen structure for bitmap details
• cleanup up unnecessary vid_get_bitmap_??? functions (moved to camera.h / platform_camera.h)

File:

• branches/reyalp-flt/core/gui_reversi.c (modified) (4 diffs)

branches/reyalp-flt/core/gui_reversi.c

@@ -205 +205 @@
     uchar x, y;
 
-    draw_filled_rect(0, 0, screen_width-1, screen_height-1, MAKE_COLOR(SCREEN_COLOR, SCREEN_COLOR));
+    draw_filled_rect(0, 0, camera_screen.width-1, camera_screen.height-1, MAKE_COLOR(SCREEN_COLOR, SCREEN_COLOR));
     for (y=0; y<8; ++y) {
         for (x=0; x<8; ++x) {
@@ -229 +229 @@
     InGame=0;
 
-    field_size = (screen_height-2*FONT_HEIGHT-4)&0xFFF8;
-    field_x = camera_info.ts_button_border+FONT_WIDTH+8;
-    field_y = (screen_height-field_size)>>1;
+    field_size = (camera_screen.height-2*FONT_HEIGHT-4)&0xFFF8;
+    field_x = camera_screen.ts_button_border+FONT_WIDTH+8;
+    field_y = (camera_screen.height-field_size)>>1;
     cell_size = field_size >> 3;
 
@@ -332 +332 @@
 //-------------------------------------------------------------------
 static void redrawstatus() {
-    int x=camera_info.ts_button_border+field_size+FONT_WIDTH*2+23, y = 25;
+    int x=camera_screen.ts_button_border+field_size+FONT_WIDTH*2+23, y = 25;
     if (InGame) { 
         if (CurrPlayer==FIELD_PLAYER1) { 
@@ -413 +413 @@
 
     sprintf(buf, "Batt:%3d%%", get_batt_perc());
-    draw_txt_string((screen_width-camera_info.ts_button_border)/FONT_WIDTH-2-9, screen_height/FONT_HEIGHT-1, buf, MAKE_COLOR(SCREEN_COLOR, COLOR_WHITE));
+    draw_txt_string((camera_screen.width-camera_screen.ts_button_border)/FONT_WIDTH-2-9, camera_screen.height/FONT_HEIGHT-1, buf, MAKE_COLOR(SCREEN_COLOR, COLOR_WHITE));
 
     Timer();