aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/alan3/exe.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2019-06-26 19:58:04 -0700
committerPaul Gilbert2019-07-06 15:27:07 -0700
commitaebf25661076eaa382b3025f0123f6ceb7cf920b (patch)
tree2fb45b1f6b96f902aab7adaf9efe7eba04eff0c2 /engines/glk/alan3/exe.cpp
parent2de068a98aaeb8a1e9e8f2e719b5ff6ebf858b44 (diff)
downloadscummvm-rg350-aebf25661076eaa382b3025f0123f6ceb7cf920b.tar.gz
scummvm-rg350-aebf25661076eaa382b3025f0123f6ceb7cf920b.tar.bz2
scummvm-rg350-aebf25661076eaa382b3025f0123f6ceb7cf920b.zip
GLK: ALAN3: Removal of #ifdef blocks
Diffstat (limited to 'engines/glk/alan3/exe.cpp')
-rw-r--r--engines/glk/alan3/exe.cpp22
1 files changed, 4 insertions, 18 deletions
diff --git a/engines/glk/alan3/exe.cpp b/engines/glk/alan3/exe.cpp
index f37cc2f661..445b00dc6d 100644
--- a/engines/glk/alan3/exe.cpp
+++ b/engines/glk/alan3/exe.cpp
@@ -68,9 +68,7 @@ Common::SeekableReadStream *textFile;
/*======================================================================*/
-void setStyle(int style)
-{
-#ifdef HAVE_GLK
+void setStyle(int style) {
switch (style) {
case NORMAL_STYLE: g_vm->glk_set_style(style_Normal); break;
case EMPHASIZED_STYLE: g_vm->glk_set_style(style_Emphasized); break;
@@ -78,7 +76,6 @@ void setStyle(int style)
case ALERT_STYLE: g_vm->glk_set_style(style_Alert); break;
case QUOTE_STYLE: g_vm->glk_set_style(style_BlockQuote); break;
}
-#endif
}
/*======================================================================*/
@@ -126,9 +123,7 @@ void print(Aword fpos, Aword len)
break;
}
str[i] = '\0';
-#if ISO == 0
- fromIso(str, str);
-#endif
+
output(str);
}
@@ -243,11 +238,8 @@ void quitGame(void)
col = 1;
statusline();
printMessage(M_QUITACTION);
-#ifdef USE_READLINE
+
if (!readline(buf)) terminate(0);
-#else
- if (gets(buf) == NULL) terminate(0);
-#endif
if (strcasecmp(buf, "restart") == 0)
longjmp(restartLabel, TRUE);
else if (strcasecmp(buf, "restore") == 0) {
@@ -558,9 +550,7 @@ int getContainerMember(int container, int index, bool directly) {
/*======================================================================*/
-void showImage(int image, int align)
-{
-#ifdef HAVE_GLK
+void showImage(int image, int align) {
uint ecode;
if ((g_vm->glk_gestalt(gestalt_Graphics, 0) == 1) &&
@@ -570,14 +560,12 @@ void showImage(int image, int align)
ecode = g_vm->glk_image_draw(glkMainWin, image, imagealign_MarginLeft, 0);
(void)ecode;
}
-#endif
}
/*======================================================================*/
void playSound(int sound)
{
-#ifdef HAVE_GLK
#ifdef GLK_MODULE_SOUND
static schanid_t soundChannel = NULL;
@@ -590,11 +578,9 @@ void playSound(int sound)
}
}
#endif
-#endif
}
-
/*======================================================================*/
void empty(int cnt, int whr)
{