[Scummvm-cvs-logs] SF.net SVN: scummvm:[50244] tools/branches/gsoc2010-decompiler/decompiler/ scummv6/disassembler.cpp
pidgeot at users.sourceforge.net
pidgeot at users.sourceforge.net
Fri Jun 25 00:29:58 CEST 2010
Revision: 50244
http://scummvm.svn.sourceforge.net/scummvm/?rev=50244&view=rev
Author: pidgeot
Date: 2010-06-24 22:29:58 +0000 (Thu, 24 Jun 2010)
Log Message:
-----------
Output SCUMMv6 script metadata to std::clog instead of std::cout
Modified Paths:
--------------
tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.cpp
Modified: tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.cpp
===================================================================
--- tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.cpp 2010-06-24 22:26:17 UTC (rev 50243)
+++ tools/branches/gsoc2010-decompiler/decompiler/scummv6/disassembler.cpp 2010-06-24 22:29:58 UTC (rev 50244)
@@ -23,6 +23,8 @@
#include <iostream>
#include <sstream>
+#include <boost/format.hpp>
+
#include "disassembler.h"
void Scumm::v6::Disassembler::doDisassemble() throw(UnknownOpcodeException) {
@@ -31,24 +33,24 @@
blockName += _f.readChar();
}
if (blockName == "SCRP") {
- std::cout << "Input is global script\n";
+ std::clog << "Input is global script\n";
_f.seek(8, SEEK_SET);
} else if (blockName == "LSCR") {
- std::cout << "Input is local script\n";
+ std::clog << "Input is local script\n";
_f.seek(9, SEEK_SET);
} else if (blockName == "ENCD") {
- std::cout << "Input is room entry script\n";
+ std::clog << "Input is room entry script\n";
_f.seek(8, SEEK_SET);
} else if (blockName == "EXCD") {
- std::cout << "Input is room exit script\n";
+ std::clog << "Input is room exit script\n";
_f.seek(8, SEEK_SET);
} else if (blockName == "VERB") {
- std::cout << "Input is object script\n";
+ std::clog << "Input is object script\n";
_f.seek(8, SEEK_SET);
- std::cout << "Offset table:\n";
+ std::clog << "Offset table:\n";
uint8 verb = _f.readByte();
while (verb != 0) {
- printf("%02x - %04x\n", verb, _f.readUint16LE());
+ std::clog << boost::format("%02x - %04x\n") % verb % _f.readUint16LE();
verb = _f.readByte();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list