RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

This commit is contained in:
Mike Goslin 2000-12-15 18:47:12 +00:00
parent 35ff932d6e
commit 4cfffca8c2
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
panda/src/downloader/extractor.cxx
View File

@ -87,11 +87,6 @@ initiate(Filename &source_file, const Filename &rel_path) {
_total_bytes_read = 0;
_read_all_input = false;
_handled_all_input = false;
//_mfile.reset();
if (_mfile != NULL)
delete _mfile;
_mfile = new Multifile;
_buffer_start = _buffer->_buffer;
return ES_success;
}
@ -102,12 +97,13 @@ initiate(Filename &source_file, const Filename &rel_path) {
////////////////////////////////////////////////////////////////////
int Extractor::
run(void) {
nassertr(_mfile != NULL, ES_error);
if (_mfile == NULL)
_mfile = new Multifile;
// See if there is anything left in the source file
if (_read_all_input == false) {
_read_stream.read(_buffer->_buffer, _buffer->get_length());
_source_buffer_length = _read_stream.gcount();
_buffer_size = _source_buffer_length;
_total_bytes_read += _source_buffer_length;
if (_read_stream.eof()) {
nassertr(_total_bytes_read == _source_file_length, false);
@ -115,10 +111,15 @@ run(void) {
}
}
char *buffer_start = _buffer->_buffer;
int buffer_size = _source_buffer_length;
// Write to the out file
if (_mfile->write(_buffer_start, _buffer_size, _rel_path) == true) {
if (_mfile->write(buffer_start, buffer_size, _rel_path) == true) {
_read_stream.close();
_source_file.unlink();
delete _mfile;
_mfile = NULL;
return ES_success;
}
return ES_ok;

2
panda/src/downloader/extractor.h
View File

@ -51,8 +51,6 @@ private:
int _source_buffer_length;
Filename _source_file;
Filename _rel_path;
char *_buffer_start;
int _buffer_size;
};
#endif