mirror of
https://github.com/libretro/scummvm.git
synced 2025-03-04 01:07:22 +00:00
Simplify line reading with the simpler readLine(), instead of readLine_NEW
svn-id: r35217
This commit is contained in:
parent
29f59d07f4
commit
c20292c0f1
@ -247,14 +247,14 @@ void TextviewView::scriptDone() {
|
||||
}
|
||||
|
||||
void TextviewView::processLines() {
|
||||
_script->readLine_NEW(_currentLine, 79);
|
||||
strncpy(_currentLine, _script->readLine().c_str(), 79);
|
||||
if (_script->eos() || _script->err())
|
||||
error("Attempted to read past end of response file");
|
||||
|
||||
while (!_script->eos() && !_script->err()) {
|
||||
// Commented out line, so go loop for another
|
||||
if (_currentLine[0] == '#') {
|
||||
_script->readLine_NEW(_currentLine, 79);
|
||||
strncpy(_currentLine, _script->readLine().c_str(), 79);
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -267,7 +267,7 @@ void TextviewView::processLines() {
|
||||
if (!cEnd)
|
||||
error("Unterminated command '%s' in response file", _currentLine);
|
||||
|
||||
*(cEnd + 1)= '\0';
|
||||
*cEnd = '\0';
|
||||
processCommand();
|
||||
|
||||
// Copy rest of line (if any) to start of buffer
|
||||
@ -286,7 +286,7 @@ void TextviewView::processLines() {
|
||||
break;
|
||||
}
|
||||
|
||||
_script->readLine_NEW(_currentLine, 79);
|
||||
strncpy(_currentLine, _script->readLine().c_str(), 79);
|
||||
}
|
||||
}
|
||||
|
||||
@ -597,7 +597,7 @@ void AnimviewView::scriptDone() {
|
||||
}
|
||||
|
||||
void AnimviewView::processLines() {
|
||||
_script->readLine_NEW(_currentLine, 79);
|
||||
strncpy(_currentLine, _script->readLine().c_str(), 79);
|
||||
if (_script->eos() || _script->err()) {
|
||||
// end of script, end animation
|
||||
scriptDone();
|
||||
@ -638,7 +638,7 @@ void AnimviewView::processLines() {
|
||||
break;
|
||||
}
|
||||
|
||||
_script->readLine_NEW(_currentLine, 79);
|
||||
strncpy(_currentLine, _script->readLine().c_str(), 79);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user