aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/selection.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/selection.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/selection.cpp')
-rw-r--r--engines/glk/selection.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/glk/selection.cpp b/engines/glk/selection.cpp
index 91097768ba..e5e853e50c 100644
--- a/engines/glk/selection.cpp
+++ b/engines/glk/selection.cpp
@@ -85,7 +85,7 @@ void WindowMask::resize(size_t x, size_t y) {
_ver = y + 1;
// allocate new storage
- _links = new glui32 *[_hor];
+ _links = new uint *[_hor];
if (!_links) {
warning("resize_mask: out of memory");
_hor = _ver = 0;
@@ -93,7 +93,7 @@ void WindowMask::resize(size_t x, size_t y) {
}
for (size_t i = 0; i < _hor; i++) {
- _links[i] = new glui32[_ver];
+ _links[i] = new uint[_ver];
if (!_links[i]) {
warning("resize_mask: could not allocate new memory");
return;
@@ -106,7 +106,7 @@ void WindowMask::resize(size_t x, size_t y) {
_select.bottom = 0;
}
-void WindowMask::putHyperlink(glui32 linkval, uint x0, uint y0, uint x1, uint y1) {
+void WindowMask::putHyperlink(uint linkval, uint x0, uint y0, uint x1, uint y1) {
uint i, k;
size_t tx0 = x0 < x1 ? x0 : x1;
size_t tx1 = x0 < x1 ? x1 : x0;
@@ -132,7 +132,7 @@ void WindowMask::putHyperlink(glui32 linkval, uint x0, uint y0, uint x1, uint y1
}
}
-glui32 WindowMask::getHyperlink(const Point &pos) const {
+uint WindowMask::getHyperlink(const Point &pos) const {
if (!_hor || !_ver) {
warning("getHyperlink: struct not initialized");
return 0;