aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/window_pair.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2018-12-09 11:36:20 -0800
committerPaul Gilbert2018-12-09 11:36:20 -0800
commit7637edb5a2e84c0abbf1c1aa156772ce1f7906c3 (patch)
tree4c35ef8cf96ffd4148a19dafaf082a0209d0416a /engines/glk/window_pair.cpp
parent9809e19f48f750c79068baf3a0681c6a0233a083 (diff)
downloadscummvm-rg350-7637edb5a2e84c0abbf1c1aa156772ce1f7906c3.tar.gz
scummvm-rg350-7637edb5a2e84c0abbf1c1aa156772ce1f7906c3.tar.bz2
scummvm-rg350-7637edb5a2e84c0abbf1c1aa156772ce1f7906c3.zip
GLK: Change all references to glui32 and glsi32 to uint and int
This should finally fix compilation for the Amiga, which had difference sized types. And the renamed types are clearer for ScummVM anyway
Diffstat (limited to 'engines/glk/window_pair.cpp')
-rw-r--r--engines/glk/window_pair.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/glk/window_pair.cpp b/engines/glk/window_pair.cpp
index 41b4e20a10..dfec02bc43 100644
--- a/engines/glk/window_pair.cpp
+++ b/engines/glk/window_pair.cpp
@@ -27,7 +27,7 @@
namespace Glk {
-PairWindow::PairWindow(Windows *windows, glui32 method, Window *key, glui32 size) :
+PairWindow::PairWindow(Windows *windows, uint method, Window *key, uint size) :
Window(windows, 0),
_dir(method & winmethod_DirMask),
_division(method & winmethod_DivisionMask),
@@ -149,8 +149,8 @@ void PairWindow::redraw() {
}
}
-void PairWindow::getArrangement(glui32 *method, glui32 *size, Window **keyWin) {
- glui32 val = _dir | _division;
+void PairWindow::getArrangement(uint *method, uint *size, Window **keyWin) {
+ uint val = _dir | _division;
if (!_wBorder)
val |= winmethod_NoBorder;
@@ -167,8 +167,8 @@ void PairWindow::getArrangement(glui32 *method, glui32 *size, Window **keyWin) {
*method = val;
}
-void PairWindow::setArrangement(glui32 method, glui32 size, Window *keyWin) {
- glui32 newDir;
+void PairWindow::setArrangement(uint method, uint size, Window *keyWin) {
+ uint newDir;
bool newVertical, newBackward;
if (_key) {