thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SLUDGE: code formatting

Browse source
This commit is contained in:
yinsimei 2017-05-29 08:02:59 +02:00 • committed by Eugene Sandulenko
parent 2dddb900c9
commit ca2ee02496
52 changed files with 2157 additions and 1718 deletions
Download patch file Download diff file Expand all files Collapse all files

33
engines/sludge/language.cpp
View file

@ -44,9 +44,9 @@ unsigned int stringToInt(char *s) {
if (*s >= '0' && *s <= '9') {
i *= 10;
i += *s - '0';
s ++;
s++;
} else if (*s == '-') {
negative = ! negative;
negative = !negative;
s++;
} else {
if (negative)
@ -56,7 +56,6 @@ unsigned int stringToInt(char *s) {
}
}
char *getPrefsFilename(char *filename) {
// Yes, this trashes the original string, but
// we also free it at the end (warning!)...
@ -92,7 +91,8 @@ void readIniFile(char *filename) {
Common::File fd;
if (!fd.open(langName)) {
debug(kSludgeDebugDataLoad, "Fail to open language file : %s", langName);
debug(kSludgeDebugDataLoad, "Fail to open language file : %s",
langName);
return;
}
@ -127,7 +127,7 @@ void readIniFile(char *filename) {
if (strcmp(lineSoFar, "LANGUAGE") == 0) {
gameSettings.languageID = stringToInt(secondSoFar);
} else if (strcmp(lineSoFar, "WINDOW") == 0) {
gameSettings.userFullScreen = ! stringToInt(secondSoFar);
gameSettings.userFullScreen = !stringToInt(secondSoFar);
} else if (strcmp(lineSoFar, "REFRESH") == 0) {
gameSettings.refreshRate = stringToInt(secondSoFar);
} else if (strcmp(lineSoFar, "ANTIALIAS") == 0) {
@ -153,10 +153,10 @@ void readIniFile(char *filename) {
default:
if (doingSecond) {
secondSoFar[here ++] = readChar;
secondSoFar[here++] = readChar;
secondSoFar[here] = 0;
} else {
lineSoFar[here ++] = readChar;
lineSoFar[here++] = readChar;
lineSoFar[here] = 0;
}
break;
@ -185,19 +185,23 @@ void saveIniFile(char *filename) {
void makeLanguageTable(Common::File *table) {
languageTable = new int[gameSettings.numLanguages + 1];
if (! checkNew(languageTable)) return;
if (!checkNew(languageTable))
return;
languageName = new char *[gameSettings.numLanguages + 1];
if (! checkNew(languageName)) return;
if (!checkNew(languageName))
return;
for (unsigned int i = 0; i <= gameSettings.numLanguages; i ++) {
for (unsigned int i = 0; i <= gameSettings.numLanguages; i++) {
languageTable[i] = i ? get2bytes(table) : 0;
debug(kSludgeDebugDataLoad, "languageTable %i: %i", i, languageTable[i]);
debug(kSludgeDebugDataLoad, "languageTable %i: %i", i,
languageTable[i]);
languageName[i] = 0;
if (gameVersion >= VERSION(2, 0)) {
if (gameSettings.numLanguages) {
languageName[i] = readString(table);
debug(kSludgeDebugDataLoad, "languageName %i: %s\n", i, languageName[i]);
debug(kSludgeDebugDataLoad, "languageName %i: %s\n", i,
languageName[i]);
}
}
}
@ -206,8 +210,9 @@ void makeLanguageTable(Common::File *table) {
int getLanguageForFileB() {
int indexNum = -1;
for (unsigned int i = 0; i <= gameSettings.numLanguages; i ++) {
if (languageTable[i] == gameSettings.languageID) indexNum = i;
for (unsigned int i = 0; i <= gameSettings.numLanguages; i++) {
if (languageTable[i] == gameSettings.languageID)
indexNum = i;
}
return indexNum;