Changeset 655

Timestamp:

12/28/08 20:38:02 (4 years ago)

Author:

phyrephox

Message:

• closing bug 33, 106 & 147 from bugtracker (fudgeys zebra patch and CHDKlovers small fixes for Connect4 & symbols)
• version changed from 0.8.10 to 0.9.0 to reflect latest 30 revisions

Location:

trunk

Files:

• core/conf.c (modified) (3 diffs)
• core/gui.c (modified) (1 diff)
• core/gui_4wins.c (modified) (1 diff)
• core/gui_osd.c (modified) (5 diffs)
• version.inc (modified) (1 diff)

trunk/core/conf.c

@@ -212 +212 @@
     CONF_INFO( 60, conf.raw_save_first_only,    CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO( 61, conf.reader_wrap_by_words,   CONF_DEF_VALUE, i:1, NULL),
-    CONF_INFO( 62, conf.menu_symbol_rbf_file,   CONF_DEF_PTR,   ptr:"A/CHDK/SYMBOLS/icon_10.rbf", conf_change_menu_symbol_rbf_file),
+    CONF_INFO( 62, conf.menu_symbol_enable,     CONF_DEF_VALUE, i:1, NULL),
     CONF_INFO( 63, conf.alt_mode_button,        CONF_DEF_VALUE, i:KEY_PRINT, conf_change_alt_mode_button),
     CONF_INFO( 64, conf.lang_file,              CONF_DEF_PTR,   ptr:"", NULL),
@@ -345 +345 @@
     CONF_INFO(181, conf.fast_ev_step,           CONF_DEF_VALUE, i:1, NULL),
     CONF_INFO(182, conf.mode_ev_pos,            CONF_DEF_PTR,   ptr:&def_mode_ev_pos , NULL),
-    CONF_INFO(183, conf.menu_symbol_enable,     CONF_DEF_VALUE, i:1, NULL),
+    CONF_INFO(183, conf.menu_symbol_rbf_file,   CONF_DEF_PTR,   ptr:"A/CHDK/SYMBOLS/icon_10.rbf", conf_change_menu_symbol_rbf_file),
     CONF_INFO(184, conf.menu_symbol_color,      CONF_DEF_VALUE, cl:MAKE_COLOR(COLOR_BG, COLOR_FG), NULL),
     CONF_INFO(185, conf.curve_file,             CONF_DEF_PTR, ptr:"", NULL),
@@ -430 +430 @@
 
 static void conf_change_menu_symbol_rbf_file() {
-    rbf_load_symbol(conf.menu_symbol_rbf_file);         //AKA
+    if(!rbf_load_symbol(conf.menu_symbol_rbf_file)) conf.menu_symbol_enable=0;          //AKA
 }
 

trunk/core/gui.c

@@ -3151 +3151 @@
     if (fn) {
         strcpy(conf.menu_symbol_rbf_file, fn);
-        rbf_load_symbol(conf.menu_symbol_rbf_file);
-/*      if (!rbf_load(conf.menu_rbf_file))
-            rbf_load_from_8x16(current_font);
-                        rbf_set_codepage(FONT_CP_WIN);*/        
+        if(!rbf_load_symbol(conf.menu_symbol_rbf_file)) conf.menu_symbol_enable=0;              //AKA
         gui_menu_init(NULL);
     }

trunk/core/gui_4wins.c

@@ -270 +270 @@
                 {
                         if(cur_player==1 || (cur_player==2 && mode_rival==1)) if(set_stone(cursor_position+1,cur_player,1)) win();
-                        if(mode_rival==0 && cur_player==2) if(set_stone(ki_findColumn(1, cur_player),cur_player, 1)) win();
+                        if((mode_rival==0 && cur_player==2) && !finished) if(set_stone(ki_findColumn(1, cur_player),cur_player, 1)) win();
                 }
         }

trunk/core/gui_osd.c

@@ -296 +296 @@
     static int need_restore=0;
     int viewport_height;
-    int m = ((mode_get()&MODE_MASK) == MODE_REC);
+    int mrec = ((mode_get()&MODE_MASK) == MODE_REC);
     int zebra_drawn=0;
     color cls[] = {
         COLOR_TRANSPARENT,
-        (m)?0xDF:0xCC,
+        (mrec)?0xDF:0xCC,
         COLOR_GREEN,
-        (m)?COLOR_BLUE_LT:0x99,
+        (mrec)?COLOR_BLUE_LT:0x99,
         COLOR_RED,
-        (m)?0x66:0xE2,
-        (m)?COLOR_YELLOW:0x66,
+        (mrec)?0x66:0xE2,
+        (mrec)?COLOR_YELLOW:0x66,
         COLOR_BLACK
     };
@@ -328 +328 @@
         }
         if(timer==1) {
-            short ready;
+            int ready;
             static int n=0;
-            get_property_case(PROPCASE_SHOOTING, &ready, 4);
-            n=draw_guard_pixel();
-            if(!ready || n==0) return 0;
+            if (!mrec) ready=1;
+            else get_property_case(PROPCASE_SHOOTING, &ready, 4);
+            n=draw_guard_pixel(); // will be 0 in PLAY mode, should be 1 or 2 in REC mode.
+            if(!ready) return 0;
 #if ZEBRA_CANONOSD_BORDER_RESTORE
             // rescue Canon OSD from scr_buf to cur_buf_top and _bot:
@@ -352 +353 @@
         // Try to get the best viewport buffer. In playmode its the _d one, in
         // record mode we try to get the fast live one first
-        if( (mode_get() & MODE_MASK) == MODE_PLAY ) {
+        if (!mrec) {
             img_buf = vid_get_viewport_fb_d();
         }
@@ -407 +408 @@
                         else buf[s]=(yy>over)?cl_over:(yy<conf.zebra_under)?cl_under:COLOR_TRANSPARENT;
                         if (buf[s] != COLOR_TRANSPARENT && !zebra_drawn) zebra_drawn = 1;
-                        // draw Canon OSD to buf[]
+                        if (mrec) {
+                            // draw Canon OSD to buf[] if in REC mode
 #if ZEBRA_CANONOSD_BORDER_RESTORE                        
-                        if(get_cur_buf(s)!=COLOR_TRANSPARENT) buf[s]=get_cur_buf(s); 
-                        if(conf.zebra_multichannel && get_cur_buf(s+1)!=COLOR_TRANSPARENT) buf[s+1]=get_cur_buf(s+1); 
+                            if(get_cur_buf(s)!=COLOR_TRANSPARENT) buf[s]=get_cur_buf(s); 
+                            if(conf.zebra_multichannel && get_cur_buf(s+1)!=COLOR_TRANSPARENT) buf[s+1]=get_cur_buf(s+1); 
 #else
-                        if(cur_buf[s]!=COLOR_TRANSPARENT) buf[s]=cur_buf[s];
-                        if(conf.zebra_multichannel && cur_buf[s+1]!=COLOR_TRANSPARENT) buf[s+1]=cur_buf[s+1];
+                            if(cur_buf[s]!=COLOR_TRANSPARENT) buf[s]=cur_buf[s];
+                            if(conf.zebra_multichannel && cur_buf[s+1]!=COLOR_TRANSPARENT) buf[s+1]=cur_buf[s+1];
 #endif
+                        }
                     }
                     s+=screen_buffer_width-screen_width;
@@ -431 +434 @@
                     draw_restore();
                 } else {  // clear buf[] of zebra, only leave Canon OSD
+                    if (mrec) { // REC mode
 #if ZEBRA_CANONOSD_BORDER_RESTORE
-                    // copy rescued Canon OSD to buf[] top/bottom parts and fill center with transparent color:
-                    memcpy(buf, cur_buf_top, screen_buffer_width * ZFIX_TOP);
-                    memcpy(buf + screen_buffer_size - screen_buffer_width * ZFIX_BOTTOM, cur_buf_bot, screen_buffer_width * ZFIX_BOTTOM);
-                    for (s = screen_buffer_width*ZFIX_TOP; s < screen_buffer_size-screen_buffer_width*ZFIX_BOTTOM; s++) {
-                        buf[s]=COLOR_TRANSPARENT;
+                        // copy rescued Canon OSD to buf[] top/bottom parts and fill center with transparent color:
+                        memcpy(buf, cur_buf_top, screen_buffer_width * ZFIX_TOP);
+                        memcpy(buf + screen_buffer_size - screen_buffer_width * ZFIX_BOTTOM, cur_buf_bot, screen_buffer_width * ZFIX_BOTTOM);
+                        for (s = screen_buffer_width*ZFIX_TOP; s < screen_buffer_size-screen_buffer_width*ZFIX_BOTTOM; s++) {
+                            buf[s]=COLOR_TRANSPARENT;
+                        }
+#else
+                        // copy from a complete Canon OSD rescue screen dump
+                        memcpy(buf, cur_buf, screen_buffer_size); 
+#endif
+                    } else { // Not REC mode
+                        // No Canon OSD restore, fill buf[] with transparent color:
+                        memset(buf, COLOR_TRANSPARENT, screen_buffer_size);
                     }
-#else
-                    // copy from a complete Canon OSD rescue screen dump
-                    memcpy(buf, cur_buf, screen_buffer_size); 
-#endif
                     // draw CHDK osd and histogram to buf[] (if enabled in config)
                     gui_osd_draw_zebra_osd();

trunk/version.inc

@@ -1 @@
-BUILD_NUMBER := 0.8.10
+BUILD_NUMBER := 0.9.0