[Scummvm-cvs-logs] scummvm master -> 6d4189e2edd8c62e00e03799aa9c788b4d669d3b
sev-
sev at scummvm.org
Thu Nov 3 00:18:48 CET 2011
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7e57a87479 DRACI: Fix warning
6d4189e2ed DRASCULA: Fix warnings
Commit: 7e57a874793c4a51e373299d056ecadeda8902bc
https://github.com/scummvm/scummvm/commit/7e57a874793c4a51e373299d056ecadeda8902bc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-11-02T16:08:23-07:00
Commit Message:
DRACI: Fix warning
Changed paths:
engines/draci/saveload.cpp
diff --git a/engines/draci/saveload.cpp b/engines/draci/saveload.cpp
index b3bf0cb..e3551c7 100644
--- a/engines/draci/saveload.cpp
+++ b/engines/draci/saveload.cpp
@@ -41,7 +41,7 @@ bool readSavegameHeader(Common::InSaveFile *in, DraciSavegameHeader &header) {
// Validate the header Id
in->read(saveIdentBuffer, 6);
- if (strcmp(saveIdentBuffer, draciIdentString))
+ if (strcmp(saveIdentBuffer, draciIdentString) != 0)
return false;
header.version = in->readByte();
Commit: 6d4189e2edd8c62e00e03799aa9c788b4d669d3b
https://github.com/scummvm/scummvm/commit/6d4189e2edd8c62e00e03799aa9c788b4d669d3b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-11-02T16:18:10-07:00
Commit Message:
DRASCULA: Fix warnings
Changed paths:
engines/drascula/drascula.cpp
engines/drascula/graphics.cpp
engines/drascula/saveload.cpp
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index b4f009e..5f4e5c5 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -882,7 +882,7 @@ bool DrasculaEngine::loadDrasculaDat() {
in.read(buf, 8);
buf[8] = '\0';
- if (strcmp(buf, "DRASCULA")) {
+ if (strcmp(buf, "DRASCULA") != 0) {
Common::String errorMessage = "File 'drascula.dat' is corrupt. Get it from the ScummVM website";
GUIErrorMessage(errorMessage);
warning("%s", errorMessage.c_str());
diff --git a/engines/drascula/graphics.cpp b/engines/drascula/graphics.cpp
index 9ea20e3..f9f6c1f 100644
--- a/engines/drascula/graphics.cpp
+++ b/engines/drascula/graphics.cpp
@@ -361,7 +361,7 @@ void DrasculaEngine::centerText(const char *message, int textX, int textY) {
curWord = strtok(msg, " ");
while (curWord != NULL) {
// Check if the word and the current line fit on screen
- if (strlen(tmpMessageLine) > 0)
+ if (tmpMessageLine[0] != '\0')
strcat(tmpMessageLine, " ");
strcat(tmpMessageLine, curWord);
if (textFitsCentered(tmpMessageLine, textX)) {
@@ -643,7 +643,7 @@ void DrasculaEngine::waitFrameSSN() {
}
bool DrasculaEngine::animate(const char *animationFile, int FPS) {
- int NFrames = 1;
+ int NFrames;
int cnt = 2;
Common::SeekableReadStream *stream = _archives.open(animationFile);
diff --git a/engines/drascula/saveload.cpp b/engines/drascula/saveload.cpp
index c8622f3..35e3821 100644
--- a/engines/drascula/saveload.cpp
+++ b/engines/drascula/saveload.cpp
@@ -123,7 +123,7 @@ bool DrasculaEngine::saveLoadScreen() {
if (mouseX > 115 && mouseY > y + (9 * n) && mouseX < 115 + 175 && mouseY < y + 10 + (9 * n)) {
strcpy(select, _saveNames[n]);
- if (strcmp(select, "*"))
+ if (strcmp(select, "*") != 0)
selectionMade = 1;
else {
enterName();
More information about the Scummvm-git-logs
mailing list