aboutsummaryrefslogtreecommitdiff
path: root/engines/cge/vmenu.cpp
diff options
context:
space:
mode:
authorStrangerke2011-06-10 19:02:13 +0200
committerStrangerke2011-06-10 19:02:13 +0200
commit7d88b9e4cde321ec210c5da022046639a316179b (patch)
tree0b59d842ae4cba125934cadb94e28794c26817d9 /engines/cge/vmenu.cpp
parent68f7ff111536c2d7f5a8869252ba8ad31507a380 (diff)
downloadscummvm-rg350-7d88b9e4cde321ec210c5da022046639a316179b.tar.gz
scummvm-rg350-7d88b9e4cde321ec210c5da022046639a316179b.tar.bz2
scummvm-rg350-7d88b9e4cde321ec210c5da022046639a316179b.zip
CGE: Suppress typedef for byte, word and dword.
Diffstat (limited to 'engines/cge/vmenu.cpp')
-rw-r--r--engines/cge/vmenu.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/cge/vmenu.cpp b/engines/cge/vmenu.cpp
index f7314e18ea..1459314ba0 100644
--- a/engines/cge/vmenu.cpp
+++ b/engines/cge/vmenu.cpp
@@ -45,10 +45,10 @@
-MENU_BAR::MENU_BAR (word w)
+MENU_BAR::MENU_BAR (uint16 w)
{
int h = FONT_HIG + 2 * MB_VM, i = (w += 2 * MB_HM) * h;
- byte * p = farnew(byte, i), * p1, * p2;
+ uint8 * p = farnew(uint8, i), * p1, * p2;
_fmemset(p+w, TRANS, i-2*w);
_fmemset(p, MB_LT, w);
@@ -88,7 +88,7 @@ char * VMGather (CHOICE * list)
len += strlen(cp->Text);
++ h;
}
- vmgt = new byte[len+h];
+ vmgt = new uint8[len+h];
if (vmgt)
{
*vmgt = '\0';
@@ -141,7 +141,7 @@ VMENU::~VMENU (void)
-void VMENU::Touch (word mask, int x, int y)
+void VMENU::Touch (uint16 mask, int x, int y)
{
#define h (FONT_HIG+TEXT_LS)
int n = 0;