diff options
Diffstat (limited to 'src/osd/modules')
| -rw-r--r-- | src/osd/modules/debugger/debugint.cpp | 28 | ||||
| -rw-r--r-- | src/osd/modules/render/d3d/d3dhlsl.cpp | 2 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/osd/modules/debugger/debugint.cpp b/src/osd/modules/debugger/debugint.cpp index 28b6379f70e..6a118bf23ba 100644 --- a/src/osd/modules/debugger/debugint.cpp +++ b/src/osd/modules/debugger/debugint.cpp @@ -386,7 +386,7 @@ static void dview_draw_box(DView *dv, int rtype, int x, int y, int w, int h, rgb static void dview_draw_line(DView *dv, int rtype, int x1, int y1, int x2, int y2, rgb_t col) { rectangle r; - + dview_get_rect(dv, rtype, r); dv->container->add_line(NX(dv, x1 + r.min_x), NY(dv, y1 + r.min_y), NX(dv, x2 + r.min_x), NY(dv, y2 + r.min_y), UI_LINE_WIDTH, col, @@ -808,9 +808,9 @@ static void dview_size_allocate(DView *dv) dv->vsb.visible = (size.y * debug_font_height > r.height() ? 1 : 0); dview_get_rect(dv, RECT_DVIEW_CLIENT, r); -// dv->hsb.visible = (size.x * debug_font_width > r.width() ? 1 : 0); -// dv->vsb.visible = (size.y * debug_font_height > r.height() ? 1 : 0); -// dview_get_rect(dv, RECT_DVIEW_CLIENT, r); +// dv->hsb.visible = (size.x * debug_font_width > r.width() ? 1 : 0); +// dv->vsb.visible = (size.y * debug_font_height > r.height() ? 1 : 0); +// dview_get_rect(dv, RECT_DVIEW_CLIENT, r); col.y = (r.height() - 2 * BORDER_YTHICKNESS /*+ debug_font_height - 1*/) / debug_font_height; col.x = (r.width() - 2 * BORDER_XTHICKNESS /*+ debug_font_width - 1*/) / debug_font_width; @@ -918,7 +918,7 @@ void debug_internal::init_debugger(running_machine &machine) debug_font = m_machine->render().font_alloc("Courier New"); else debug_font = m_machine->render().font_alloc(font_name); - + debug_font_width = 0; if(font_size < 8) debug_font_height = 16; // default @@ -1218,11 +1218,11 @@ static void on_memory_data_format(DView *dv, const ui_menu_event *event) if(order[x] == format) idx = x; } - + if (event->iptkey == IPT_UI_RIGHT) { idx++; - if(idx >= 7) + if(idx >= 7) idx = 0; memview->set_data_format(order[idx]); dview_set_state(dv, VIEW_STATE_NEEDS_UPDATE, TRUE); @@ -1230,7 +1230,7 @@ static void on_memory_data_format(DView *dv, const ui_menu_event *event) if (event->iptkey == IPT_UI_LEFT) { idx--; - if(idx < 0) + if(idx < 0) idx = 6; memview->set_data_format(order[idx]); dview_set_state(dv, VIEW_STATE_NEEDS_UPDATE, TRUE); @@ -1274,22 +1274,22 @@ static void render_editor(DView_edit *editor) const char* str = editor->str.c_str(); int str_x = 2 * BORDER_XTHICKNESS; int start; -// int editor_width; - +// int editor_width; + dview_get_rect(dv,RECT_DVIEW_HSB,r); -// editor_width = debug_font->string_width(debug_font_height, debug_font_aspect, editor->str.c_str()); +// editor_width = debug_font->string_width(debug_font_height, debug_font_aspect, editor->str.c_str()); // figure out which character to start drawing, so that you can always see the end of the string you're typing start = strlen(str) - (r.width() / (debug_font_width + 2*BORDER_XTHICKNESS)); if(start < 0) start = 0; - + dview_draw_box(dv,RECT_DVIEW_HSB,0,0,r.width(),r.height(),rgb_t(0xff,0xff,0xff,0xff)); dview_draw_line(dv,RECT_DVIEW_HSB,0,0,r.width(),0,rgb_t(0xff,0xc0,0xc0,0xc0)); dview_draw_line(dv,RECT_DVIEW_HSB,r.width(),0,r.width(),r.height(),rgb_t(0xff,0x60,0x60,0x60)); dview_draw_line(dv,RECT_DVIEW_HSB,r.width(),r.height(),0,r.height(),rgb_t(0xff,0x60,0x60,0x60)); dview_draw_line(dv,RECT_DVIEW_HSB,0,r.height(),0,0,rgb_t(0xff,0xc0,0xc0,0xc0)); - + for(int x=start;x<strlen(str);x++) { if(str_x < r.width() - debug_font_width) @@ -1641,7 +1641,7 @@ void debug_internal::wait_for_debugger(device_t &device, bool firststop) statewin->ofs_x = 350; statewin->bounds.set(0,150,0,600); win_count++; - + DView *console = dview_alloc(target, device.machine(), DVT_CONSOLE, VIEW_STATE_FOLLOW_CPU); dview_set_title(console, "Console"); console->editor.active = TRUE; diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp index a37a0c8653b..ac21290ac1a 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.cpp +++ b/src/osd/modules/render/d3d/d3dhlsl.cpp @@ -1441,7 +1441,7 @@ int shaders::post_pass(render_target *rt, int source_index, poly_info *poly, int ? rgb_t(0, 0, 0) : machine->first_screen()->palette()->palette()->entry_color(0); back_color_rgb = apply_color_convolution(back_color_rgb); - float back_color[3] = { + float back_color[3] = { static_cast<float>(back_color_rgb.r()) / 255.0f, static_cast<float>(back_color_rgb.g()) / 255.0f, static_cast<float>(back_color_rgb.b()) / 255.0f }; |
