[Scummvm-git-logs] scummvm master -> 0aecef3191eb34b0c18cb26ea87eab5f94009072
sev-
noreply at scummvm.org
Sun Dec 24 01:28:48 UTC 2023
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
83d26cf6a9 M4: BURGER: Fix warnings for static data
fe62c8603b M4: Comment out unused variables
2b7934eb85 M4: Fix endless loop
6600794f8b M4: Comment out unused variable
594f4de034 M4: Fix copy/paste error
0aecef3191 M4: BURGER: Comment out more unused variables
Commit: 83d26cf6a98060e802522315125a56acc7fb8180
https://github.com/scummvm/scummvm/commit/83d26cf6a98060e802522315125a56acc7fb8180
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-12-24T02:13:07+01:00
Commit Message:
M4: BURGER: Fix warnings for static data
Changed paths:
engines/m4/burger/rooms/section3/mine.cpp
diff --git a/engines/m4/burger/rooms/section3/mine.cpp b/engines/m4/burger/rooms/section3/mine.cpp
index 94e749ab33d..135dd7a6eea 100644
--- a/engines/m4/burger/rooms/section3/mine.cpp
+++ b/engines/m4/burger/rooms/section3/mine.cpp
@@ -42,74 +42,74 @@ const int16 Mine::MINE_SCENE_NUMBERS[] = {
};
const MineRoom Mine::MINE_INFO[] = {
- // Links Doors
- // --------------------- -------------------------- Correct
- // Room# Scene ID Back Front Left Right Back Front Left Right Link Check
- // ----- ---------- ---- ----- ---- ----- ----- ----- ----- ----- ------- -----
- 0, SCENE_305, 6, -1, -1, -1, FRONT, NONE, NONE, NONE, BACK, 0, // mine entrance
- 1, SCENE_313, -1, -1, 2, 6, NONE, NONE, RIGHT, LEFT, RIGHT, 0,
- 2, SCENE_316, -1, 11, 13, 1, NONE, BACK, RIGHT, LEFT, LEFT, 0,
- 3, SCENE_318, 9, 14, 5, 4, FRONT, BACK, RIGHT, LEFT, FRONT, 0,
- 4, SCENE_315, 5, -1, 3, 10, FRONT, NONE, RIGHT, LEFT, LEFT, 0,
- 5, SCENE_317, 18, 4, 9, 3, FRONT, BACK, RIGHT, LEFT, RIGHT, 0,
- 6, SCENE_318, 11, 0, 1, 7, FRONT, BACK, RIGHT, LEFT, RIGHT, 0,
- 7, SCENE_317, 13, 14, 6, 18, FRONT, RIGHT, RIGHT, LEFT, FRONT, 0,
- 8, SCENE_313, -1, -1, 10, 9, NONE, NONE, RIGHT, LEFT, RIGHT, 0,
- 9, SCENE_318, 10, 3, 8, 5, FRONT, BACK, RIGHT, LEFT, FRONT, 0,
- // ----- ---------- ---- ----- ---- ----- ----- ----- ----- ----- ---- -----
- 10, SCENE_316, -1, 9, 4, 8, NONE, BACK, RIGHT, LEFT, LEFT, 0,
- 11, SCENE_317, 2, 6, 11, 11, FRONT, BACK, RIGHT, LEFT, FRONT, 0,
- 12, SCENE_319, -1, -1, -1, 13, NONE, NONE, NONE, LEFT, RIGHT, 0,
- 13, SCENE_316, -1, 7, 12, 2, NONE, BACK, RIGHT, LEFT, FRONT, 0,
- 14, SCENE_315, 3, -1, 26, 7, FRONT, NONE, BACK, FRONT, LEFT, 0,
- 15, SCENE_317, 17, 16, 17, 20, FRONT, BACK, RIGHT, LEFT, RIGHT, 0,
- 16, SCENE_311, 15, -1, -1, -1, FRONT, NONE, NONE, NONE, BACK, 0,
- 17, SCENE_318, 22, 15, 20, 15, FRONT, BACK, RIGHT, LEFT, LEFT, 0,
- 18, SCENE_316, -1, 5, 7, 19, NONE, BACK, RIGHT, LEFT, LEFT, 0,
- 19, SCENE_312, -1, -1, 18, -1, NONE, NONE, RIGHT, NONE, LEFT, 0,
- // ----- ---------- ---- ----- ---- ----- ----- ----- ------ ----- ---- -----
- 20, SCENE_315, 26, -1, 15, 17, FRONT, NONE, RIGHT, LEFT, BACK, 0,
- 21, SCENE_319, -1, -1, -1, 22, NONE, NONE, NONE, LEFT, RIGHT, 0,
- 22, SCENE_316, -1, 17, 21, 23, NONE, BACK, RIGHT, LEFT, FRONT, 0,
- 23, SCENE_312, -1, -1, 22, -1, NONE, NONE, RIGHT, NONE, LEFT, 0,
- 24, SCENE_318, 35, 29, 33, 25, FRONT, BACK, RIGHT, LEFT, RIGHT, 0,
- 25, SCENE_314, -1, -1, 24, 26, NONE, NONE, RIGHT, LEFT, RIGHT, 0,
- 26, SCENE_317, 14, 20, 25, 38, LEFT, BACK, RIGHT, LEFT, RIGHT, 0,
- 27, SCENE_318, 38, 38, 37, 28, FRONT, BACK, RIGHT, LEFT, BACK, 0,
- 28, SCENE_312, -1, -1, 27, -1, NONE, NONE, RIGHT, NONE, LEFT, 0,
- 29, SCENE_317, 24, 30, 35, 31, FRONT, BACK, RIGHT, LEFT, BACK, 0,
- // ----- ---------- ---- ----- ---- ----- ----- ----- ------ ----- ---- -----
- 30, SCENE_311, 29, -1, -1, -1, FRONT, NONE, NONE, NONE, BACK, 0,
- 31, SCENE_312, -1, -1, 29, -1, NONE, NONE, RIGHT, NONE, LEFT, 0,
- 32, SCENE_319, -1, -1, -1, 33, NONE, NONE, NONE, LEFT, RIGHT, 0,
- 33, SCENE_314, -1, -1, 32, 24, NONE, NONE, RIGHT, LEFT, RIGHT, 0,
- 34, SCENE_319, -1, -1, -1, 35, NONE, NONE, NONE, LEFT, RIGHT, 0,
- 35, SCENE_316, -1, 24, 34, 29, NONE, BACK, RIGHT, LEFT, FRONT, 0,
- 36, SCENE_319, -1, -1, -1, 37, NONE, NONE, NONE, LEFT, RIGHT, 0,
- 37, SCENE_314, -1, -1, 36, 27, NONE, NONE, RIGHT, LEFT, RIGHT, 0,
- 38, SCENE_318, 27, 27, 26, 39, FRONT, BACK, RIGHT, LEFT, RIGHT, 0,
- 39, SCENE_310, -1, -1, 38, -1, NONE, NONE, RIGHT, NONE, NONE, 0, // treasure
- // ----- ---------- ---- ----- ---- ----- ----- ----- ----- ----- ------- -----
- 40, NO_SCENE, -1, -1, -1, -1, NONE, NONE, NONE, NONE, NONE, 0
-};
+ // Links Doors
+ // --------------------- -------------------------- Correct
+ // Room# Scene ID Back Front Left Right Back Front Left Right Link Check
+ // ----- ---------- ---- ----- ---- ----- ----- ----- ----- ----- ------- -----
+ { 0, SCENE_305, { 6, -1, -1, -1 }, { FRONT, NONE, NONE, NONE }, BACK, 0}, // mine entrance
+ { 1, SCENE_313, { -1, -1, 2, 6 }, { NONE, NONE, RIGHT, LEFT }, RIGHT, 0},
+ { 2, SCENE_316, { -1, 11, 13, 1 }, { NONE, BACK, RIGHT, LEFT }, LEFT, 0},
+ { 3, SCENE_318, { 9, 14, 5, 4 }, { FRONT, BACK, RIGHT, LEFT }, FRONT, 0},
+ { 4, SCENE_315, { 5, -1, 3, 10 }, { FRONT, NONE, RIGHT, LEFT }, LEFT, 0},
+ { 5, SCENE_317, { 18, 4, 9, 3 }, { FRONT, BACK, RIGHT, LEFT }, RIGHT, 0},
+ { 6, SCENE_318, { 11, 0, 1, 7 }, { FRONT, BACK, RIGHT, LEFT }, RIGHT, 0},
+ { 7, SCENE_317, { 13, 14, 6, 18 }, { FRONT, RIGHT, RIGHT, LEFT }, FRONT, 0},
+ { 8, SCENE_313, { -1, -1, 10, 9 }, { NONE, NONE, RIGHT, LEFT }, RIGHT, 0},
+ { 9, SCENE_318, { 10, 3, 8, 5 }, { FRONT, BACK, RIGHT, LEFT }, FRONT, 0},
+ // ----- ---------- ---- ----- ---- ----- ----- ----- ----- ----- ---- ---}--
+ {10, SCENE_316, { -1, 9, 4, 8 }, { NONE, BACK, RIGHT, LEFT }, LEFT, 0},
+ {11, SCENE_317, { 2, 6, 11, 11 }, { FRONT, BACK, RIGHT, LEFT }, FRONT, 0},
+ {12, SCENE_319, { -1, -1, -1, 13 }, { NONE, NONE, NONE, LEFT }, RIGHT, 0},
+ {13, SCENE_316, { -1, 7, 12, 2 }, { NONE, BACK, RIGHT, LEFT }, FRONT, 0},
+ {14, SCENE_315, { 3, -1, 26, 7 }, { FRONT, NONE, BACK, FRONT}, LEFT, 0},
+ {15, SCENE_317, { 17, 16, 17, 20 }, { FRONT, BACK, RIGHT, LEFT }, RIGHT, 0},
+ {16, SCENE_311, { 15, -1, -1, -1 }, { FRONT, NONE, NONE, NONE }, BACK, 0},
+ {17, SCENE_318, { 22, 15, 20, 15 }, { FRONT, BACK, RIGHT, LEFT }, LEFT, 0},
+ {18, SCENE_316, { -1, 5, 7, 19 }, { NONE, BACK, RIGHT, LEFT }, LEFT, 0},
+ {19, SCENE_312, { -1, -1, 18, -1 }, { NONE, NONE, RIGHT, NONE }, LEFT, 0},
+ // ----- ---------- ---- ----- ---- ----- ----- ----- ------ ----- ---- ---}--
+ {20, SCENE_315, { 26, -1, 15, 17 }, { FRONT, NONE, RIGHT, LEFT }, BACK, 0},
+ {21, SCENE_319, { -1, -1, -1, 22 }, { NONE, NONE, NONE, LEFT }, RIGHT, 0},
+ {22, SCENE_316, { -1, 17, 21, 23 }, { NONE, BACK, RIGHT, LEFT }, FRONT, 0},
+ {23, SCENE_312, { -1, -1, 22, -1 }, { NONE, NONE, RIGHT, NONE }, LEFT, 0},
+ {24, SCENE_318, { 35, 29, 33, 25 }, { FRONT, BACK, RIGHT, LEFT }, RIGHT, 0},
+ {25, SCENE_314, { -1, -1, 24, 26 }, { NONE, NONE, RIGHT, LEFT }, RIGHT, 0},
+ {26, SCENE_317, { 14, 20, 25, 38 }, { LEFT, BACK, RIGHT, LEFT }, RIGHT, 0},
+ {27, SCENE_318, { 38, 38, 37, 28 }, { FRONT, BACK, RIGHT, LEFT }, BACK, 0},
+ {28, SCENE_312, { -1, -1, 27, -1 }, { NONE, NONE, RIGHT, NONE }, LEFT, 0},
+ {29, SCENE_317, { 24, 30, 35, 31 }, { FRONT, BACK, RIGHT, LEFT }, BACK, 0},
+ // ----- ---------- ---- ----- ---- ----- ----- ----- ------ ----- ---- -----
+ {30, SCENE_311, { 29, -1, -1, -1 }, { FRONT, NONE, NONE, NONE }, BACK, 0},
+ {31, SCENE_312, { -1, -1, 29, -1 }, { NONE, NONE, RIGHT, NONE }, LEFT, 0},
+ {32, SCENE_319, { -1, -1, -1, 33 }, { NONE, NONE, NONE, LEFT }, RIGHT, 0},
+ {33, SCENE_314, { -1, -1, 32, 24 }, { NONE, NONE, RIGHT, LEFT }, RIGHT, 0},
+ {34, SCENE_319, { -1, -1, -1, 35 }, { NONE, NONE, NONE, LEFT }, RIGHT, 0},
+ {35, SCENE_316, { -1, 24, 34, 29 }, { NONE, BACK, RIGHT, LEFT }, FRONT, 0},
+ {36, SCENE_319, { -1, -1, -1, 37 }, { NONE, NONE, NONE, LEFT }, RIGHT, 0},
+ {37, SCENE_314, { -1, -1, 36, 27 }, { NONE, NONE, RIGHT, LEFT }, RIGHT, 0},
+ {38, SCENE_318, { 27, 27, 26, 39 }, { FRONT, BACK, RIGHT, LEFT }, RIGHT, 0},
+ {39, SCENE_310, { -1, -1, 38, -1 }, { NONE, NONE, RIGHT, NONE }, NONE, 0}, // treasure
+ // ----- ---------- ---- ----- ---- ----- ----- ----- ----- ----- ------- -----
+ {40, NO_SCENE, { -1, -1, -1, -1 }, { NONE, NONE, NONE, NONE }, NONE, 0}
+};
const EntranceInfo Mine::ENTRANCE_INFO[MAX_SCENE_TYPES][4] = {
//
// ( offscreen_x, offscreen_y, enter_facing, home_x, home_y, home_facing ) x 4 possible entrances
//
- // Back Front Left Right
- //----------------------- ------------------------- ------------------------- -------------------------
- 285, 240, 5, 320, 290, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 305
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 245, 3, 225, 275, 3, 0, 0, 0, 0, 0, 0, // 310
- 315, 225, 7, 310, 275, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 311
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90, 240, 3, 220, 270, 4, 0, 0, 0, 0, 0, 0, // 312
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 230, 3, 215, 270, 4, 550, 240, 8, 400, 270, 8, // 313
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 240, 3, 190, 270, 4, 570, 250, 8, 440, 280, 8, // 314
- 320, 210, 7, 315, 270, 7, 0, 0, 0, 0, 0, 0, 60, 230, 3, 190, 270, 4, 560, 250, 9, 400, 270, 8, // 315
- 0, 0, 0, 0, 0, 0, 400, 373,11, 335, 300, 7, 60, 220, 3, 200, 270, 4, 570, 240, 8, 400, 270, 7, // 316
- 320, 215, 7, 315, 270, 7, 230, 373, 1, 330, 300, 7, 60, 220, 3, 200, 270, 4, 570, 240, 8, 400, 270, 7, // 317
- 320, 215, 5, 315, 270, 7, 350, 373,11, 330, 300, 7, 60, 240, 3, 190, 270, 4, 560, 235, 9, 420, 270, 8, // 318
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 530, 240, 9, 420, 270, 7 // 319
+ // Back Front Left Right
+ //----------------------- ------------------------- ------------------------- -------------------------
+ {{285, 240, 5, 320, 290, 5}, { 0, 0, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 0}}, // 305
+ {{ 0, 0, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 0}, { 55, 245, 3, 225, 275, 3}, { 0, 0, 0, 0, 0, 0}}, // 310
+ {{315, 225, 7, 310, 275, 7}, { 0, 0, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 0}}, // 311
+ {{ 0, 0, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 0}, { 90, 240, 3, 220, 270, 4}, { 0, 0, 0, 0, 0, 0}}, // 312
+ {{ 0, 0, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 0}, { 65, 230, 3, 215, 270, 4}, {550, 240, 8, 400, 270, 8}}, // 313
+ {{ 0, 0, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 0}, { 65, 240, 3, 190, 270, 4}, {570, 250, 8, 440, 280, 8}}, // 314
+ {{320, 210, 7, 315, 270, 7}, { 0, 0, 0, 0, 0, 0}, { 60, 230, 3, 190, 270, 4}, {560, 250, 9, 400, 270, 8}}, // 315
+ {{ 0, 0, 0, 0, 0, 0}, {400, 373,11, 335, 300, 7}, { 60, 220, 3, 200, 270, 4}, {570, 240, 8, 400, 270, 7}}, // 316
+ {{320, 215, 7, 315, 270, 7}, {230, 373, 1, 330, 300, 7}, { 60, 220, 3, 200, 270, 4}, {570, 240, 8, 400, 270, 7}}, // 317
+ {{320, 215, 5, 315, 270, 7}, {350, 373,11, 330, 300, 7}, { 60, 240, 3, 190, 270, 4}, {560, 235, 9, 420, 270, 8}}, // 318
+ {{ 0, 0, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 0}, {530, 240, 9, 420, 270, 7}} // 319
};
@@ -117,19 +117,19 @@ const Rectangle Mine::FADE_DOWN_INFO[MAX_SCENE_TYPES][4] = {
//
// ( x1, y1, x2, y2) for four directions
//
- // Back Front Left Right
+ // Back Front Left Right
//------------------- ------------------- ------------------- -------------------
- 255, 0, 315, 250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 305
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 170, 270, 0, 0, 0, 0, // 310
- 270, 0, 365, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 311
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 175, 268, 0, 0, 0, 0, // 312
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 172, 256, 470, 0, 639, 265, // 313
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 172, 265, 470, 0, 639, 280, // 314
- 280, 0, 365, 245, 0, 0, 0, 0, 0, 0, 165, 257, 470, 0, 639, 271, // 315
- 0, 0, 0, 0, 325, 350, 500, 374, 0, 0, 178, 265, 470, 0, 639, 265, // 316
- 275, 0, 365, 255, 136, 344, 360, 374, 0, 0, 165, 268, 470, 0, 639, 270, // 317
- 275, 0, 365, 252, 185, 344, 500, 374, 0, 0, 165, 265, 470, 0, 639, 270, // 318
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 470, 0, 639, 270 // 319
+ {{255, 0, 315, 250}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}}, // 305
+ {{ 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 170, 270}, { 0, 0, 0, 0}}, // 310
+ {{270, 0, 365, 255}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}}, // 311
+ {{ 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 175, 268}, { 0, 0, 0, 0}}, // 312
+ {{ 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 172, 256}, {470, 0, 639, 265}}, // 313
+ {{ 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 172, 265}, {470, 0, 639, 280}}, // 314
+ {{280, 0, 365, 245}, { 0, 0, 0, 0}, { 0, 0, 165, 257}, {470, 0, 639, 271}}, // 315
+ {{ 0, 0, 0, 0}, {325, 350, 500, 374}, { 0, 0, 178, 265}, {470, 0, 639, 265}}, // 316
+ {{275, 0, 365, 255}, {136, 344, 360, 374}, { 0, 0, 165, 268}, {470, 0, 639, 270}}, // 317
+ {{275, 0, 365, 252}, {185, 344, 500, 374}, { 0, 0, 165, 265}, {470, 0, 639, 270}}, // 318
+ {{ 0, 0, 0, 0}, { 0, 0, 0, 0}, { 0, 0, 0, 0}, {470, 0, 639, 270}} // 319
};
int16 Mine::_entranceDoor;
Commit: fe62c8603b6bb5f5c20a7ac204eed467114b0ae2
https://github.com/scummvm/scummvm/commit/fe62c8603b6bb5f5c20a7ac204eed467114b0ae2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-12-24T02:16:01+01:00
Commit Message:
M4: Comment out unused variables
Changed paths:
engines/m4/adv_r/conv_io.cpp
engines/m4/platform/tile/tile_read.cpp
diff --git a/engines/m4/adv_r/conv_io.cpp b/engines/m4/adv_r/conv_io.cpp
index 07bc298bf6a..67173c783c4 100644
--- a/engines/m4/adv_r/conv_io.cpp
+++ b/engines/m4/adv_r/conv_io.cpp
@@ -98,7 +98,7 @@ Conv *conv_get_handle(void) {
void conv_set_handle(Conv *c) {
_GC(globConv) = c;
-}
+}
void conv_resume(Conv *c) {
conv_go(c);
@@ -556,7 +556,7 @@ static Conv *conv_restore_state(Conv *c) {
decl_chunk *decl;
int32 num_decls = 0, num_entries = 0;
- short flag_num = 0, flag_index = 0;
+ short /*flag_num = 0, */flag_index = 0;
int32 val;
int32 e_flags = 0;
int32 myCNode;
@@ -642,7 +642,7 @@ static Conv *conv_restore_state(Conv *c) {
if (flag_index == 32) {
flag_index = 0;
- flag_num++;
+ //flag_num++;
}
if (flag_index == 0) {
diff --git a/engines/m4/platform/tile/tile_read.cpp b/engines/m4/platform/tile/tile_read.cpp
index 2bf8f6a6cfe..9f26bcdadd9 100644
--- a/engines/m4/platform/tile/tile_read.cpp
+++ b/engines/m4/platform/tile/tile_read.cpp
@@ -31,7 +31,7 @@ void tt_read_header(SysFile *ifp, int32 *file_x, int32 *file_y,
int32 value;
uint8 buf[4];
int i;
- byte *byte_ptr;
+ //byte *byte_ptr;
void *bufferHandle;
// Initalize return parameters
@@ -88,16 +88,16 @@ void tt_read_header(SysFile *ifp, int32 *file_x, int32 *file_y,
// Write color table
for (i = 0; i < 256; i++) {
- byte_ptr = (byte *)&value;
+ //byte_ptr = (byte *)&value;
bufferHandle = &buf[0];
ifp->read((MemHandle)&bufferHandle, 4);
value = (buf[3] << 24) + (buf[2] << 16) + (buf[1] << 8) + buf[0];
- byte_ptr++;
+ //byte_ptr++;
pal[i].r = (value >> 16) & 0x0ff;
- byte_ptr++;
+ //byte_ptr++;
pal[i].g = (value >> 8) & 0x0ff;
- byte_ptr++;
+ //byte_ptr++;
pal[i].b = (value) & 0x0ff;
}
}
Commit: 2b7934eb855691e8bd8d76884a39f1e1f5ddca66
https://github.com/scummvm/scummvm/commit/2b7934eb855691e8bd8d76884a39f1e1f5ddca66
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-12-24T02:17:14+01:00
Commit Message:
M4: Fix endless loop
Changed paths:
engines/m4/wscript/ws_machine.cpp
diff --git a/engines/m4/wscript/ws_machine.cpp b/engines/m4/wscript/ws_machine.cpp
index 2f999b52dcf..5840057cfd0 100644
--- a/engines/m4/wscript/ws_machine.cpp
+++ b/engines/m4/wscript/ws_machine.cpp
@@ -552,7 +552,7 @@ static bool op_TRIG_W(machine *m, int32 *pcOffset) {
}
if (myInstruction) {
- for (myIndex = minIndex; myIndex <= maxIndex; i++) {
+ for (myIndex = minIndex; myIndex <= maxIndex; myIndex++) {
if (randFlag) {
myCount = imath_ranged_rand(minCount, maxCount);
}
Commit: 6600794f8b7df41fd0c82e5b3be3ae9e1fe4b9b9
https://github.com/scummvm/scummvm/commit/6600794f8b7df41fd0c82e5b3be3ae9e1fe4b9b9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-12-24T02:19:11+01:00
Commit Message:
M4: Comment out unused variable
Changed paths:
engines/m4/burger/rooms/section1/room105.h
diff --git a/engines/m4/burger/rooms/section1/room105.h b/engines/m4/burger/rooms/section1/room105.h
index be0b78f9fbb..fd20d1c688b 100644
--- a/engines/m4/burger/rooms/section1/room105.h
+++ b/engines/m4/burger/rooms/section1/room105.h
@@ -35,7 +35,7 @@ private:
int _elgusMode = 0;
KernelTriggerType _savedMode = (KernelTriggerType)0;
int _savedTrigger = 0;
- int _val7 = 0;
+ //int _val7 = 0;
int _val8 = 0;
bool _flag1 = false;
bool _flag2 = false;
Commit: 594f4de03445943d7f1d024323b9869ffc18abc6
https://github.com/scummvm/scummvm/commit/594f4de03445943d7f1d024323b9869ffc18abc6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-12-24T02:19:25+01:00
Commit Message:
M4: Fix copy/paste error
Changed paths:
engines/m4/burger/rooms/section1/room105.cpp
diff --git a/engines/m4/burger/rooms/section1/room105.cpp b/engines/m4/burger/rooms/section1/room105.cpp
index 0084537a0b4..60c27e5c1bf 100644
--- a/engines/m4/burger/rooms/section1/room105.cpp
+++ b/engines/m4/burger/rooms/section1/room105.cpp
@@ -1040,7 +1040,7 @@ void Room105::daemon() {
player_set_commands_allowed(_flag5);
_flag5 = false;
break;
-
+
case 5:
player_set_commands_allowed(true);
break;
@@ -1430,7 +1430,7 @@ void Room105::conv10() {
} else {
sendWSMessage(0x150000, 0, _G(my_walker), 0, nullptr, 1);
conv_resume();
- }
+ }
} else if (conv_sound_to_play()) {
if (who <= 0) {
if (node == 23)
@@ -1511,7 +1511,7 @@ void Room105::conv11() {
_flag4 = true;
if (node != 7 &&
- (node != 8 || entry != 0) && (node != 9 || node != 2) &&
+ (node != 8 || entry != 0) && (node != 9 || entry != 2) &&
(node != 11 || entry != 3) && (node != 12 || entry != 3)) {
if (node == 13 && entry == 0) {
_elgusShould = 9;
Commit: 0aecef3191eb34b0c18cb26ea87eab5f94009072
https://github.com/scummvm/scummvm/commit/0aecef3191eb34b0c18cb26ea87eab5f94009072
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-12-24T02:28:26+01:00
Commit Message:
M4: BURGER: Comment out more unused variables
Changed paths:
engines/m4/burger/rooms/section1/room142.h
engines/m4/burger/rooms/section1/room172.h
engines/m4/burger/rooms/section4/room406.h
engines/m4/burger/rooms/section4/room407.h
engines/m4/burger/rooms/section5/room510.h
diff --git a/engines/m4/burger/rooms/section1/room142.h b/engines/m4/burger/rooms/section1/room142.h
index 230c17b8a6d..deadaeb1bc3 100644
--- a/engines/m4/burger/rooms/section1/room142.h
+++ b/engines/m4/burger/rooms/section1/room142.h
@@ -61,7 +61,7 @@ private:
static int32 _val1;
static int32 _val2;
static int32 _val3;
- int _val4 = 0;
+ //int _val4 = 0;
void checkAction();
void faceTruck();
diff --git a/engines/m4/burger/rooms/section1/room172.h b/engines/m4/burger/rooms/section1/room172.h
index 63ab51f492c..cb450692f20 100644
--- a/engines/m4/burger/rooms/section1/room172.h
+++ b/engines/m4/burger/rooms/section1/room172.h
@@ -33,7 +33,7 @@ private:
machine *_series1 = nullptr;
machine *_series1s = nullptr;
Series _jug;
- machine *_series4 = nullptr;
+ //machine *_series4 = nullptr;
Series _series5;
machine *_series7 = nullptr;
noWalkRect *_walk1 = nullptr;
diff --git a/engines/m4/burger/rooms/section4/room406.h b/engines/m4/burger/rooms/section4/room406.h
index 1558c80b33e..9b8cc71d4f3 100644
--- a/engines/m4/burger/rooms/section4/room406.h
+++ b/engines/m4/burger/rooms/section4/room406.h
@@ -98,7 +98,7 @@ private:
int _ticks = 0;
int _dogShould = 0;
int _val2 = 0;
- int _val3 = 0;
+ //int _val3 = 0;
int _val4 = 0;
int _mayorShould = 0;
int _val6 = 0;
diff --git a/engines/m4/burger/rooms/section4/room407.h b/engines/m4/burger/rooms/section4/room407.h
index 39259b32269..e5ebb8372a2 100644
--- a/engines/m4/burger/rooms/section4/room407.h
+++ b/engines/m4/burger/rooms/section4/room407.h
@@ -64,7 +64,7 @@ private:
int _roxyShould = 0;
int _val4 = 0;
int _vipeShould = 0;
- int _digiTrigger = 0;
+ //int _digiTrigger = 0;
void loadSeries();
void conv87();
diff --git a/engines/m4/burger/rooms/section5/room510.h b/engines/m4/burger/rooms/section5/room510.h
index 644948b0150..45b0332aa7b 100644
--- a/engines/m4/burger/rooms/section5/room510.h
+++ b/engines/m4/burger/rooms/section5/room510.h
@@ -52,7 +52,7 @@ private:
};
static const ButtonDef _BUTTONS[BUTTON_COUNT];
Button _buttons[BUTTON_COUNT];
- machine *_buttonSeries[BUTTON_COUNT];
+ //machine *_buttonSeries[BUTTON_COUNT];
int _val2 = 0;
int _val3 = 0;
int _val4 = 0;
More information about the Scummvm-git-logs
mailing list