diff options
| author | Strangerke | 2014-05-31 17:30:15 +0200 |
|---|---|---|
| committer | Strangerke | 2014-05-31 17:30:53 +0200 |
| commit | 659b7bfeed3b7cc0ccb70fcb41d638a3e8ba3d45 (patch) | |
| tree | dbc7b5441b8a53694c26a82f4fc7f1596b2d7d47 /engines/cruise/dataLoader.cpp | |
| parent | 283db7d769eb4cdd2014bd09132e7b06d17e2f4c (diff) | |
| download | scummvm-rg350-659b7bfeed3b7cc0ccb70fcb41d638a3e8ba3d45.tar.gz scummvm-rg350-659b7bfeed3b7cc0ccb70fcb41d638a3e8ba3d45.tar.bz2 scummvm-rg350-659b7bfeed3b7cc0ccb70fcb41d638a3e8ba3d45.zip | |
CRUISE: Replace some more strcpy
Diffstat (limited to 'engines/cruise/dataLoader.cpp')
| -rw-r--r-- | engines/cruise/dataLoader.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/cruise/dataLoader.cpp b/engines/cruise/dataLoader.cpp index e38343c215..55ed2c4e68 100644 --- a/engines/cruise/dataLoader.cpp +++ b/engines/cruise/dataLoader.cpp @@ -487,7 +487,7 @@ int loadSetEntry(const char *name, uint8 *ptr, int currentEntryIdx, int currentD filesDatabase[fileIndex].subData.resourceType = OBJ_TYPE_POLY; filesDatabase[fileIndex].subData.index = currentEntryIdx; break; - } + } case 1: { filesDatabase[fileIndex].width = filesDatabase[fileIndex].widthInColumn * 8; filesDatabase[fileIndex].subData.resourceType = OBJ_TYPE_BGMASK; @@ -495,7 +495,7 @@ int loadSetEntry(const char *name, uint8 *ptr, int currentEntryIdx, int currentD filesDatabase[fileIndex].subData.index = currentEntryIdx; filesDatabase[fileIndex].subData.transparency = 0; break; - } + } case 4: { filesDatabase[fileIndex].width = filesDatabase[fileIndex].widthInColumn * 2; filesDatabase[fileIndex].subData.resourceType = OBJ_TYPE_SPRITE; @@ -503,7 +503,7 @@ int loadSetEntry(const char *name, uint8 *ptr, int currentEntryIdx, int currentD filesDatabase[fileIndex].subData.index = currentEntryIdx; filesDatabase[fileIndex].subData.transparency = localBuffer.transparency % 0x10; break; - } + } case 5: { filesDatabase[fileIndex].subData.resourceType = OBJ_TYPE_SPRITE; decodeGfxUnified(&filesDatabase[fileIndex], localBuffer.type); @@ -511,22 +511,22 @@ int loadSetEntry(const char *name, uint8 *ptr, int currentEntryIdx, int currentD filesDatabase[fileIndex].subData.index = currentEntryIdx; filesDatabase[fileIndex].subData.transparency = localBuffer.transparency; break; - } + } case 8: { filesDatabase[fileIndex].subData.resourceType = OBJ_TYPE_SPRITE; filesDatabase[fileIndex].width = filesDatabase[fileIndex].widthInColumn; filesDatabase[fileIndex].subData.index = currentEntryIdx; filesDatabase[fileIndex].subData.transparency = localBuffer.transparency; break; - } + } default: { - warning("Unsuported gfx loading type: %d", localBuffer.type); + warning("Unsupported gfx loading type: %d", localBuffer.type); break; - } + } } if (name != filesDatabase[fileIndex].subData.name) - strcpy(filesDatabase[fileIndex].subData.name, name); + Common::strlcpy(filesDatabase[fileIndex].subData.name, name, sizeof(filesDatabase[fileIndex].subData.name)); // create the mask switch (localBuffer.type) { |