[Scummvm-git-logs] scummvm master -> bd1e6527833be3dc1f09fd3a774c2c8f533e9053
bluegr
noreply at scummvm.org
Wed Sep 11 07:20:54 UTC 2024
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:
06d2830751 JANITORIAL: CINE: Fix extension typo
bd1e652783 JANITORIAL: CRUISE: Fix extension typo
Commit: 06d28307516fbb3835792d88e69808a60c7e741a
https://github.com/scummvm/scummvm/commit/06d28307516fbb3835792d88e69808a60c7e741a
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-11T10:16:55+03:00
Commit Message:
JANITORIAL: CINE: Fix extension typo
Changed paths:
engines/cine/anim.cpp
engines/cine/pal.cpp
engines/cine/saveload.cpp
engines/cine/script_fw.cpp
engines/cine/various.cpp
engines/cine/various.h
diff --git a/engines/cine/anim.cpp b/engines/cine/anim.cpp
index 590c7339e71..36b75f6fb52 100644
--- a/engines/cine/anim.cpp
+++ b/engines/cine/anim.cpp
@@ -458,7 +458,7 @@ void freeAnimDataTable() {
static byte getAnimTransparentColor(const char *animName) {
char name[15];
- removeExtention(name, animName, sizeof(name));
+ removeExtension(name, animName, sizeof(name));
for (int i = 0; i < ARRAYSIZE(transparencyData); i++) {
if (!strcmp(name, transparencyData[i].name)) {
@@ -867,7 +867,7 @@ int loadResource(const char *resourceName, int16 idx, int16 frameIndex) {
g_sound->musicType() != MT_MT32 &&
(strstr(resourceName, ".SPL") || strstr(resourceName, ".H32"))) {
char base[20];
- removeExtention(base, resourceName, sizeof(base));
+ removeExtension(base, resourceName, sizeof(base));
for (uint i = 0; i < ARRAYSIZE(resNameMapping); i++) {
if (scumm_stricmp(base, resNameMapping[i].from) == 0) {
diff --git a/engines/cine/pal.cpp b/engines/cine/pal.cpp
index d47d85a3d33..d9015d30ff6 100644
--- a/engines/cine/pal.cpp
+++ b/engines/cine/pal.cpp
@@ -35,7 +35,7 @@ static byte paletteBuffer2[16];
void loadPal(const char *fileName) {
char buffer[20];
- removeExtention(buffer, fileName, sizeof(buffer));
+ removeExtension(buffer, fileName, sizeof(buffer));
Common::strcat_s(buffer, ".PAL");
g_cine->_palArray.clear();
@@ -86,7 +86,7 @@ void loadRelatedPalette(const char *fileName) {
byte i;
int16 paletteIndex;
- removeExtention(localName, fileName, sizeof(localName));
+ removeExtension(localName, fileName, sizeof(localName));
paletteIndex = findPaletteFromName(localName);
diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp
index d1437756bd1..2cde68b496d 100644
--- a/engines/cine/saveload.cpp
+++ b/engines/cine/saveload.cpp
@@ -710,7 +710,7 @@ bool CineEngine::loadPlainSaveFW(Common::SeekableReadStream &in, CineSaveGameFor
if (strlen(bgName)) {
if (g_cine->getGameType() == GType_FW && (g_cine->getFeatures() & GF_CD)) {
char buffer[20];
- removeExtention(buffer, bgName, sizeof(buffer));
+ removeExtension(buffer, bgName, sizeof(buffer));
g_sound->setBgMusic(atoi(buffer + 1));
}
loadBg(bgName);
diff --git a/engines/cine/script_fw.cpp b/engines/cine/script_fw.cpp
index 5fd606ffc2e..9d85c4bb7ad 100644
--- a/engines/cine/script_fw.cpp
+++ b/engines/cine/script_fw.cpp
@@ -1380,7 +1380,7 @@ int FWScript::o1_loadBg() {
if (g_cine->getGameType() == GType_FW && (g_cine->getFeatures() & GF_CD)) {
char buffer[20];
- removeExtention(buffer, param, sizeof(buffer));
+ removeExtension(buffer, param, sizeof(buffer));
g_sound->setBgMusic(atoi(buffer + 1));
}
diff --git a/engines/cine/various.cpp b/engines/cine/various.cpp
index e5297808c5a..661d6ef6fc8 100644
--- a/engines/cine/various.cpp
+++ b/engines/cine/various.cpp
@@ -1514,7 +1514,7 @@ void checkForPendingDataLoad() {
void hideMouse() {
}
-void removeExtention(char *dest, const char *source, size_t sz) {
+void removeExtension(char *dest, const char *source, size_t sz) {
Common::strcpy_s(dest, sz, source);
byte *ptr = (byte *) strchr(dest, '.');
diff --git a/engines/cine/various.h b/engines/cine/various.h
index 9cdbff3f577..339860cc747 100644
--- a/engines/cine/various.h
+++ b/engines/cine/various.h
@@ -133,7 +133,7 @@ void checkForPendingDataLoad();
void hideMouse();
-void removeExtention(char *dest, const char *source, size_t sz);
+void removeExtension(char *dest, const char *source, size_t sz);
struct SelectedObjStruct {
int16 idx;
Commit: bd1e6527833be3dc1f09fd3a774c2c8f533e9053
https://github.com/scummvm/scummvm/commit/bd1e6527833be3dc1f09fd3a774c2c8f533e9053
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-11T10:18:51+03:00
Commit Message:
JANITORIAL: CRUISE: Fix extension typo
Changed paths:
engines/cruise/background.h
engines/cruise/cruise_main.cpp
engines/cruise/cruise_main.h
engines/cruise/dataLoader.cpp
engines/cruise/saveload.cpp
engines/cruise/volume.cpp
diff --git a/engines/cruise/background.h b/engines/cruise/background.h
index 25b37d481b1..c3f7ebcc008 100644
--- a/engines/cruise/background.h
+++ b/engines/cruise/background.h
@@ -26,7 +26,7 @@ namespace Cruise {
struct backgroundTableStruct {
char name[16];
- char extention[6];
+ char extension[6];
};
extern short int cvtPalette[0x20];
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index 2e60832133a..5734f2077c7 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -309,7 +309,7 @@ void printInfoBlackBox(const char *string) {
void waitForPlayerInput() {
}
-void getFileExtention(const char *name, char *buffer, size_t ln) {
+void getFileExtension(const char *name, char *buffer, size_t ln) {
while (*name != '.' && *name) {
name++;
}
@@ -317,7 +317,7 @@ void getFileExtention(const char *name, char *buffer, size_t ln) {
Common::strcpy_s(buffer, ln, name);
}
-void removeExtention(const char *name, char *buffer, size_t ln) { // not like in original
+void removeExtension(const char *name, char *buffer, size_t ln) { // not like in original
char *ptr;
Common::strcpy_s(buffer, ln, name);
@@ -344,10 +344,10 @@ int loadFileSub1(uint8 **ptr, const char *name, uint8 *ptr2) {
}
}
- getFileExtention(name, buffer, sizeof(buffer));
+ getFileExtension(name, buffer, sizeof(buffer));
if (!strcmp(buffer, ".SPL")) {
- removeExtention(name, buffer, sizeof(buffer));
+ removeExtension(name, buffer, sizeof(buffer));
/* if (useH32)
*{
diff --git a/engines/cruise/cruise_main.h b/engines/cruise/cruise_main.h
index 6fc78f034e0..cffaed1c970 100644
--- a/engines/cruise/cruise_main.h
+++ b/engines/cruise/cruise_main.h
@@ -94,9 +94,9 @@ void resetFileEntryRange(int param1, int param2);
int getProcParam(int overlayIdx, int param2, const char * name);
void changeScriptParamInList(int param1, int param2, scriptInstanceStruct * pScriptInstance, int newValue, int param3);
uint8 *getDataFromData3(ovlData3Struct * ptr, int param);
-void removeExtention(const char *name, char *buffer, size_t ln);
+void removeExtension(const char *name, char *buffer, size_t ln);
void resetPtr2(scriptInstanceStruct * ptr);
-void getFileExtention(const char *name, char *buffer, size_t ln);
+void getFileExtension(const char *name, char *buffer, size_t ln);
void *allocAndZero(int size);
void freeStuff2();
void mainLoop();
diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp
index 0d04d1228f0..3c6ad288090 100644
--- a/engines/cruise/dataLoader.cpp
+++ b/engines/cruise/dataLoader.cpp
@@ -212,17 +212,17 @@ int createResFileEntry(int width, int height, int size, int resType) {
}
fileTypeEnum getFileType(const char *name) {
- char extentionBuffer[16];
+ char extensionBuffer[16];
fileTypeEnum newFileType = type_UNK;
- getFileExtention(name, extentionBuffer, sizeof(extentionBuffer));
+ getFileExtension(name, extensionBuffer, sizeof(extensionBuffer));
- if (!strcmp(extentionBuffer, ".SPL")) {
+ if (!strcmp(extensionBuffer, ".SPL")) {
newFileType = type_SPL;
- } else if (!strcmp(extentionBuffer, ".SET")) {
+ } else if (!strcmp(extensionBuffer, ".SET")) {
newFileType = type_SET;
- } else if (!strcmp(extentionBuffer, ".FNT")) {
+ } else if (!strcmp(extensionBuffer, ".FNT")) {
newFileType = type_FNT;
}
diff --git a/engines/cruise/saveload.cpp b/engines/cruise/saveload.cpp
index fcdae64892c..70f271eb93f 100644
--- a/engines/cruise/saveload.cpp
+++ b/engines/cruise/saveload.cpp
@@ -149,7 +149,7 @@ static void syncBackgroundTable(Common::Serializer &s) {
warning("Saving a background resource that has too long a name");
s.syncBytes((byte *)backgroundTable[i].name, 9);
- s.syncBytes((byte *)backgroundTable[i].extention, 6);
+ s.syncBytes((byte *)backgroundTable[i].extension, 6);
}
}
diff --git a/engines/cruise/volume.cpp b/engines/cruise/volume.cpp
index eef3ab2941e..35b059cd7cb 100644
--- a/engines/cruise/volume.cpp
+++ b/engines/cruise/volume.cpp
@@ -39,7 +39,7 @@ void loadPal(volumeDataStruct *entry) {
if (_vm->_PAL_file.isOpen())
_vm->_PAL_file.close();
- removeExtention(entry->ident, name);
+ removeExtension(entry->ident, name);
strcat(name, ".PAL");
if (!_vm->_PAL_file.open(name))
More information about the Scummvm-git-logs
mailing list