[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src palm.cpp,1.32,1.33 palm.h,1.25,1.26
Max Horn
fingolfin at users.sourceforge.net
Sun Mar 28 08:44:00 CEST 2004
Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15464/backends/PalmOS/Src
Modified Files:
palm.cpp palm.h
Log Message:
Renamed more OSystem methods
Index: palm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palm.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- palm.cpp 15 Mar 2004 01:18:36 -0000 1.32
+++ palm.cpp 28 Mar 2004 16:30:46 -0000 1.33
@@ -324,7 +324,7 @@
load_gfx_mode();
}
-void OSystem_PALMOS::copy_rect(const byte *buf, int pitch, int x, int y, int w, int h) {
+void OSystem_PALMOS::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) {
/* Clip the coordinates */
if (x < 0) {
w += x;
@@ -674,7 +674,7 @@
}
-bool OSystem_PALMOS::show_mouse(bool visible) {
+bool OSystem_PALMOS::showMouse(bool visible) {
if (_mouseVisible == visible)
return visible;
@@ -689,7 +689,7 @@
return last;
}
-void OSystem_PALMOS::warp_mouse(int x, int y) {
+void OSystem_PALMOS::warpMouse(int x, int y) {
set_mouse_pos(x, y);
}
@@ -701,7 +701,7 @@
}
}
-void OSystem_PALMOS::set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) {
+void OSystem_PALMOS::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) {
_mouseCurState.w = w;
_mouseCurState.h = h;
@@ -1649,7 +1649,7 @@
}
}
-void OSystem_PALMOS::show_overlay() {
+void OSystem_PALMOS::showOverlay() {
// hide the mouse
undraw_mouse();
// save background
@@ -1673,18 +1673,18 @@
}
_overlayVisible = true;
- clear_overlay();
+ clearOverlay();
}
-void OSystem_PALMOS::hide_overlay() {
+void OSystem_PALMOS::hideOverlay() {
// hide the mouse
undraw_mouse();
_overlayVisible = false;
- copy_rect(_tmpBackupP, _screenWidth, 0, 0, _screenWidth, _screenHeight);
+ copyRectToScreen(_tmpBackupP, _screenWidth, 0, 0, _screenWidth, _screenHeight);
}
-void OSystem_PALMOS::clear_overlay() {
+void OSystem_PALMOS::clearOverlay() {
if (!_overlayVisible)
return;
@@ -1697,7 +1697,7 @@
MemMove(_tmpScreenP, _tmpBackupP, _screenWidth * _screenHeight);
}
-void OSystem_PALMOS::grab_overlay(byte *buf, int pitch) {
+void OSystem_PALMOS::grabOverlay(byte *buf, int pitch) {
if (!_overlayVisible)
return;
@@ -1714,7 +1714,7 @@
} while (--h);
}
-void OSystem_PALMOS::copy_rect_overlay(const byte *buf, int pitch, int x, int y, int w, int h) {
+void OSystem_PALMOS::copyRectToOverlay(const byte *buf, int pitch, int x, int y, int w, int h) {
if (!_overlayVisible)
return;
Index: palm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palm.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- palm.h 15 Mar 2004 01:18:36 -0000 1.25
+++ palm.h 28 Mar 2004 16:30:46 -0000 1.26
@@ -54,7 +54,7 @@
// 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);
// Moves the screen content around by the given amount of pixels
// but only the top height pixel rows, the rest stays untouched
@@ -64,7 +64,7 @@
void updateScreen();
// Either show or hide the mouse cursor
- bool show_mouse(bool visible);
+ bool showMouse(bool visible);
// Set the position of the mouse cursor
void set_mouse_pos(int x, int y);
@@ -72,11 +72,11 @@
// Warp the mouse cursor. Where set_mouse_pos() only informs the
// backend of the mouse cursor's current position, this function
// actually moves the 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);
@@ -140,11 +140,11 @@
UInt8 _quitCount;
// Overlay
- void show_overlay();
- void hide_overlay();
- void clear_overlay();
- void grab_overlay(byte *buf, int pitch);
- void copy_rect_overlay(const byte *buf, int pitch, int x, int y, int w, int h);
+ void showOverlay();
+ void hideOverlay();
+ void clearOverlay();
+ void grabOverlay(byte *buf, int pitch);
+ void copyRectToOverlay(const byte *buf, int pitch, int x, int y, int w, int h);
int16 getWidth();
int16 getHeight();
More information about the Scummvm-git-logs
mailing list