aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/mortevielle/mortevielle.cpp4
-rw-r--r--engines/mortevielle/mortevielle.h4
-rw-r--r--engines/mortevielle/ovd1.cpp12
-rw-r--r--engines/mortevielle/var_mor.cpp23
4 files changed, 28 insertions, 15 deletions
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index dd93555ee3..68b8dbeeb4 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -20,6 +20,7 @@
*
*/
+#include "engines/util.h"
#include "mortevielle/mortevielle.h"
#include "mortevielle/mort.h"
@@ -37,6 +38,9 @@ bool MortevielleEngine::hasFeature(EngineFeature f) const {
}
Common::Error MortevielleEngine::run() {
+ // Initialise graphics mode
+ initGraphics(SCREEN_WIDTH, SCREEN_HEIGHT, true);
+
// Dispatch to the game's main routine
const char *argv[] = { "" };
mortevielle_main(1, argv);
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index 406f8fe6d2..14bee28a03 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -33,8 +33,8 @@ enum {
kMortevielleCore = 1 << 0
};
-#define SCREEN_WIDTH 320
-#define SCREEN_HEIGHT 200
+#define SCREEN_WIDTH 640
+#define SCREEN_HEIGHT 400
class MortevielleEngine : public Engine {
private:
diff --git a/engines/mortevielle/ovd1.cpp b/engines/mortevielle/ovd1.cpp
index 4eb990c7f6..a1a47a2913 100644
--- a/engines/mortevielle/ovd1.cpp
+++ b/engines/mortevielle/ovd1.cpp
@@ -232,7 +232,7 @@ void ani50() {
int cy, tay;
char st[1410];
float ix;
- char ch;
+// char ch;
/* debug('o3 dialpre'); */
@@ -257,6 +257,8 @@ void ani50() {
output("CARTE GRAPHIQUE CGA EGA HERCULE/AT&T400 TANDY AMSTRAD1512");
gotoxy(12, 24);
output("Ctrl C E H T A");
+
+/*
do {
ch = get_ch(); // input >> kbd >> ch;
} while ((ch != '\1') && (ch != '\3') && (ch != '\5') && (ch != '\24') && (ch != '\10'));
@@ -272,7 +274,10 @@ void ani50() {
case '\24' :
gd = tan;
break;
- }
+ }*/
+ // Hardcode display mode to EGA
+ gd = ega;
+
gotoxy(1, 24);
clreol;
gotoxy(1, 23);
@@ -285,10 +290,13 @@ void ani50() {
output("C");
gotoxy(48, 23);
output("S");
+ /*
do {
ch = get_ch(); // input >> kbd >> ch;
} while ((ch != 'C') && (ch != 'S'));
int_m = (toupper(ch) == 'S');
+ */
+ int_m = true;
}
/* overlay */ void init_lieu() {
diff --git a/engines/mortevielle/var_mor.cpp b/engines/mortevielle/var_mor.cpp
index 0d3f88dcdc..a8b10c1201 100644
--- a/engines/mortevielle/var_mor.cpp
+++ b/engines/mortevielle/var_mor.cpp
@@ -239,6 +239,8 @@ byte adcfiec[(4088 * 16) + (311 * 0x80)];
/*---------------------------------------------------------------------------*/
void hirs() {
+ /* Deprecated set graphics
+
const byte tandy[14] = {113, 80, 90, 14, 63, 6, 50, 56, 2, 3, 6, 7, 0, 0};
const byte herc[13] = {50, 40, 41, 9, 103, 3, 100, 100, 2, 3, 0, 0, 0};
int i;
@@ -253,21 +255,19 @@ void hirs() {
break;
case ams : {
hires;
- /*
- inline_((float)(0xb8) / 6 / 0 / // => mov ax,6
- 0xcd / 0x10); // => int 16
+ //inline_((float)(0xb8) / 6 / 0 / // => mov ax,6
+ // 0xcd / 0x10); // => int 16
port[0x3d9] = 15;
port[0x3df] = 0;
port[0x3dd] = 15;
- */
+
res = 2;
}
break;
case ega : {
- /*
- inline_((float)(0xb8) / 14 / 0 / // MOV AX, 14 ; mode video 14 = 640*200 16 couleurs
- 0xcd / 0x10); // INT 16
- */
+ //inline_((float)(0xb8) / 14 / 0 / // MOV AX, 14 ; mode video 14 = 640*200 16 couleurs
+ // 0xcd / 0x10); // INT 16
+
res = 2;
}
break;
@@ -278,9 +278,9 @@ void hirs() {
port[0x3b4] = i;
port[0x3b5] = herc[i];
}
- /*
- inline_((float)(0xfc) / 0xb9 / 0 / 0x80 / 0xb8 / 0 / 0xb0 / 0x8e / 0xc0 / 0x31 / 0xff / 0x31 / 0xc0 / 0xf3 / 0xab);
- */
+
+ //inline_((float)(0xfc) / 0xb9 / 0 / 0x80 / 0xb8 / 0 / 0xb0 / 0x8e / 0xc0 / 0x31 / 0xff / 0x31 / 0xc0 / 0xf3 / 0xab);
+
port[0x3b8] = 10;
res = 2;
}
@@ -303,6 +303,7 @@ void hirs() {
}
break;
}
+ */
}
/* procedure affput(Chx,Gd,x,y,coul,char:int); external 'c:\mc\divaf.com'; */