[Scummvm-cvs-logs] CVS: scummvm/backends/dc dc.h,1.29,1.30 display.cpp,1.23,1.24
Max Horn
fingolfin at users.sourceforge.net
Sun Mar 28 08:43:29 CEST 2004
Update of /cvsroot/scummvm/scummvm/backends/dc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15464/backends/dc
Modified Files:
dc.h display.cpp
Log Message:
Renamed more OSystem methods
Index: dc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/dc.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- dc.h 15 Mar 2004 01:18:36 -0000 1.29
+++ dc.h 28 Mar 2004 16:30:46 -0000 1.30
@@ -72,20 +72,20 @@
// Draw a bitmap to screen.
// The screen will not be updated to reflect the new bitmap
- void copy_rect(const byte *buf, int pitch, int x, int y, int w, int h);
+ void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
void move_screen(int dx, int dy, int height);
// Update the dirty areas of the screen
void updateScreen();
// Either show or hide the mouse cursor
- bool show_mouse(bool visible);
+ bool showMouse(bool visible);
// Move ("warp") the mouse cursor to the specified position.
- void warp_mouse(int x, int y);
+ void warpMouse(int x, int y);
// Set the bitmap that's used when drawing the cursor.
- void set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);
+ void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y);
// Shaking is used in SCUMM. Set current shake position.
void set_shake_pos(int shake_pos);
@@ -128,11 +128,11 @@
void quit();
// Overlay
- void show_overlay();
- void hide_overlay();
- void clear_overlay();
- void grab_overlay(int16 *buf, int pitch);
- void copy_rect_overlay(const int16 *buf, int pitch, int x, int y, int w, int h);
+ void showOverlay();
+ void hideOverlay();
+ void clearOverlay();
+ void grabOverlay(int16 *buf, int pitch);
+ void copyRectToOverlay(const int16 *buf, int pitch, int x, int y, int w, int h);
// Add a callback timer
void setTimerCallback(TimerProc callback, int timer);
Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/display.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- display.cpp 15 Mar 2004 23:10:35 -0000 1.23
+++ display.cpp 28 Mar 2004 16:30:47 -0000 1.24
@@ -192,7 +192,7 @@
// dc_reset_screen(0, 0);
}
-void OSystem_Dreamcast::copy_rect(const byte *buf, int pitch, int x, int y,
+void OSystem_Dreamcast::copyRectToScreen(const byte *buf, int pitch, int x, int y,
int w, int h)
{
unsigned char *dst = screen + y*SCREEN_W + x;
@@ -215,12 +215,12 @@
// move down
// copy from bottom to top
for (int y = height - 1; y >= dy; y--)
- copy_rect(screen + SCREEN_W * (y - dy), SCREEN_W, 0, y, _screen_w, 1);
+ copyRectToScreen(screen + SCREEN_W * (y - dy), SCREEN_W, 0, y, _screen_w, 1);
} else {
// move up
// copy from top to bottom
for (int y = 0; y < height + dx; y++)
- copy_rect(screen + SCREEN_W * (y - dy), SCREEN_W, 0, y, _screen_w, 1);
+ copyRectToScreen(screen + SCREEN_W * (y - dy), SCREEN_W, 0, y, _screen_w, 1);
}
} else if (dy == 0) {
// horizontal movement
@@ -228,12 +228,12 @@
// move right
// copy from right to left
for (int x = _screen_w - 1; x >= dx; x--)
- copy_rect(screen + x - dx, SCREEN_W, x, 0, 1, height);
+ copyRectToScreen(screen + x - dx, SCREEN_W, x, 0, 1, height);
} else {
// move left
// copy from left to right
for (int x = 0; x < _screen_w; x++)
- copy_rect(screen + x - dx, SCREEN_W, x, 0, 1, height);
+ copyRectToScreen(screen + x - dx, SCREEN_W, x, 0, 1, height);
}
} else {
// free movement
@@ -244,7 +244,7 @@
}
-bool OSystem_Dreamcast::show_mouse(bool visible)
+bool OSystem_Dreamcast::showMouse(bool visible)
{
bool last = _ms_visible;
_ms_visible = visible;
@@ -252,13 +252,13 @@
return last;
}
-void OSystem_Dreamcast::warp_mouse(int x, int y)
+void OSystem_Dreamcast::warpMouse(int x, int y)
{
_ms_cur_x = x;
_ms_cur_y = y;
}
-void OSystem_Dreamcast::set_mouse_cursor(const byte *buf, uint w, uint h,
+void OSystem_Dreamcast::setMouseCursor(const byte *buf, uint w, uint h,
int hotspot_x, int hotspot_y)
{
_ms_cur_w = w;
@@ -511,18 +511,18 @@
}
-void OSystem_Dreamcast::show_overlay()
+void OSystem_Dreamcast::showOverlay()
{
_overlay_visible = true;
- clear_overlay();
+ clearOverlay();
}
-void OSystem_Dreamcast::hide_overlay()
+void OSystem_Dreamcast::hideOverlay()
{
_overlay_visible = false;
}
-void OSystem_Dreamcast::clear_overlay()
+void OSystem_Dreamcast::clearOverlay()
{
if(!_overlay_visible)
return;
@@ -541,7 +541,7 @@
_overlay_dirty = true;
}
-void OSystem_Dreamcast::grab_overlay(int16 *buf, int pitch)
+void OSystem_Dreamcast::grabOverlay(int16 *buf, int pitch)
{
int h = OVL_H;
unsigned short *src = overlay;
@@ -552,7 +552,7 @@
} while (--h);
}
-void OSystem_Dreamcast::copy_rect_overlay(const int16 *buf, int pitch,
+void OSystem_Dreamcast::copyRectToOverlay(const int16 *buf, int pitch,
int x, int y, int w, int h)
{
unsigned short *dst = overlay + y*OVL_W + x;
More information about the Scummvm-git-logs
mailing list