Changeset 26 for trunk/Classes/attack_prediction_display.cpp

Timestamp:

2010-05-28 07:39:52 (2 years ago)

Author:

kpoole

Message:

Episode 5

File:

• trunk/Classes/attack_prediction_display.cpp (modified) (7 diffs)

trunk/Classes/attack_prediction_display.cpp

@@ -107 +107 @@
                        defender_hp_distrib_width_, defender_hp_distrib_height_);
     hp_distribs_height_ = std::max<int>(attacker_hp_distrib_height_, defender_hp_distrib_height_);
-
+    
     // Build the strings and compute the layout.
     std::stringstream str;
@@ -269 +269 @@
 
     // Unscathed probability.
-    left_strings.push_back(_("Chance of being unscathed"));
+    //left_strings.push_back(_("Chance of being unscathed"));
+    left_strings.push_back(_("Unhit chance"));
     format_prob(str_buf, u_unscathed);
     right_strings.push_back(str_buf);
@@ -348 +349 @@
                                        surface& hp_distrib, int hp_distrib_width)
 {
-    // KP: this screen is not used on iPhone...
-/*  
-    surface screen = disp_.get_screen_surface();
+    //surface screen = disp_.get_screen_surface();
     int i;
 
@@ -368 +367 @@
 
     // Draw unit label.
-    font::draw_text_line(screen, clip_rect, font::SIZE_15, font::NORMAL_COLOUR, label,
-                         clip_rect.x + x_off + (units_width_ - label_width) / 2, clip_rect.y + y_off, 0, TTF_STYLE_BOLD);
-
+//  font::draw_text_line(screen, clip_rect, font::SIZE_15, font::NORMAL_COLOUR, label,
+//      clip_rect.x + x_off + (units_width_ - label_width) / 2, clip_rect.y + y_off, 0, TTF_STYLE_BOLD);
+
+    font::draw_text(&video(), clip_rect, font::SIZE_15, font::NORMAL_COLOUR, label,
+                    clip_rect.x + x_off + (units_width_ - label_width) / 2, clip_rect.y + y_off);
+    
     y_off += 24;
 
     // Draw unit left and right strings except the last two (total damage and unscathed probability).
     for(i = 0; i < static_cast<int>(left_strings.size()) - 2; i++) {
-        font::draw_text_line(screen, clip_rect, font::SIZE_NORMAL, font::NORMAL_COLOUR, left_strings[i],
-                             clip_rect.x + x_off, clip_rect.y + y_off + (font::SIZE_NORMAL + inter_line_gap_) * i,
-                             0, TTF_STYLE_NORMAL);
-
-        font::draw_text_line(screen, clip_rect, font::SIZE_NORMAL, font::NORMAL_COLOUR, right_strings[i],
-                             clip_rect.x + x_off + left_strings_width + inter_column_gap_,
-                             clip_rect.y + y_off + (font::SIZE_NORMAL + inter_line_gap_) * i, 0, TTF_STYLE_NORMAL);
+        //font::draw_text_line(screen, clip_rect, font::SIZE_NORMAL, font::NORMAL_COLOUR, left_strings[i],
+        //                   clip_rect.x + x_off, clip_rect.y + y_off + (font::SIZE_NORMAL + inter_line_gap_) * i,
+        //                   0, TTF_STYLE_NORMAL);
+        font::draw_text(&video(), clip_rect, font::SIZE_NORMAL, font::NORMAL_COLOUR, left_strings[i],
+                        clip_rect.x + x_off, clip_rect.y + y_off + (font::SIZE_NORMAL + inter_line_gap_) * i);
+
+        //font::draw_text_line(screen, clip_rect, font::SIZE_NORMAL, font::NORMAL_COLOUR, right_strings[i],
+        //                   clip_rect.x + x_off + left_strings_width + inter_column_gap_,
+        //                   clip_rect.y + y_off + (font::SIZE_NORMAL + inter_line_gap_) * i, 0, TTF_STYLE_NORMAL);
+        font::draw_text(&video(), clip_rect, font::SIZE_NORMAL, font::NORMAL_COLOUR, right_strings[i],
+                        clip_rect.x + x_off + left_strings_width + inter_column_gap_,
+                        clip_rect.y + y_off + (font::SIZE_NORMAL + inter_line_gap_) * i);
     }
 
@@ -392 +399 @@
         const std::string& right_string = right_strings[right_strings.size() - 2 + i];
 
-        font::draw_text_line(screen, clip_rect, font::SIZE_NORMAL, font::NORMAL_COLOUR, left_string,
-                             clip_rect.x + x_off, clip_rect.y + y_off + (font::SIZE_NORMAL + inter_line_gap_) * i,
-                             0, TTF_STYLE_NORMAL);
-
-        font::draw_text_line(screen, clip_rect, font::SIZE_NORMAL, font::NORMAL_COLOUR, right_string,
-                             clip_rect.x + x_off + left_strings_width + inter_column_gap_,
-                             clip_rect.y + y_off + (font::SIZE_NORMAL + inter_line_gap_) * i, 0, TTF_STYLE_NORMAL);
+        //font::draw_text_line(screen, clip_rect, font::SIZE_NORMAL, font::NORMAL_COLOUR, left_string,
+        //                   clip_rect.x + x_off, clip_rect.y + y_off + (font::SIZE_NORMAL + inter_line_gap_) * i,
+        //                   0, TTF_STYLE_NORMAL);
+        font::draw_text(&video(), clip_rect, font::SIZE_NORMAL, font::NORMAL_COLOUR, left_string,
+                        clip_rect.x + x_off, clip_rect.y + y_off + (font::SIZE_NORMAL + inter_line_gap_) * i);
+
+        //font::draw_text_line(screen, clip_rect, font::SIZE_NORMAL, font::NORMAL_COLOUR, right_string,
+        //                   clip_rect.x + x_off + left_strings_width + inter_column_gap_,
+        //                   clip_rect.y + y_off + (font::SIZE_NORMAL + inter_line_gap_) * i, 0, TTF_STYLE_NORMAL);
+        font::draw_text(&video(), clip_rect, font::SIZE_NORMAL, font::NORMAL_COLOUR, right_string,
+                        clip_rect.x + x_off + left_strings_width + inter_column_gap_,
+                        clip_rect.y + y_off + (font::SIZE_NORMAL + inter_line_gap_) * i);
+                        
     }
 
@@ -404 +417 @@
 
     // Draw hitpoints distribution string.
-    font::draw_text(screen, clip_rect, font::SIZE_SMALL, font::NORMAL_COLOUR, hp_distrib_string_,
+    font::draw_text(&video(), clip_rect, font::SIZE_SMALL, font::NORMAL_COLOUR, hp_distrib_string_,
                     clip_rect.x + x_off + (units_width_ - hp_distrib_string_width_) / 2, clip_rect.y + y_off);
 
@@ -410 +423 @@
 
     // Draw hitpoints distributions.
-    video().blit_surface(clip_rect.x + x_off + (units_width_ - hp_distrib_width) / 2, clip_rect.y + y_off, hp_distrib);
- */
+    //video().blit_surface(clip_rect.x + x_off + (units_width_ - hp_distrib_width) / 2, clip_rect.y + y_off, hp_distrib);
+    blit_surface(clip_rect.x + x_off + (units_width_ - hp_distrib_width) / 2, clip_rect.y + y_off, hp_distrib);
 }