libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 01:07:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "GOB: fix code overloads in map_v1.cpp"

Browse Source 
This reverts commit b3061e0bc622897ce7f9fa208179b5a0706002bb.
The original change was a result of a false positive.
Check the discussion in PR #5889 for more information.
This commit is contained in:
Filippos Karapetis 2024-07-03 01:18:27 +03:00
parent d86ef1c35b
commit 2f104415bf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/gob/map_v1.cpp
View File

@ -72,7 +72,7 @@ void Map_v1::loadMapObjects(const char *avjFile) {
uint32 objsPos;
Common::strcpy_s(avoName, sizeof(avoName) - 4, _sourceFile);
Common::strcat_s(avoName, sizeof(avoName), ".avo");
Common::strcat_s(avoName, ".avo");
int32 size;
dataBuf = _vm->_dataIO->getFile(avoName, size);
@ -157,8 +157,8 @@ void Map_v1::loadSounds(Common::SeekableReadStream &data) {
for (int i = 0; i < count; i++) {
data.read(buf, 14);
buf[14] = 0;
Common::strcat_s(buf, sizeof(buf), ".SND");
Common::strcpy_s(sndNames[i], sizeof(sndNames[i]), buf);
Common::strcat_s(buf, ".SND");
Common::strcpy_s(sndNames[i], buf);
}
_vm->_sound->sampleLoad(&_vm->_goblin->_soundData[14], SOUND_SND, "diamant1.snd");