aboutsummaryrefslogtreecommitdiff
path: root/engines/cryo/cryolib.cpp
diff options
context:
space:
mode:
authorStrangerke2016-12-04 22:07:17 -0800
committerEugene Sandulenko2017-01-25 22:42:12 +0100
commit7bf6e1e85029c40c9de25eaea001ecc7e62878ee (patch)
tree7c6712fdaf7ceb70fa0c1b3e1f0ba86cd769a3c9 /engines/cryo/cryolib.cpp
parent3b379c1834271f4b98ada9b6d0fb00bc27ff5e2f (diff)
downloadscummvm-rg350-7bf6e1e85029c40c9de25eaea001ecc7e62878ee.tar.gz
scummvm-rg350-7bf6e1e85029c40c9de25eaea001ecc7e62878ee.tar.bz2
scummvm-rg350-7bf6e1e85029c40c9de25eaea001ecc7e62878ee.zip
CRYO: Silent a warning, some renaming
Diffstat (limited to 'engines/cryo/cryolib.cpp')
-rw-r--r--engines/cryo/cryolib.cpp16
1 files changed, 10 insertions, 6 deletions
diff --git a/engines/cryo/cryolib.cpp b/engines/cryo/cryolib.cpp
index 0f931d3ced..368699e632 100644
--- a/engines/cryo/cryolib.cpp
+++ b/engines/cryo/cryolib.cpp
@@ -59,7 +59,7 @@ View::View(CryoEngine *vm, int w, int h) : _vm(vm) {
void *buffer = (byte *)malloc(w * h);
if (buffer) {
_allocated = true;
- CLView_InitDatas(w, h, buffer);
+ initDatas(w, h, buffer);
} else
error("Unable to allocate view buffer");
}
@@ -69,17 +69,20 @@ View::~View() {
free(_bufferPtr);
}
-void View::CLView_SetSrcZoomValues(int x, int y) {
+// Original name: CLView_SetSrcZoomValues
+void View::setSrcZoomValues(int x, int y) {
_zoom._srcLeft = x;
_zoom._srcTop = y;
}
-void View::CLView_SetDisplayZoomValues(int w, int h) {
+// Original name: CLView_SetDisplayZoomValues
+void View::setDisplayZoomValues(int w, int h) {
_zoom._width = w;
_zoom._height = h;
}
-void View::CLView_InitDatas(int w, int h, void *buffer) {
+// Original name: CLView_InitDatas
+void View::initDatas(int w, int h, void *buffer) {
_bufferPtr = (byte *)buffer;
_width = w;
_height = h;
@@ -99,7 +102,8 @@ void View::CLView_InitDatas(int w, int h, void *buffer) {
_zoom._height = h;
}
-void View::CLView_CenterIn(View *parent) {
+// Original name: CLView_CenterIn
+void View::centerIn(View *parent) {
_normal._dstLeft = (parent->_width - _normal._width) / 2;
_normal._dstTop = (parent->_height - _normal._height) / 2;
_zoom._dstLeft = (parent->_width - _zoom._width) / 2;
@@ -427,7 +431,7 @@ void CLTimer_Action(void *arg) {
///// CRYOLib
void CRYOLib_ManagersInit() {
g_system->getTimerManager()->installTimerProc(CLTimer_Action, 10000, nullptr, "100hz timer");
- g_ed->ScreenView->CLView_InitDatas(g_ed->_screen.w, g_ed->_screen.h, g_ed->_screen.getPixels());
+ g_ed->ScreenView->initDatas(g_ed->_screen.w, g_ed->_screen.h, g_ed->_screen.getPixels());
}
void CRYOLib_ManagersDone() {