mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-14 13:50:13 +00:00
Fix for bug #2101083 - "ANY - MSVC71 compilation fails due to warnings-as-errors"
svn-id: r34457
This commit is contained in:
parent
83e09d1aa4
commit
814e27fe40
@ -216,7 +216,7 @@ public:
|
||||
|
||||
virtual void enter() {
|
||||
_vm->_gfx->clearScreen();
|
||||
int x = 0, y = 0;
|
||||
int x = 0, y = 0, i = 0;
|
||||
if (_vm->getPlatform() == Common::kPlatformPC) {
|
||||
x = 20;
|
||||
y = 50;
|
||||
@ -227,10 +227,9 @@ public:
|
||||
|
||||
bool complete[3];
|
||||
_vm->_saveLoad->getGamePartProgress(complete, 3);
|
||||
for (int i = 0; i < 3 && complete[i]; i++, _availItems++) ;
|
||||
for (i = 0; i < 3 && complete[i]; i++, _availItems++) ;
|
||||
|
||||
// TODO: keep track of and destroy menu item frames/surfaces
|
||||
int i;
|
||||
for (i = 0; i < _availItems; i++) {
|
||||
_lines[i] = new GfxObj(0, renderMenuItem(_menuStrings[i]), "MenuItem");
|
||||
uint id = _vm->_gfx->setItem(_lines[i], MENUITEMS_X, MENUITEMS_Y + MENUITEM_HEIGHT * i, 0xFF);
|
||||
|
@ -385,16 +385,18 @@ void Journal::drawPanelText(int y, const char *text) {
|
||||
char s[128];
|
||||
strncpy(s, text, 127);
|
||||
s[127] = 0;
|
||||
char *p;
|
||||
|
||||
// remove leading and trailing spaces (necessary for spanish version)
|
||||
for (char *p = s + strlen(s) - 1; p >= s && *p == ' '; --p) {
|
||||
for (p = s + strlen(s) - 1; p >= s && *p == ' '; --p) {
|
||||
*p = 0;
|
||||
}
|
||||
text = s;
|
||||
for (char *p = s; *p == ' '; ++p) {
|
||||
for (p = s; *p == ' '; ++p) {
|
||||
text = p + 1;
|
||||
}
|
||||
// draw the substrings
|
||||
char *p = (char *)strchr(text, ' ');
|
||||
p = (char *)strchr(text, ' ');
|
||||
if (!p) {
|
||||
int x = (128 - _vm->display()->textWidth(text)) / 2;
|
||||
_vm->display()->setText(x, y, text, false);
|
||||
|
Loading…
Reference in New Issue
Block a user