[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src palm.cpp,1.30,1.31 palm.h,1.23,1.24
Max Horn
fingolfin at users.sourceforge.net
Sun Mar 14 16:55:12 CET 2004
Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1672/PalmOS/Src
Modified Files:
palm.cpp palm.h
Log Message:
Added OSystem::getDefaultGraphicsMode(); renamed OSystem::get_height() and get_width() to getHeight and getWidth(); augmented some doxygen comments in common/system.h
Index: palm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palm.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- palm.cpp 28 Feb 2004 12:57:50 -0000 1.30
+++ palm.cpp 15 Mar 2004 00:45:43 -0000 1.31
@@ -649,10 +649,10 @@
if (oldCol != gVars->indicator.on) {
// redraw if needed
if (_lastKeyModifier)
- draw1BitGfx((kDrawKeyState + _lastKeyModifier - 1), 2, get_height() + 2, true);
+ draw1BitGfx((kDrawKeyState + _lastKeyModifier - 1), 2, getHeight() + 2, true);
if(_useNumPad)
- draw1BitGfx(kDrawNumPad, (get_width() >> 1) - 32, get_height() + 2, true);
+ draw1BitGfx(kDrawNumPad, (getWidth() >> 1) - 32, getHeight() + 2, true);
}
}
@@ -1058,9 +1058,9 @@
_lastKeyModifier %= 4;
if (_lastKeyModifier)
- draw1BitGfx((kDrawKeyState + _lastKeyModifier - 1), 2, get_height() + 2, true);
+ draw1BitGfx((kDrawKeyState + _lastKeyModifier - 1), 2, getHeight() + 2, true);
else
- draw1BitGfx(kDrawKeyState, 2, get_height() + 2, false);
+ draw1BitGfx(kDrawKeyState, 2, getHeight() + 2, false);
} else {
byte b = 0;
@@ -1075,7 +1075,7 @@
} else if (ev.data.keyDown.chr == 'n' && b == KBD_CTRL) {
UInt8 *scr = _screenP + _screenWidth * (_screenHeight + 2);
_useNumPad = !_useNumPad;
- draw1BitGfx(kDrawNumPad, (get_width() >> 1) - 32, get_height() + 2, _useNumPad);
+ draw1BitGfx(kDrawNumPad, (getWidth() >> 1) - 32, getHeight() + 2, _useNumPad);
} else if (ev.data.keyDown.chr == 'a' && b == (KBD_CTRL|KBD_ALT)) {
property(PROP_TOGGLE_ASPECT_RATIO, NULL);
@@ -1089,7 +1089,7 @@
if (_lastKeyModifier) {
_lastKeyModifier = MD_NONE;
- draw1BitGfx(kDrawKeyState, 2, get_height() + 2, false);
+ draw1BitGfx(kDrawKeyState, 2, getHeight() + 2, false);
}
}
return true;
@@ -1773,11 +1773,11 @@
}
-int16 OSystem_PALMOS::get_height() {
+int16 OSystem_PALMOS::getHeight() {
return _screenHeight;
}
-int16 OSystem_PALMOS::get_width() {
+int16 OSystem_PALMOS::getWidth() {
return _screenWidth;
}
Index: palm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palm.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- palm.h 28 Feb 2004 12:57:50 -0000 1.23
+++ palm.h 15 Mar 2004 00:45:43 -0000 1.24
@@ -146,8 +146,8 @@
void grab_overlay(byte *buf, int pitch);
void copy_rect_overlay(const byte *buf, int pitch, int x, int y, int w, int h);
- int16 get_width();
- int16 get_height();
+ int16 getWidth();
+ int16 getHeight();
byte RGBToColor(uint8 r, uint8 g, uint8 b);
void ColorToRGB(byte color, uint8 &r, uint8 &g, uint8 &b);
// Set a parameter
More information about the Scummvm-git-logs
mailing list