Skip to content

Commit

Permalink
MORTEVIELLE: Rename more globals
Browse files Browse the repository at this point in the history
  • Loading branch information
@Strangerke
Strangerke committed Apr 6, 2012
1 parent b67858b commit 81049d8
Show file tree
Hide file tree
Showing 16 changed files with 254 additions and 275 deletions.
2 changes: 1 addition & 1 deletion engines/mortevielle/graphics.cpp
View file
Expand Up @@ -911,7 +911,7 @@ void ScreenSurface::drawPicture(GfxSurface &surface, int x, int y) {
(x + surface.w) * 2, (y + surface.h) * 2));

// Get a lookup for the palette mapping
const byte *paletteMap = &mem[0x7000 * 16 + 2];
const byte *paletteMap = &g_mem[0x7000 * 16 + 2];

// Loop through writing
for (int yp = 0; yp < surface.h; ++yp) {
Expand Down
2 changes: 1 addition & 1 deletion engines/mortevielle/keyboard.cpp
View file
Expand Up @@ -46,7 +46,7 @@ int testou() {
break;
case '\26' :
if ((g_c_zzz == 1) || (g_c_zzz == 2)) {
zzuul(&adcfiec[161 * 16], ((822 * 128) - (161 * 16)) / 64);
zzuul(&g_adcfiec[161 * 16], ((822 * 128) - (161 * 16)) / 64);
++g_c_zzz;

return 61;
Expand Down
35 changes: 18 additions & 17 deletions engines/mortevielle/level15.cpp
View file
Expand Up @@ -61,12 +61,13 @@ bool isMouseIn(rectangle r) {
void outbloc(int n, pattern p, nhom *pal) {
int ad = n * 404 + 0xd700;

WRITE_LE_UINT16(&mem[0x6000 * 16 + ad], p._tax);
WRITE_LE_UINT16(&mem[0x6000 * 16 + ad + 2], p._tay);
WRITE_LE_UINT16(&g_mem[0x6000 * 16 + ad], p._tax);
WRITE_LE_UINT16(&g_mem[0x6000 * 16 + ad + 2], p._tay);
ad += 4;
for (int i = 1; i <= p._tax; ++i)
for (int i = 1; i <= p._tax; ++i) {
for (int j = 1; j <= p._tay; ++j)
mem[(0x6000 * 16) + ad + (j - 1) * p._tax + i - 1] = pal[n]._hom[p._des[i][j]];
g_mem[(0x6000 * 16) + ad + (j - 1) * p._tax + i - 1] = pal[n]._hom[p._des[i][j]];
}
}

void writepal(int n) {
Expand All @@ -75,22 +76,22 @@ void writepal(int n) {
case MODE_EGA:
case MODE_AMSTRAD1512:
for (int i = 1; i <= 16; ++i) {
mem[(0x7000 * 16) + (2 * i)] = tabpal[n][i].x;
mem[(0x7000 * 16) + (2 * i) + 1] = tabpal[n][i].y;
g_mem[(0x7000 * 16) + (2 * i)] = g_tabpal[n][i].x;
g_mem[(0x7000 * 16) + (2 * i) + 1] = g_tabpal[n][i].y;
}
break;
case MODE_CGA: {
warning("TODO: If this code is needed, resolve the incompatible types");
nhom pal[16];
for (int i = 0; i < 16; ++i) {
pal[i] = palcga[n]._a[i];
pal[i] = g_palcga[n]._a[i];
}
// nhom pal[16] = palcga[n]._a;
if (n < 89)
palette(palcga[n]._p);
palette(g_palcga[n]._p);

for (int i = 0; i <= 15; ++i)
outbloc(i, tpt[pal[i]._id], pal);
outbloc(i, g_tpt[pal[i]._id], pal);
}
break;
default:
Expand All @@ -101,15 +102,15 @@ void writepal(int n) {

void pictout(int seg, int dep, int x, int y) {
GfxSurface surface;
surface.decode(&mem[seg * 16 + dep]);
surface.decode(&g_mem[seg * 16 + dep]);

if (g_currGraphicalDevice == MODE_HERCULES) {
mem[0x7000 * 16 + 2] = 0;
mem[0x7000 * 16 + 32] = 15;
g_mem[0x7000 * 16 + 2] = 0;
g_mem[0x7000 * 16 + 32] = 15;
}

if ((g_caff != 51) && (READ_LE_UINT16(&mem[0x7000 * 16 + 0x4138]) > 0x100))
WRITE_LE_UINT16(&mem[0x7000 * 16 + 0x4138], 0x100);
if ((g_caff != 51) && (READ_LE_UINT16(&g_mem[0x7000 * 16 + 0x4138]) > 0x100))
WRITE_LE_UINT16(&g_mem[0x7000 * 16 + 0x4138], 0x100);

g_vm->_screenSurface.drawPicture(surface, x, y);
}
Expand Down Expand Up @@ -144,20 +145,20 @@ void adzon() {
if (!f.open("dec.mor"))
error("Missing file - dec.mor");

f.read(&mem[0x73a2 * 16 + 0], 1 * 1664);
f.read(&g_mem[0x73a2 * 16 + 0], 1 * 1664);
f.close();
}

/**
* Returns the offset within the compressed image data resource of the desired image
*/
int animof(int ouf, int num) {
int nani = mem[adani * 16 + 1];
int nani = g_mem[adani * 16 + 1];
int aux = num;
if (ouf != 1)
aux += nani;

int animof_result = (nani << 2) + 2 + READ_BE_UINT16(&mem[adani * 16 + (aux << 1)]);
int animof_result = (nani << 2) + 2 + READ_BE_UINT16(&g_mem[adani * 16 + (aux << 1)]);

return animof_result;
}
Expand Down
6 changes: 0 additions & 6 deletions engines/mortevielle/level15.h
View file
Expand Up @@ -38,16 +38,10 @@ extern bool isMouseIn(rectangle r);
extern void outbloc(int n, pattern p, nhom *pal);
extern void writepal(int n);
extern void pictout(int seg, int dep, int x, int y);
// extern int calad(int x, int y);
extern void sauvecr(int y, int dy);
extern void charecr(int y, int dy);
// extern int peek(int ad);
// extern int peekw(int ad);
// extern real peekl(int ad);
// extern void procedure poke(int ad, int n);
extern void adzon();
extern int animof(int ouf, int num);
// extern void affgd(int offs, int dep, int x, int y);

} // End of namespace Mortevielle
#endif
4 changes: 2 additions & 2 deletions engines/mortevielle/mor.cpp
View file
Expand Up @@ -115,7 +115,7 @@ void dessine(int ad, int x, int y) {
void dessine_rouleau() {
writepal(89);
if (g_currGraphicalDevice == MODE_HERCULES) {
mem[0x7000 * 16 + 14] = 15;
g_mem[0x7000 * 16 + 14] = 15;
}
hideMouse();
pictout(0x73a2, 0, 0, 0);
Expand Down Expand Up @@ -1325,7 +1325,7 @@ void aniof(int ouf, int num) {
int offset = animof(ouf, num);

GfxSurface surface;
surface.decode(&mem[ad * 16 + offset]);
surface.decode(&g_mem[ad * 16 + offset]);
g_vm->_screenSurface.drawPicture(surface, 0, 12);

ecrf1();
Expand Down
10 changes: 5 additions & 5 deletions engines/mortevielle/mor2.cpp
View file
Expand Up @@ -237,15 +237,15 @@ void tkey1(bool d) {
showMouse();
}

void tmlieu(int mli) {
void tmlieu(int roomId) {
Common::String nomp;

if (mli == 26)
mli = 15;
if (roomId == 26)
roomId = 15;

int i = 1;
while ((i < 8) && (v_lieu[i][mli] != 0)) {
nomp = deline(v_lieu[i][mli] + kMenuPlaceStringIndex);
while ((i < 8) && (g_v_lieu[i][roomId] != 0)) {
nomp = deline(g_v_lieu[i][roomId] + kMenuPlaceStringIndex);
while (nomp.size() < 20)
nomp += ' ';
g_vm->_menu.menut(g_vm->_menu._moveMenu[i], nomp);
Expand Down
2 changes: 1 addition & 1 deletion engines/mortevielle/mor2.h
View file
Expand Up @@ -43,7 +43,7 @@ extern void fenat(char ans);
/* NIVEAU 8 */
extern void afdes(int ad);
extern void tkey1(bool d);
extern void tmlieu(int mli);
extern void tmlieu(int roomId);
/* NIVEAU 7 */
extern void tlu(int af, int ob);
extern void affrep();
Expand Down
4 changes: 2 additions & 2 deletions engines/mortevielle/mortevielle.cpp
View file
Expand Up @@ -149,7 +149,7 @@ Common::ErrorCode MortevielleEngine::initialise() {
charpal();
charge_cfiph();
charge_cfiec();
zzuul(&adcfiec[161 * 16], ((822 * 128) - (161 * 16)) / 64);
zzuul(&g_adcfiec[161 * 16], ((822 * 128) - (161 * 16)) / 64);
g_c_zzz = 1;
init_nbrepm();
initMouse();
Expand Down Expand Up @@ -504,7 +504,7 @@ void MortevielleEngine::mainGame() {
charge_cfiec();

for (g_crep = 1; g_crep <= g_c_zzz; ++g_crep)
zzuul(&adcfiec[161 * 16], ((822 * 128) - (161 * 16)) / 64);
zzuul(&g_adcfiec[161 * 16], ((822 * 128) - (161 * 16)) / 64);

charge_bruit5();
_menu.initMenu();
Expand Down
60 changes: 30 additions & 30 deletions engines/mortevielle/mouse.cpp
View file
Expand Up @@ -60,7 +60,7 @@ void initMouse() {

g_vm->setMouseClick(false);
m_show = m_arrow;
if ((READ_LE_UINT16(&mem[0xcc]) == 0) && (READ_LE_UINT16(&mem[0xce]) == 0))
if ((READ_LE_UINT16(&g_mem[0xcc]) == 0) && (READ_LE_UINT16(&g_mem[0xce]) == 0))
int_m = false;

if (int_m) {
Expand Down Expand Up @@ -91,26 +91,26 @@ void hideMouse() {
int k = 0;
j = ((uint)y_s >> 1) * 80 + ((uint)x_s >> 2);
do {
WRITE_LE_UINT16(&mem[0xb000 * 16 + j], s_s[0][k]);
WRITE_LE_UINT16(&mem[0xb800 * 16 + j + 2], s_s[1][k]);
WRITE_LE_UINT16(&mem[0xba00 * 16 + j], s_s[2][k]);
WRITE_LE_UINT16(&mem[0xba00 * 16 + j + 2], s_s[3][k]);
WRITE_LE_UINT16(&g_mem[0xb000 * 16 + j], s_s[0][k]);
WRITE_LE_UINT16(&g_mem[0xb800 * 16 + j + 2], s_s[1][k]);
WRITE_LE_UINT16(&g_mem[0xba00 * 16 + j], s_s[2][k]);
WRITE_LE_UINT16(&g_mem[0xba00 * 16 + j + 2], s_s[3][k]);
j += 80;
++k;
} while (k < 5);
}
break;
case MODE_AMSTRAD1512:
for (int i = 0; i <= 3; ++i) {
port[0x3dd] = 1 << i;
g_port[0x3dd] = 1 << i;
int k = 0;
j = p_o_s;
do {
if (imp) {
WRITE_LE_UINT16(&mem[0xb800 * 16 + j], s_s[i][k]);
WRITE_LE_UINT16(&g_mem[0xb800 * 16 + j], s_s[i][k]);
j += 80 - 0x2000;
} else {
WRITE_LE_UINT16(&mem[0xb800 * 16 + j], s_s[i][k]);
WRITE_LE_UINT16(&g_mem[0xb800 * 16 + j], s_s[i][k]);
j += 0x2000;
}
imp = !imp;
Expand All @@ -119,22 +119,22 @@ void hideMouse() {
}
break;
case MODE_EGA: {
port[0x3c4] = 2;
port[0x3ce] = 8;
port[0x3cf] = 255;
g_port[0x3c4] = 2;
g_port[0x3ce] = 8;
g_port[0x3cf] = 255;
int i = 0;
do {
port[0x3c5] = 1 << i;
g_port[0x3c5] = 1 << i;
int k = 0;
j = p_o_s;
do {
// Useless ?
// ps = mem[0xa000 * 16 + j];
mem[0xa000 * 16 + j] = lo(s_s[i][k]);
g_mem[0xa000 * 16 + j] = lo(s_s[i][k]);

// Useless ??
// ps = mem[0xa000 * 16 + j + 1];
mem[0xa000 * 16 + j + 1] = hi(s_s[i][k]);
g_mem[0xa000 * 16 + j + 1] = hi(s_s[i][k]);
j += 80;
++k;
} while (k < 8);
Expand All @@ -146,7 +146,7 @@ void hideMouse() {
j = ((uint)y_s >> 1) * 80 + ((uint)x_s >> 3);
for (int i = 0; i <= 5; ++i) {
for (int k = 0; k <= 3; ++k)
WRITE_LE_UINT16(&mem[0xb000 * 16 + k * 0x200 + j], s_s[i][k]);
WRITE_LE_UINT16(&g_mem[0xb000 * 16 + k * 0x200 + j], s_s[i][k]);
j += 80;
}
break;
Expand All @@ -155,8 +155,8 @@ void hideMouse() {
int k = 0;
do {
for (int i = 0; i <= 3; ++i) {
WRITE_LE_UINT16(&mem[0xb800 * 16 + 0x200 * i + j], s_s[k][i + (k << 2)]);
WRITE_LE_UINT16(&mem[0xb800 * 16 + 0x200 * i + j + 2], s_s[k + 3][i + (k << 2)]);
WRITE_LE_UINT16(&g_mem[0xb800 * 16 + 0x200 * i + j], s_s[k][i + (k << 2)]);
WRITE_LE_UINT16(&g_mem[0xb800 * 16 + 0x200 * i + j + 2], s_s[k + 3][i + (k << 2)]);
}
j += 160;
++k;
Expand Down Expand Up @@ -188,10 +188,10 @@ void showMouse() {
k = 0;
j = ((uint)y_s >> 1) * 80 + ((uint)x_s >> 2);
do {
s_s[0][k] = READ_LE_UINT16(&mem[0xb800 * 16 + j]);
s_s[1][k] = READ_LE_UINT16(&mem[0xb800 * 16 + j + 2]);
s_s[2][k] = READ_LE_UINT16(&mem[0xba00 * 16 + j]);
s_s[3][k] = READ_LE_UINT16(&mem[0xba00 * 16 + j + 2]);
s_s[0][k] = READ_LE_UINT16(&g_mem[0xb800 * 16 + j]);
s_s[1][k] = READ_LE_UINT16(&g_mem[0xb800 * 16 + j + 2]);
s_s[2][k] = READ_LE_UINT16(&g_mem[0xba00 * 16 + j]);
s_s[3][k] = READ_LE_UINT16(&g_mem[0xba00 * 16 + j + 2]);
j += 80;
++k;
} while (k < 5);
Expand All @@ -200,14 +200,14 @@ void showMouse() {
for (i = 0; i <= 3; ++i) {
j = p_o_s;
imp = odd(y_s);
port[0x3de] = i;
g_port[0x3de] = i;
k = 0;
do {
if (imp) {
s_s[i][k] = READ_LE_UINT16(&mem[0xb800 * 16 + j]);
s_s[i][k] = READ_LE_UINT16(&g_mem[0xb800 * 16 + j]);
j += 80 - 0x2000;
} else {
s_s[i][k] = READ_LE_UINT16(&mem[0xb800 * 16 + j]);
s_s[i][k] = READ_LE_UINT16(&g_mem[0xb800 * 16 + j]);
j += 0x2000;
}
imp = !imp;
Expand All @@ -216,14 +216,14 @@ void showMouse() {
}
break;
case MODE_EGA:
port[0x3ce] = 4;
g_port[0x3ce] = 4;
l = 0;
do {
port[0x3cf] = l;
g_port[0x3cf] = l;
k = 0;
j = p_o_s;
do {
s_s[l][k] = mem[0xa000 * 16 + j] + (mem[(0xa000 * 16) + j + 1] << 8);
s_s[l][k] = g_mem[0xa000 * 16 + j] + (g_mem[(0xa000 * 16) + j + 1] << 8);
j += 80;
++k;
} while (k < 8);
Expand All @@ -234,7 +234,7 @@ void showMouse() {
j = ((uint)y_s >> 1) * 80 + ((uint)x_s >> 3);
for (i = 0; i <= 5; ++i) {
for (k = 0; k <= 3; ++k)
s_s[i][k] = READ_LE_UINT16(&mem[0xb000 * 16 + k * 0x200 + j]);
s_s[i][k] = READ_LE_UINT16(&g_mem[0xb000 * 16 + k * 0x200 + j]);
j += 80;
}
break;
Expand All @@ -243,8 +243,8 @@ void showMouse() {
k = 0;
do {
for (i = 0; i <= 3; ++i) {
s_s[k][i + (k << 2)] = READ_LE_UINT16(&mem[0xb800 * 16 + 0x200 * i + j]);
s_s[k + 3][i + (k << 2)] = READ_LE_UINT16(&mem[0xb800 * 16 + 0x200 * i + j + 2]);
s_s[k][i + (k << 2)] = READ_LE_UINT16(&g_mem[0xb800 * 16 + 0x200 * i + j]);
s_s[k + 3][i + (k << 2)] = READ_LE_UINT16(&g_mem[0xb800 * 16 + 0x200 * i + j + 2]);
}
j += 160;
++k;
Expand Down
12 changes: 6 additions & 6 deletions engines/mortevielle/outtext.cpp
View file
Expand Up @@ -76,13 +76,13 @@ static void cinq_huit(char &c, int &idx, byte &pt, bool &the_end) {
uint16 oct, ocd;

/* 5-8 */
oct = t_mot[idx];
oct = g_t_mot[idx];
oct = ((uint16)(oct << (16 - pt))) >> (16 - pt);
if (pt < 6) {
++idx;
oct = oct << (5 - pt);
pt += 11;
oct = oct | ((uint)t_mot[idx] >> pt);
oct = oct | ((uint)g_t_mot[idx] >> pt);
} else {
pt -= 5;
oct = (uint)oct >> pt;
Expand All @@ -95,13 +95,13 @@ static void cinq_huit(char &c, int &idx, byte &pt, bool &the_end) {
break;
case 30:
case 31:
ocd = t_mot[idx];
ocd = g_t_mot[idx];
ocd = (uint16)(ocd << (16 - pt)) >> (16 - pt);
if (pt < 6) {
++idx;
ocd = ocd << (5 - pt);
pt += 11;
ocd = ocd | ((uint)t_mot[idx] >> pt);
ocd = ocd | ((uint)g_t_mot[idx] >> pt);
} else {
pt -= 5;
ocd = (uint)ocd >> pt;
Expand Down Expand Up @@ -134,8 +134,8 @@ Common::String deline(int num) {
} else if (!g_vm->_txxFileFl) {
wrkStr = g_vm->getGameString(num);
} else {
int i = t_rec[num]._indis;
byte k = t_rec[num]._point;
int i = g_t_rec[num]._indis;
byte k = g_t_rec[num]._point;
int length = 0;
bool endFl = false;
char let;
Expand Down

0 comments on commit 81049d8

Please sign in to comment.