[Scummvm-git-logs] scummvm master -> c0a6a7d0f61f73d6ddefce462d19e333a00cc8bc
digitall
noreply at scummvm.org
Mon Feb 6 02:38:43 UTC 2023
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c0a6a7d0f6 EFH: Fix Various GCC Compiler Warnings
Commit: c0a6a7d0f61f73d6ddefce462d19e333a00cc8bc
https://github.com/scummvm/scummvm/commit/c0a6a7d0f61f73d6ddefce462d19e333a00cc8bc
Author: D G Turner (digitall at scummvm.org)
Date: 2023-02-06T02:38:20Z
Commit Message:
EFH: Fix Various GCC Compiler Warnings
Changed paths:
engines/efh/constants.cpp
engines/efh/init.cpp
diff --git a/engines/efh/constants.cpp b/engines/efh/constants.cpp
index a261703b8f4..1bf4fad0a1a 100644
--- a/engines/efh/constants.cpp
+++ b/engines/efh/constants.cpp
@@ -34,102 +34,102 @@ const uint8 kFontExtraLinesArray[96] = {
1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 0, 1, 0, 0};
const Font kFontData[96] = {
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
- {0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x80, 0x00},
- {0xA0, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00},
- {0x00, 0x50, 0xF8, 0x50, 0xF8, 0x50, 0x00, 0x00},
- {0x20, 0x78, 0xA0, 0x70, 0x28, 0xF0, 0x20, 0x00},
- {0xC8, 0xC8, 0x10, 0x20, 0x40, 0x98, 0x98, 0x00},
- {0x20, 0x50, 0x20, 0x40, 0xA8, 0x90, 0x68, 0x00},
- {0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00},
- {0x40, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40},
- {0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40},
- {0x00, 0xA8, 0x70, 0xF8, 0x70, 0xA8, 0x00, 0x00},
- {0x00, 0x20, 0x20, 0xF8, 0x20, 0x20, 0x00, 0x00},
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x40},
- {0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x00},
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00},
- {0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00},
- {0x60, 0x90, 0x90, 0x90, 0x90, 0x90, 0x60, 0x00},
- {0x40, 0xC0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00},
- {0x60, 0x90, 0x10, 0x20, 0x40, 0x80, 0xF0, 0x00},
- {0x60, 0x90, 0x10, 0x20, 0x10, 0x90, 0x60, 0x00},
- {0x10, 0x30, 0x50, 0x90, 0xF8, 0x10, 0x10, 0x00},
- {0xF0, 0x80, 0xE0, 0x10, 0x10, 0x90, 0x60, 0x00},
- {0x60, 0x90, 0x80, 0xE0, 0x90, 0x90, 0x60, 0x00},
- {0xF0, 0x10, 0x20, 0x20, 0x40, 0x40, 0x40, 0x00},
- {0x60, 0x90, 0x90, 0x60, 0x90, 0x90, 0x60, 0x00},
- {0x60, 0x90, 0x90, 0x70, 0x10, 0x90, 0x60, 0x00},
- {0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00},
- {0x00, 0x00, 0x20, 0x00, 0x00, 0x20, 0x40, 0x00},
- {0x10, 0x20, 0x40, 0x80, 0x40, 0x20, 0x10, 0x00},
- {0x00, 0x00, 0xF8, 0x00, 0x00, 0xF8, 0x00, 0x00},
- {0x80, 0x40, 0x20, 0x10, 0x20, 0x40, 0x80, 0x00},
- {0x70, 0x88, 0x08, 0x10, 0x20, 0x00, 0x20, 0x00},
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
- {0x60, 0x90, 0x90, 0xF0, 0x90, 0x90, 0x90, 0x00},
- {0xE0, 0x90, 0x90, 0xE0, 0x90, 0x90, 0xE0, 0x00},
- {0x60, 0x90, 0x80, 0x80, 0x80, 0x90, 0x60, 0x00},
- {0xE0, 0x90, 0x90, 0x90, 0x90, 0x90, 0xE0, 0x00},
- {0xF0, 0x80, 0x80, 0xE0, 0x80, 0x80, 0xF0, 0x00},
- {0xF0, 0x80, 0x80, 0xE0, 0x80, 0x80, 0x80, 0x00},
- {0x60, 0x90, 0x80, 0xB0, 0x90, 0x90, 0x70, 0x00},
- {0x90, 0x90, 0x90, 0xF0, 0x90, 0x90, 0x90, 0x00},
- {0xE0, 0x40, 0x40, 0x40, 0x40, 0x40, 0xE0, 0x00},
- {0x10, 0x10, 0x10, 0x10, 0x10, 0x90, 0x60, 0x00},
- {0x90, 0x90, 0x90, 0xE0, 0x90, 0x90, 0x90, 0x00},
- {0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xF0, 0x00},
- {0x82, 0xC6, 0xAA, 0x92, 0x82, 0x82, 0x82, 0x00},
- {0x88, 0x88, 0xC8, 0xA8, 0x98, 0x88, 0x88, 0x00},
- {0x60, 0x90, 0x90, 0x90, 0x90, 0x90, 0x60, 0x00},
- {0xE0, 0x90, 0x90, 0xE0, 0x80, 0x80, 0x80, 0x00},
- {0x60, 0x90, 0x90, 0x90, 0x90, 0x90, 0x60, 0x10},
- {0xE0, 0x90, 0x90, 0xE0, 0x90, 0x90, 0x90, 0x00},
- {0x60, 0x90, 0x80, 0x60, 0x10, 0x90, 0x60, 0x00},
- {0xF8, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00},
- {0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x60, 0x00},
- {0x88, 0x88, 0x88, 0x50, 0x50, 0x20, 0x20, 0x00},
- {0x82, 0x82, 0x82, 0x92, 0xAA, 0xC6, 0x82, 0x00},
- {0x88, 0x88, 0x50, 0x20, 0x50, 0x88, 0x88, 0x00},
- {0x88, 0x88, 0x50, 0x20, 0x20, 0x20, 0x20, 0x00},
- {0xF8, 0x08, 0x10, 0x20, 0x40, 0x80, 0xF8, 0x00},
- {0xC0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xC0},
- {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x00},
- {0x60, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x60},
- {0x20, 0x50, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00},
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
- {0x00, 0x00, 0x80, 0x80, 0x40, 0x00, 0x00, 0x00},
- {0x00, 0x00, 0x60, 0x10, 0x70, 0x90, 0x70, 0x00},
- {0x80, 0x80, 0xE0, 0x90, 0x90, 0x90, 0xE0, 0x00},
- {0x00, 0x00, 0x60, 0x90, 0x80, 0x90, 0x60, 0x00},
- {0x10, 0x10, 0x70, 0x90, 0x90, 0x90, 0x70, 0x00},
- {0x00, 0x00, 0x60, 0x90, 0xF0, 0x80, 0x60, 0x00},
- {0x30, 0x40, 0xE0, 0x40, 0x40, 0x40, 0x40, 0x00},
- {0x70, 0x90, 0x90, 0x90, 0x70, 0x10, 0xE0, 0x00},
- {0x80, 0x80, 0xE0, 0x90, 0x90, 0x90, 0x90, 0x00},
- {0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00},
- {0x40, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80},
- {0x80, 0x80, 0x90, 0x90, 0xE0, 0x90, 0x90, 0x00},
- {0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00},
- {0x00, 0x00, 0xEC, 0x92, 0x92, 0x92, 0x92, 0x00},
- {0x00, 0x00, 0xE0, 0x90, 0x90, 0x90, 0x90, 0x00},
- {0x00, 0x00, 0x60, 0x90, 0x90, 0x90, 0x60, 0x00},
- {0x00, 0xE0, 0x90, 0x90, 0x90, 0xE0, 0x80, 0x80},
- {0x00, 0x70, 0x90, 0x90, 0x90, 0x70, 0x10, 0x10},
- {0x00, 0x00, 0xB0, 0xC0, 0x80, 0x80, 0x80, 0x00},
- {0x00, 0x00, 0x70, 0x80, 0x60, 0x10, 0xE0, 0x00},
- {0x40, 0x40, 0xE0, 0x40, 0x40, 0x40, 0x40, 0x00},
- {0x00, 0x00, 0x90, 0x90, 0x90, 0x90, 0x70, 0x00},
- {0x00, 0x00, 0x88, 0x50, 0x50, 0x20, 0x20, 0x00},
- {0x00, 0x00, 0x92, 0x92, 0x92, 0x92, 0x6E, 0x00},
- {0x00, 0x00, 0x90, 0x90, 0x60, 0x90, 0x90, 0x00},
- {0x00, 0x90, 0x90, 0x90, 0x90, 0x70, 0x10, 0xE0},
- {0x00, 0x00, 0xF8, 0x10, 0x20, 0x40, 0xF8, 0x00},
- {0x20, 0x40, 0x40, 0x80, 0x40, 0x40, 0x20, 0x00},
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
- {0x80, 0x40, 0x40, 0x20, 0x40, 0x40, 0x80, 0x00},
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+ {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
+ {{0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x80, 0x00}},
+ {{0xA0, 0xA0, 0xA0, 0x00, 0x00, 0x00, 0x00, 0x00}},
+ {{0x00, 0x50, 0xF8, 0x50, 0xF8, 0x50, 0x00, 0x00}},
+ {{0x20, 0x78, 0xA0, 0x70, 0x28, 0xF0, 0x20, 0x00}},
+ {{0xC8, 0xC8, 0x10, 0x20, 0x40, 0x98, 0x98, 0x00}},
+ {{0x20, 0x50, 0x20, 0x40, 0xA8, 0x90, 0x68, 0x00}},
+ {{0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00}},
+ {{0x40, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40}},
+ {{0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x40}},
+ {{0x00, 0xA8, 0x70, 0xF8, 0x70, 0xA8, 0x00, 0x00}},
+ {{0x00, 0x20, 0x20, 0xF8, 0x20, 0x20, 0x00, 0x00}},
+ {{0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x40}},
+ {{0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x00}},
+ {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00}},
+ {{0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00}},
+ {{0x60, 0x90, 0x90, 0x90, 0x90, 0x90, 0x60, 0x00}},
+ {{0x40, 0xC0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00}},
+ {{0x60, 0x90, 0x10, 0x20, 0x40, 0x80, 0xF0, 0x00}},
+ {{0x60, 0x90, 0x10, 0x20, 0x10, 0x90, 0x60, 0x00}},
+ {{0x10, 0x30, 0x50, 0x90, 0xF8, 0x10, 0x10, 0x00}},
+ {{0xF0, 0x80, 0xE0, 0x10, 0x10, 0x90, 0x60, 0x00}},
+ {{0x60, 0x90, 0x80, 0xE0, 0x90, 0x90, 0x60, 0x00}},
+ {{0xF0, 0x10, 0x20, 0x20, 0x40, 0x40, 0x40, 0x00}},
+ {{0x60, 0x90, 0x90, 0x60, 0x90, 0x90, 0x60, 0x00}},
+ {{0x60, 0x90, 0x90, 0x70, 0x10, 0x90, 0x60, 0x00}},
+ {{0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00}},
+ {{0x00, 0x00, 0x20, 0x00, 0x00, 0x20, 0x40, 0x00}},
+ {{0x10, 0x20, 0x40, 0x80, 0x40, 0x20, 0x10, 0x00}},
+ {{0x00, 0x00, 0xF8, 0x00, 0x00, 0xF8, 0x00, 0x00}},
+ {{0x80, 0x40, 0x20, 0x10, 0x20, 0x40, 0x80, 0x00}},
+ {{0x70, 0x88, 0x08, 0x10, 0x20, 0x00, 0x20, 0x00}},
+ {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
+ {{0x60, 0x90, 0x90, 0xF0, 0x90, 0x90, 0x90, 0x00}},
+ {{0xE0, 0x90, 0x90, 0xE0, 0x90, 0x90, 0xE0, 0x00}},
+ {{0x60, 0x90, 0x80, 0x80, 0x80, 0x90, 0x60, 0x00}},
+ {{0xE0, 0x90, 0x90, 0x90, 0x90, 0x90, 0xE0, 0x00}},
+ {{0xF0, 0x80, 0x80, 0xE0, 0x80, 0x80, 0xF0, 0x00}},
+ {{0xF0, 0x80, 0x80, 0xE0, 0x80, 0x80, 0x80, 0x00}},
+ {{0x60, 0x90, 0x80, 0xB0, 0x90, 0x90, 0x70, 0x00}},
+ {{0x90, 0x90, 0x90, 0xF0, 0x90, 0x90, 0x90, 0x00}},
+ {{0xE0, 0x40, 0x40, 0x40, 0x40, 0x40, 0xE0, 0x00}},
+ {{0x10, 0x10, 0x10, 0x10, 0x10, 0x90, 0x60, 0x00}},
+ {{0x90, 0x90, 0x90, 0xE0, 0x90, 0x90, 0x90, 0x00}},
+ {{0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xF0, 0x00}},
+ {{0x82, 0xC6, 0xAA, 0x92, 0x82, 0x82, 0x82, 0x00}},
+ {{0x88, 0x88, 0xC8, 0xA8, 0x98, 0x88, 0x88, 0x00}},
+ {{0x60, 0x90, 0x90, 0x90, 0x90, 0x90, 0x60, 0x00}},
+ {{0xE0, 0x90, 0x90, 0xE0, 0x80, 0x80, 0x80, 0x00}},
+ {{0x60, 0x90, 0x90, 0x90, 0x90, 0x90, 0x60, 0x10}},
+ {{0xE0, 0x90, 0x90, 0xE0, 0x90, 0x90, 0x90, 0x00}},
+ {{0x60, 0x90, 0x80, 0x60, 0x10, 0x90, 0x60, 0x00}},
+ {{0xF8, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00}},
+ {{0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x60, 0x00}},
+ {{0x88, 0x88, 0x88, 0x50, 0x50, 0x20, 0x20, 0x00}},
+ {{0x82, 0x82, 0x82, 0x92, 0xAA, 0xC6, 0x82, 0x00}},
+ {{0x88, 0x88, 0x50, 0x20, 0x50, 0x88, 0x88, 0x00}},
+ {{0x88, 0x88, 0x50, 0x20, 0x20, 0x20, 0x20, 0x00}},
+ {{0xF8, 0x08, 0x10, 0x20, 0x40, 0x80, 0xF8, 0x00}},
+ {{0xC0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xC0}},
+ {{0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x00}},
+ {{0x60, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x60}},
+ {{0x20, 0x50, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00}},
+ {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
+ {{0x00, 0x00, 0x80, 0x80, 0x40, 0x00, 0x00, 0x00}},
+ {{0x00, 0x00, 0x60, 0x10, 0x70, 0x90, 0x70, 0x00}},
+ {{0x80, 0x80, 0xE0, 0x90, 0x90, 0x90, 0xE0, 0x00}},
+ {{0x00, 0x00, 0x60, 0x90, 0x80, 0x90, 0x60, 0x00}},
+ {{0x10, 0x10, 0x70, 0x90, 0x90, 0x90, 0x70, 0x00}},
+ {{0x00, 0x00, 0x60, 0x90, 0xF0, 0x80, 0x60, 0x00}},
+ {{0x30, 0x40, 0xE0, 0x40, 0x40, 0x40, 0x40, 0x00}},
+ {{0x70, 0x90, 0x90, 0x90, 0x70, 0x10, 0xE0, 0x00}},
+ {{0x80, 0x80, 0xE0, 0x90, 0x90, 0x90, 0x90, 0x00}},
+ {{0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00}},
+ {{0x40, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80}},
+ {{0x80, 0x80, 0x90, 0x90, 0xE0, 0x90, 0x90, 0x00}},
+ {{0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00}},
+ {{0x00, 0x00, 0xEC, 0x92, 0x92, 0x92, 0x92, 0x00}},
+ {{0x00, 0x00, 0xE0, 0x90, 0x90, 0x90, 0x90, 0x00}},
+ {{0x00, 0x00, 0x60, 0x90, 0x90, 0x90, 0x60, 0x00}},
+ {{0x00, 0xE0, 0x90, 0x90, 0x90, 0xE0, 0x80, 0x80}},
+ {{0x00, 0x70, 0x90, 0x90, 0x90, 0x70, 0x10, 0x10}},
+ {{0x00, 0x00, 0xB0, 0xC0, 0x80, 0x80, 0x80, 0x00}},
+ {{0x00, 0x00, 0x70, 0x80, 0x60, 0x10, 0xE0, 0x00}},
+ {{0x40, 0x40, 0xE0, 0x40, 0x40, 0x40, 0x40, 0x00}},
+ {{0x00, 0x00, 0x90, 0x90, 0x90, 0x90, 0x70, 0x00}},
+ {{0x00, 0x00, 0x88, 0x50, 0x50, 0x20, 0x20, 0x00}},
+ {{0x00, 0x00, 0x92, 0x92, 0x92, 0x92, 0x6E, 0x00}},
+ {{0x00, 0x00, 0x90, 0x90, 0x60, 0x90, 0x90, 0x00}},
+ {{0x00, 0x90, 0x90, 0x90, 0x90, 0x70, 0x10, 0xE0}},
+ {{0x00, 0x00, 0xF8, 0x10, 0x20, 0x40, 0xF8, 0x00}},
+ {{0x20, 0x40, 0x40, 0x80, 0x40, 0x40, 0x20, 0x00}},
+ {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
+ {{0x80, 0x40, 0x40, 0x20, 0x40, 0x40, 0x80, 0x00}},
+ {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}},
+ {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}
};
const Encounter kEncounters[] {
diff --git a/engines/efh/init.cpp b/engines/efh/init.cpp
index 448650c7201..b7511a1da81 100644
--- a/engines/efh/init.cpp
+++ b/engines/efh/init.cpp
@@ -371,21 +371,23 @@ EfhEngine::EfhEngine(OSystem *syst, const ADGameDescription *gd) : Engine(syst),
memset(_places, 0, ARRAYSIZE(_places));
for (int i = 0; i < 24; ++i)
memset(_curPlace[i], 0, ARRAYSIZE(_curPlace[i]));
- memset(_npcBuf, 0, ARRAYSIZE(_npcBuf));
+ memset(_npcBuf, 0, ARRAYSIZE(_npcBuf)*sizeof(NPCStruct));
memset(_imp1, 0, ARRAYSIZE(_imp1));
memset(_imp2, 0, ARRAYSIZE(_imp2));
memset(_titleSong, 0, ARRAYSIZE(_titleSong));
- memset(_items, 0, ARRAYSIZE(_items));
- memset(_tileFact, 0, ARRAYSIZE(_tileFact));
- memset(_animInfo, 0, ARRAYSIZE(_animInfo));
+ memset(_items, 0, ARRAYSIZE(_items)*sizeof(ItemStruct));
+ memset(_tileFact, 0, ARRAYSIZE(_tileFact)*sizeof(TileFactStruct));
+ memset(_animInfo, 0, ARRAYSIZE(_animInfo)*sizeof(AnimInfo));
memset(_history, 0, ARRAYSIZE(_history));
for (int i = 0; i < 19; ++i) {
memset(_techDataArr[i], 0, ARRAYSIZE(_techDataArr[i]));
memset(_mapArr[i], 0, ARRAYSIZE(_mapArr[i]));
- memset(_mapMonsters[i], 0, ARRAYSIZE(_mapMonsters[i]));
- memset(_mapGameMaps[i], 0, ARRAYSIZE(_mapGameMaps[i]));
+ memset(_mapMonsters[i], 0, ARRAYSIZE(_mapMonsters[i])*sizeof(MapMonster));
+ for (int j = 0; j < 64; ++j) {
+ memset(_mapGameMaps[i][j], 0, ARRAYSIZE(_mapGameMaps[i][j]));
+ }
}
- memset(_tileBankSubFilesArray, 0, ARRAYSIZE(_tileBankSubFilesArray));
+ memset(_tileBankSubFilesArray, 0, ARRAYSIZE(_tileBankSubFilesArray)*sizeof(uint8 *));
_regenCounter = 0;
// If requested, load a savegame instead of showing the intro
More information about the Scummvm-git-logs
mailing list