libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 05:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ZVISION: Remove superfluous spacing and reorder some includes

Browse Source
This commit is contained in:
Filippos Karapetis 2014-12-03 01:12:35 +02:00
parent 7976a34bbf
commit 2a4a6df5f2
80 changed files with 5 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/zvision/animation/meta_animation.cpp
View File

@ -34,7 +34,6 @@
#include "graphics/surface.h"
namespace ZVision {
MetaAnimation::MetaAnimation(const Common::String &fileName, ZVision *engine)

1
engines/zvision/animation/meta_animation.h
View File

@ -28,7 +28,6 @@
#include "common/rect.h"
#include "common/list.h"
namespace Common {
class String;
}

1
engines/zvision/animation/rlf_animation.cpp
View File

@ -32,7 +32,6 @@
#include "graphics/colormasks.h"
namespace ZVision {
RlfAnimation::RlfAnimation(const Common::String &fileName, bool stream)

1
engines/zvision/animation/rlf_animation.h
View File

@ -27,7 +27,6 @@
#include "graphics/surface.h"
namespace Common {
class String;
}

2
engines/zvision/archives/zfs_archive.cpp
View File

@ -153,5 +153,3 @@ void ZfsArchive::unXor(byte *buffer, uint32 length, const byte *xorKey) const {
}
} // End of namespace ZVision

1
engines/zvision/archives/zfs_archive.h
View File

@ -27,7 +27,6 @@
#include "common/hashmap.h"
#include "common/hash-str.h"
namespace Common {
class String;
}

1
engines/zvision/core/console.cpp
View File

@ -41,7 +41,6 @@
#include "audio/mixer.h"
namespace ZVision {
Console::Console(ZVision *engine) : GUI::Debugger(), _engine(engine) {

1
engines/zvision/core/events.cpp
View File

@ -40,7 +40,6 @@
#include "engines/util.h"
namespace ZVision {
void ZVision::shortKeys(Common::Event event) {

4
engines/zvision/core/menu.cpp
View File

@ -26,7 +26,6 @@
#include "zvision/graphics/render_manager.h"
namespace ZVision {
enum {
@ -380,7 +379,6 @@ void MenuZGI::process(uint32 deltatime) {
else if (itemCount > 50)
itemCount = 50;
for (int i = 0; i < itemCount; i++) {
int itemspace = (600 - 28) / itemCount;
@ -553,7 +551,6 @@ void MenuZGI::process(uint32 deltatime) {
}
}
MenuNemesis::MenuNemesis(ZVision *engine) :
MenuHandler(engine) {
inmenu = false;
@ -761,5 +758,4 @@ void MenuNemesis::process(uint32 deltatime) {
}
}
} // End of namespace ZVision

2
engines/zvision/core/menu.h
View File

@ -70,8 +70,6 @@ public:
private:
Graphics::Surface menuback[3][2];
Graphics::Surface menubar[4][2];
Graphics::Surface *items[50][2];
uint itemId[50];

1
engines/zvision/core/save_manager.cpp
View File

@ -35,7 +35,6 @@
#include "gui/message.h"
namespace ZVision {
const uint32 SaveManager::SAVEGAME_ID = MKTAG('Z', 'E', 'N', 'G');

2
engines/zvision/core/search_manager.cpp
View File

@ -27,7 +27,6 @@
#include "common/fs.h"
#include "common/stream.h"
namespace ZVision {
SearchManager::SearchManager(const Common::String &rootPath, int depth) {
@ -237,7 +236,6 @@ void SearchManager::addDir(const Common::String &name) {
Common::ArchiveMemberList list;
dir->listMatchingMembers(list, "*.zfs");
for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
Common::String flname = (*iter)->getName();

1
engines/zvision/cursors/cursor.cpp
View File

@ -27,7 +27,6 @@
#include "common/str.h"
#include "common/file.h"
namespace ZVision {
ZorkCursor::ZorkCursor()

1
engines/zvision/cursors/cursor.h
View File

@ -26,7 +26,6 @@
#include "graphics/surface.h"
#include "zvision/zvision.h"
namespace Common {
class String;
}

2
engines/zvision/cursors/cursor_manager.cpp
View File

@ -31,7 +31,6 @@
#include "graphics/pixelformat.h"
#include "graphics/cursorman.h"
namespace ZVision {
const char *CursorManager::_cursorNames[NUM_CURSORS] = { "active", "arrow", "backward", "downarrow", "forward", "handpt", "handpu", "hdown", "hleft",
@ -46,7 +45,6 @@ const char *CursorManager::_zNemCursorFileNames[NUM_CURSORS] = { "00act", "arrow
"hright", "hup", "00idle", "left", "right", "ssurr", "stilt", "turn", "up"
};
CursorManager::CursorManager(ZVision *engine, const Graphics::PixelFormat *pixelFormat)
: _engine(engine),
_pixelFormat(pixelFormat),

1
engines/zvision/cursors/cursor_manager.h
View File

@ -27,7 +27,6 @@
#include "common/str.h"
namespace Graphics {
struct PixelFormat;
}

3
engines/zvision/detection.cpp
View File

@ -32,7 +32,6 @@
#include "common/str-array.h"
#include "common/system.h"
namespace ZVision {
uint32 ZVision::getFeatures() const {
@ -45,7 +44,6 @@ Common::Language ZVision::getLanguage() const {
} // End of namespace ZVision
static const PlainGameDescriptor zVisionGames[] = {
{"zvision", "ZVision Game"},
{"znemesis", "Zork Nemesis: The Forbidden Lands"},
@ -53,7 +51,6 @@ static const PlainGameDescriptor zVisionGames[] = {
{0, 0}
};
namespace ZVision {
static const ZVisionGameDescription gameDescriptions[] = {

1
engines/zvision/detection.h
View File

@ -25,7 +25,6 @@
#include "engines/advancedDetector.h"
namespace ZVision {
enum ZVisionGameId {

1
engines/zvision/fonts/truetype_font.cpp
View File

@ -37,7 +37,6 @@
#include "graphics/fonts/ttf.h"
#include "graphics/surface.h"
namespace ZVision {
TruetypeFont::TruetypeFont(ZVision *engine, int32 fontHeight)

1
engines/zvision/fonts/truetype_font.h
View File

@ -28,7 +28,6 @@
#include "graphics/font.h"
#include "graphics/pixelformat.h"
namespace Graphics {
struct Surface;
}

1
engines/zvision/graphics/effects/fog.cpp
View File

@ -28,7 +28,6 @@
#include "zvision/graphics/render_manager.h"
#include "zvision/scripting/script_manager.h"
namespace ZVision {
FogFx::FogFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, EffectMap *Map, const Common::String &clouds):

1
engines/zvision/graphics/effects/light.cpp
View File

@ -27,7 +27,6 @@
#include "zvision/zvision.h"
#include "zvision/graphics/render_manager.h"
namespace ZVision {
LightFx::LightFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, EffectMap *Map, int8 delta, int8 minD, int8 maxD):

1
engines/zvision/graphics/effects/wave.cpp
View File

@ -27,7 +27,6 @@
#include "zvision/zvision.h"
#include "zvision/graphics/render_manager.h"
namespace ZVision {
WaveFx::WaveFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, int16 frames, int16 centerX, int16 centerY, float ampl, float waveln, float spd):

4
engines/zvision/graphics/render_manager.cpp
View File

@ -37,7 +37,6 @@
#include "image/tga.h"
namespace ZVision {
RenderManager::RenderManager(ZVision *engine, uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow, const Graphics::PixelFormat pixelFormat)
@ -122,7 +121,6 @@ void RenderManager::renderBackbufferToScreen() {
outWndDirtyRect = _wrkWndDirtyRect;
}
if (!outWndDirtyRect.isEmpty()) {
_system->copyRectToScreen(out->getBasePtr(outWndDirtyRect.left, outWndDirtyRect.top), out->pitch,
outWndDirtyRect.left + _workingWindow.left,
@ -511,8 +509,6 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
if (srcRect.isEmpty() || !srcRect.isValidRect())
return;
uint32 _keycolor = colorkey & ((1 << (src.format.bytesPerPixel << 3)) - 1);
// Copy srcRect from src surface to dst surface

3
engines/zvision/graphics/render_manager.h
View File

@ -33,7 +33,6 @@
#include "effect.h"
class OSystem;
namespace Common {
@ -92,7 +91,6 @@ private:
// A buffer used for apply graphics effects
Graphics::Surface _effectWnd;
/** Width of the working window. Saved to prevent extraneous calls to _workingWindow.width() */
const int _wrkWidth;
/** Height of the working window. Saved to prevent extraneous calls to _workingWindow.height() */
@ -256,7 +254,6 @@ public:
// Processing subtitles
void processSubs(uint16 deltatime);
// Return background size
Common::Point getBkgSize();

4
engines/zvision/graphics/render_table.cpp
View File

@ -21,14 +21,10 @@
*/
#include "common/scummsys.h"
#include "zvision/graphics/render_table.h"
#include "common/rect.h"
#include "graphics/colormasks.h"
namespace ZVision {
RenderTable::RenderTable(uint numColumns, uint numRows)

1
engines/zvision/graphics/render_table.h
View File

@ -26,7 +26,6 @@
#include "common/rect.h"
#include "graphics/surface.h"
namespace ZVision {
class RenderTable {

15
engines/zvision/scripting/actions.cpp
View File

@ -49,7 +49,6 @@
#include "audio/decoders/wave.h"
namespace ZVision {
//////////////////////////////////////////////////////////////////////////////
@ -66,7 +65,6 @@ bool ActionAdd::execute() {
return true;
}
//////////////////////////////////////////////////////////////////////////////
// ActionAssign
//////////////////////////////////////////////////////////////////////////////
@ -89,7 +87,6 @@ bool ActionAssign::execute() {
return true;
}
//////////////////////////////////////////////////////////////////////////////
// ActionAttenuate
//////////////////////////////////////////////////////////////////////////////
@ -108,7 +105,6 @@ bool ActionAttenuate::execute() {
return true;
}
//////////////////////////////////////////////////////////////////////////////
// ActionChangeLocation
//////////////////////////////////////////////////////////////////////////////
@ -125,7 +121,6 @@ bool ActionChangeLocation::execute() {
return false;
}
//////////////////////////////////////////////////////////////////////////////
// ActionCrossfade
//////////////////////////////////////////////////////////////////////////////
@ -368,7 +363,6 @@ bool ActionInventory::execute() {
return true;
}
//////////////////////////////////////////////////////////////////////////////
// ActionKill
//////////////////////////////////////////////////////////////////////////////
@ -457,8 +451,6 @@ ActionMusic::ActionMusic(ZVision *engine, int32 slotkey, const Common::String &l
_volume = volume * 255 / 100;
}
}
}
ActionMusic::~ActionMusic() {
@ -583,7 +575,6 @@ bool ActionUnloadAnimation::execute() {
return true;
}
//////////////////////////////////////////////////////////////////////////////
// ActionPlayAnimation
//////////////////////////////////////////////////////////////////////////////
@ -625,7 +616,6 @@ bool ActionPlayAnimation::execute() {
return true;
}
//////////////////////////////////////////////////////////////////////////////
// ActionPlayPreloadAnimation
//////////////////////////////////////////////////////////////////////////////
@ -646,7 +636,6 @@ bool ActionPlayPreloadAnimation::execute() {
return true;
}
//////////////////////////////////////////////////////////////////////////////
// ActionQuit
//////////////////////////////////////////////////////////////////////////////
@ -786,7 +775,6 @@ bool ActionRotateTo::execute() {
return true;
}
//////////////////////////////////////////////////////////////////////////////
// ActionSetPartialScreen
//////////////////////////////////////////////////////////////////////////////
@ -833,7 +821,6 @@ bool ActionSetPartialScreen::execute() {
return true;
}
//////////////////////////////////////////////////////////////////////////////
// ActionSetScreen
//////////////////////////////////////////////////////////////////////////////
@ -852,7 +839,6 @@ bool ActionSetScreen::execute() {
return true;
}
//////////////////////////////////////////////////////////////////////////////
// ActionSetVenus
//////////////////////////////////////////////////////////////////////////////
@ -884,7 +870,6 @@ bool ActionStop::execute() {
return true;
}
//////////////////////////////////////////////////////////////////////////////
// ActionStreamVideo
//////////////////////////////////////////////////////////////////////////////

1
engines/zvision/scripting/actions.h
View File

@ -28,7 +28,6 @@
#include "audio/mixer.h"
namespace ZVision {
// Forward declaration of ZVision. This file is included before ZVision is declared

1
engines/zvision/scripting/control.cpp
View File

@ -31,7 +31,6 @@
#include "common/stream.h"
namespace ZVision {
void Control::parseFlatControl(ZVision *engine) {

1
engines/zvision/scripting/control.h
View File

@ -26,7 +26,6 @@
#include "common/keyboard.h"
#include "common/str.h"
namespace Common {
class SeekableReadStream;
struct Point;

1
engines/zvision/scripting/controls/fist_control.cpp
View File

@ -37,7 +37,6 @@
#include "graphics/surface.h"
namespace ZVision {
FistControl::FistControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)

1
engines/zvision/scripting/controls/fist_control.h
View File

@ -28,7 +28,6 @@
#include "common/array.h"
#include "common/rect.h"
namespace ZVision {
class MetaAnimation;

1
engines/zvision/scripting/controls/hotmov_control.cpp
View File

@ -37,7 +37,6 @@
#include "graphics/surface.h"
namespace ZVision {
HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)

1
engines/zvision/scripting/controls/hotmov_control.h
View File

@ -28,7 +28,6 @@
#include "common/array.h"
#include "common/rect.h"
namespace ZVision {
class MetaAnimation;

1
engines/zvision/scripting/controls/input_control.cpp
View File

@ -35,7 +35,6 @@
#include "common/stream.h"
#include "common/rect.h"
namespace ZVision {
InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)

1
engines/zvision/scripting/controls/input_control.h
View File

@ -30,7 +30,6 @@
#include "common/rect.h"
namespace ZVision {
class InputControl : public Control {

1
engines/zvision/scripting/controls/lever_control.cpp
View File

@ -38,7 +38,6 @@
#include "graphics/surface.h"
namespace ZVision {
LeverControl::LeverControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)

1
engines/zvision/scripting/controls/lever_control.h
View File

@ -28,7 +28,6 @@
#include "common/list.h"
#include "common/rect.h"
namespace ZVision {
class ZorkAVIDecoder;

2
engines/zvision/scripting/controls/paint_control.cpp
View File

@ -110,8 +110,6 @@ PaintControl::PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStre
delete _paint;
_paint = tmp;
}
}
PaintControl::~PaintControl() {

1
engines/zvision/scripting/controls/paint_control.h
View File

@ -30,7 +30,6 @@
#include "common/rect.h"
#include "common/list.h"
namespace ZVision {
class PaintControl : public Control {

1
engines/zvision/scripting/controls/push_toggle_control.cpp
View File

@ -31,7 +31,6 @@
#include "common/stream.h"
namespace ZVision {
PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)

1
engines/zvision/scripting/controls/push_toggle_control.h
View File

@ -29,7 +29,6 @@
#include "common/events.h"
#include "common/array.h"
namespace ZVision {
class PushToggleControl : public Control {

1
engines/zvision/scripting/controls/safe_control.cpp
View File

@ -38,7 +38,6 @@
#include "graphics/surface.h"
namespace ZVision {
SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)

1
engines/zvision/scripting/controls/safe_control.h
View File

@ -28,7 +28,6 @@
#include "common/list.h"
#include "common/rect.h"
namespace ZVision {
class ZorkAVIDecoder;

1
engines/zvision/scripting/controls/save_control.cpp
View File

@ -35,7 +35,6 @@
#include "common/str.h"
#include "common/stream.h"
namespace ZVision {
SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)

1
engines/zvision/scripting/controls/save_control.h
View File

@ -27,7 +27,6 @@
#include "common/list.h"
namespace ZVision {
class SaveControl : public Control {

1
engines/zvision/scripting/controls/slot_control.cpp
View File

@ -32,7 +32,6 @@
#include "common/stream.h"
namespace ZVision {
SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)

1
engines/zvision/scripting/controls/slot_control.h
View File

@ -30,7 +30,6 @@
#include "common/rect.h"
#include "common/list.h"
namespace ZVision {
class SlotControl : public Control {

1
engines/zvision/scripting/controls/titler_control.cpp
View File

@ -32,7 +32,6 @@
#include "common/stream.h"
namespace ZVision {
TitlerControl::TitlerControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)

1
engines/zvision/scripting/controls/titler_control.h
View File

@ -30,7 +30,6 @@
#include "common/rect.h"
#include "common/array.h"
namespace ZVision {
class TitlerControl : public Control {

1
engines/zvision/scripting/inventory.cpp
View File

@ -24,7 +24,6 @@
#include "zvision/scripting/script_manager.h"
namespace ZVision {
int8 ScriptManager::inventoryGetCount() {

1
engines/zvision/scripting/puzzle.h
View File

@ -28,7 +28,6 @@
#include "common/list.h"
#include "common/ptr.h"
namespace ZVision {
struct Puzzle {

3
engines/zvision/scripting/scr_file_handling.cpp
View File

@ -43,7 +43,6 @@
#include "common/file.h"
#include "common/tokenizer.h"
namespace ZVision {
void ScriptManager::parseScrFile(const Common::String &fileName, ScriptScope &scope) {
@ -210,8 +209,6 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis
args = Common::String(chrs + startpos, chrs + pos);
}
// Parse for the action type
if (act.matchString("add", true)) {
actionList.push_back(new ActionAdd(_engine, slot, args));

1
engines/zvision/scripting/script_manager.cpp
View File

@ -37,7 +37,6 @@
#include "common/debug.h"
#include "common/stream.h"
namespace ZVision {
ScriptManager::ScriptManager(ZVision *engine)

2
engines/zvision/scripting/script_manager.h
View File

@ -31,7 +31,6 @@
#include "common/queue.h"
#include "common/events.h"
namespace Common {
class String;
class SeekableReadStream;
@ -340,7 +339,6 @@ private:
ScriptManager *_scriptManager;
};
} // End of namespace ZVision
#endif

1
engines/zvision/scripting/sidefx.cpp
View File

@ -32,5 +32,4 @@
namespace ZVision {
} // End of namespace ZVision

3
engines/zvision/scripting/sidefx/animation_node.cpp
View File

@ -31,7 +31,6 @@
#include "graphics/surface.h"
namespace ZVision {
AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse)
@ -154,8 +153,6 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) {
return false;
}
void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int startFrame, int endFrame, int loops) {
playnode nod;
nod.loop = loops;

1
engines/zvision/scripting/sidefx/animation_node.h
View File

@ -27,7 +27,6 @@
#include "common/rect.h"
#include "common/list.h"
namespace Common {
class String;
}

4
engines/zvision/scripting/sidefx/distort_node.cpp
View File

@ -31,7 +31,6 @@
#include "common/stream.h"
namespace ZVision {
DistortNode::DistortNode(ZVision *engine, uint32 key, int16 speed, float startAngle, float endAngle, float startLineScale, float endLineScale)
@ -83,8 +82,6 @@ bool DistortNode::process(uint32 deltaTimeInMillis) {
}
float diff = (1.0 / (5.0 - (_curFrame * _frmSpeed))) / (5.0 - _frmSpeed);
setParams(_startAngle + diff * _diffAngle, _startLineScale + diff * _diffLinScale);
return false;
@ -105,5 +102,4 @@ void DistortNode::setParams(float angl, float linScale) {
}
}
} // End of namespace ZVision

2
engines/zvision/scripting/sidefx/music_node.cpp
View File

@ -34,7 +34,6 @@
#include "common/file.h"
#include "audio/decoders/wave.h"
namespace ZVision {
MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool loop, int8 volume)
@ -188,7 +187,6 @@ PanTrackNode::~PanTrackNode() {
}
}
MusicMidiNode::MusicMidiNode(ZVision *engine, uint32 key, int8 program, int8 note, int8 volume)
: MusicNodeBASE(engine, key, SIDEFX_AUDIO) {
_volume = volume;

1
engines/zvision/scripting/sidefx/syncsound_node.cpp
View File

@ -33,7 +33,6 @@
#include "common/file.h"
#include "audio/decoders/wave.h"
namespace ZVision {
SyncSoundNode::SyncSoundNode(ZVision *engine, uint32 key, Common::String &filename, int32 syncto)

1
engines/zvision/scripting/sidefx/timer_node.cpp
View File

@ -29,7 +29,6 @@
#include "common/stream.h"
namespace ZVision {
TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds)

1
engines/zvision/scripting/sidefx/ttytext_node.cpp
View File

@ -32,7 +32,6 @@
#include "common/stream.h"
#include "common/file.h"
namespace ZVision {
ttyTextNode::ttyTextNode(ZVision *engine, uint32 key, const Common::String &file, const Common::Rect &r, int32 delay) :

1
engines/zvision/sound/zork_raw.cpp
View File

@ -38,7 +38,6 @@
#include "audio/audiostream.h"
#include "audio/decoders/raw.h"
namespace ZVision {
const int16 RawChunkStream::_stepAdjustmentTable[8] = { -1, -1, -1, 1, 4, 7, 10, 12};

2
engines/zvision/sound/zork_raw.h
View File

@ -25,7 +25,6 @@
#include "audio/audiostream.h"
namespace Common {
class SeekableReadStream;
}
@ -42,7 +41,6 @@ struct SoundParams {
bool bits16;
};
/**
* This is a ADPCM stream-reader, this class holds context for multi-chunk reading and no buffers.
*/

1
engines/zvision/text/string_manager.cpp
View File

@ -35,7 +35,6 @@
#include "graphics/fontman.h"
#include "graphics/colormasks.h"
namespace ZVision {
StringManager::StringManager(ZVision *engine)

1
engines/zvision/text/string_manager.h
View File

@ -26,7 +26,6 @@
#include "zvision/detection.h"
#include "zvision/fonts/truetype_font.h"
namespace Graphics {
class FontManager;
}

1
engines/zvision/text/text.cpp
View File

@ -40,7 +40,6 @@
#include "zvision/graphics/render_manager.h"
#include "zvision/scripting/script_manager.h"
namespace ZVision {
cTxtStyle::cTxtStyle() {

1
engines/zvision/text/text.h
View File

@ -28,7 +28,6 @@
#include "zvision/fonts/truetype_font.h"
#include "zvision/zvision.h"
namespace Graphics {
class FontManager;
}

1
engines/zvision/utility/clock.cpp
View File

@ -26,7 +26,6 @@
#include "common/system.h"
namespace ZVision {
Clock::Clock(OSystem *system)

1
engines/zvision/utility/lzss_read_stream.cpp
View File

@ -24,7 +24,6 @@
#include "zvision/utility/lzss_read_stream.h"
namespace ZVision {
LzssReadStream::LzssReadStream(Common::SeekableReadStream *source)

1
engines/zvision/utility/lzss_read_stream.h
View File

@ -26,7 +26,6 @@
#include "common/stream.h"
#include "common/array.h"
namespace Common {
class SeekableReadStream;
}

6
engines/zvision/utility/single_value_container.cpp
View File

@ -21,12 +21,10 @@
*/
#include "common/scummsys.h"
#include "zvision/utility/single_value_container.h"
#include "common/textconsole.h"
#include "common/str.h"
#include "zvision/utility/single_value_container.h"
namespace ZVision {
@ -114,7 +112,6 @@ void SingleValueContainer::deleteCharPointer() {
delete[] _value.stringVal;
}
SingleValueContainer &SingleValueContainer::operator=(const bool &rhs) {
if (_objectType == BOOL) {
_value.boolVal = rhs;
@ -270,7 +267,6 @@ SingleValueContainer &SingleValueContainer::operator=(const SingleValueContainer
return *this;
}
bool SingleValueContainer::getBoolValue(bool *returnValue) const {
if (_objectType != BOOL) {
warning("'Object' is not storing a bool.");

1
engines/zvision/utility/utility.cpp
View File

@ -30,7 +30,6 @@
#include "common/tokenizer.h"
#include "common/file.h"
namespace ZVision {
void writeFileContentsToFile(const Common::String &sourceFile, const Common::String &destFile) {

1
engines/zvision/utility/utility.h
View File

@ -25,7 +25,6 @@
#include "common/array.h"
namespace Common {
class String;
}

15
engines/zvision/video/video.cpp
View File

@ -21,22 +21,16 @@
*/
#include "common/scummsys.h"
#include "common/system.h"
#include "video/video_decoder.h"
#include "engines/util.h"
#include "graphics/surface.h"
#include "zvision/zvision.h"
#include "zvision/utility/clock.h"
#include "zvision/graphics/render_manager.h"
#include "zvision/subtitles/subtitles.h"
#include "common/system.h"
#include "video/video_decoder.h"
#include "engines/util.h"
#include "graphics/surface.h"
namespace ZVision {
void ZVision::playVideo(Video::VideoDecoder &vid, const Common::Rect &destRect, bool skippable, Subtitle *sub) {
@ -52,7 +46,6 @@ void ZVision::playVideo(Video::VideoDecoder &vid, const Common::Rect &destRect,
scaled->create(dst.width(), dst.height(), vid.getPixelFormat());
}
uint16 x = _workingWindow.left + dst.left;
uint16 y = _workingWindow.top + dst.top;
uint16 finalWidth = dst.width() < _workingWindow.width() ? dst.width() : _workingWindow.width();

1
engines/zvision/video/zork_avi_decoder.cpp
View File

@ -31,7 +31,6 @@
#include "audio/audiostream.h"
#include "audio/decoders/raw.h"
namespace ZVision {
Video::AVIDecoder::AVIAudioTrack *ZorkAVIDecoder::createAudioTrack(Video::AVIDecoder::AVIStreamHeader sHeader, Video::AVIDecoder::PCMWaveFormat wvInfo) {

1
engines/zvision/zvision.cpp
View File

@ -51,7 +51,6 @@
#include "audio/mixer.h"
namespace ZVision {
#define ZVISION_SETTINGS_KEYS_COUNT 17

1
engines/zvision/zvision.h
View File

@ -37,7 +37,6 @@
#include "gui/debugger.h"
namespace Video {
class VideoDecoder;
}