libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CGE2: Rework EncryptedStream::readLine().

Browse Source
This commit is contained in:
uruk 2014-05-26 16:30:32 +02:00
parent 43ce991b84
commit 62e36f9279
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/cge2/cge2_main.cpp
View File

@ -116,11 +116,10 @@ void CGE2Engine::loadSprite(const char *fname, int ref, int scene, V3D &pos) {
Common::String line;
for (line = sprf.readLine(); !sprf.eos(); line = sprf.readLine()){
int len = line.size();
Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr));
if (len == 0 || *tmpStr == ';')
if (line.size() == 0)
continue;
Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr));
char *p;
p = token(tmpStr);
if (*p == '@') {
@ -260,13 +259,14 @@ void CGE2Engine::loadScript(const char *fname) {
Common::String line;
for (line = scrf.readLine(); !scrf.eos(); line = scrf.readLine()) {
if (line.size() == 0)
continue;
char *p;
lcnt++;
Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr));
if ((line.size() == 0) || (*tmpStr == ';')) // Comments start with ';' - don't bother with them.
continue;
ok = false; // not OK if break
V3D P;

5
engines/cge2/fileio.cpp
View File

@ -242,7 +242,10 @@ bool EncryptedStream::seek(int32 offset) {
Common::String EncryptedStream::readLine() {
_lineCount++;
return _readStream->readLine();
Common::String line = _readStream->readLine();
if (!line.empty() && (line[0] == ';' || line[0] == '.' || line[0] == '*'))
line.clear(); // Returns an empty string, if the line is invalid.
return line;
}
int32 EncryptedStream::size() {

1
engines/cge2/fileio.h
View File

@ -105,6 +105,7 @@ public:
bool exist(const char *name);
};
// TODO: Revise the whole class!
class EncryptedStream {
private:
CGE2Engine *_vm;

5
engines/cge2/vga13h.cpp
View File

@ -278,10 +278,9 @@ Sprite *Sprite::expand() {
char tmpStr[kLineMax + 1];
for (line = sprf.readLine(); !sprf.eos(); line = sprf.readLine()){
int len = line.size();
Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr));
if (len == 0 || *tmpStr == ';')
if (line.size() == 0)
continue;
Common::strlcpy(tmpStr, line.c_str(), sizeof(tmpStr));
char *p = _vm->token(tmpStr);
if (*p == '@') {