libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 09:23:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TRECISION: Clean up includes

Browse Source
This commit is contained in:
Filippos Karapetis 2021-05-08 14:21:09 +03:00 committed by SupSuper
parent c674fd036e
commit 26392eb7cf
28 changed files with 104 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/trecision/3d.cpp
View File

@ -20,11 +20,10 @@
*
*/
#include "trecision/trecision.h"
#include "trecision/3d.h"
#include "trecision/actor.h"
#include "trecision/graphics.h"
#include "trecision/trecision.h"
namespace Trecision {
#define SHADOWVERTSNUM 42

1
engines/trecision/3d.h
View File

@ -25,6 +25,7 @@
#include "trecision/defines.h"
#include "trecision/trecision.h"
#include "trecision/nl/3d/3dinc.h"
namespace Trecision {
struct SVVertex {

5
engines/trecision/actor.cpp
View File

@ -20,12 +20,11 @@
*
*/
#include "trecision/trecision.h"
#include "trecision/actor.h"
#include "trecision/3d.h"
#include "trecision/actor.h"
#include "trecision/defines.h"
#include "trecision/graphics.h"
#include "trecision/trecision.h"
#include "trecision/nl/message.h"
#include "trecision/nl/proto.h"

10
engines/trecision/console.cpp
View File

@ -22,14 +22,12 @@
#include "common/file.h"
#include "gui/debugger.h"
#include "trecision/console.h"
#include "dialog.h"
#include "nl/message.h"
#include "nl/proto.h"
#include "trecision/dialog.h"
#include "trecision/trecision.h"
#include "trecision/nl/message.h"
#include "trecision/nl/proto.h"
namespace Trecision {

13
engines/trecision/dialog.cpp
View File

@ -20,18 +20,15 @@
*
*/
#include "trecision/trecision.h"
#include "trecision/dialog.h"
#include "text.h"
#include "trecision/3d.h"
#include "trecision/actor.h"
#include "trecision/defines.h"
#include "trecision/dialog.h"
#include "trecision/graphics.h"
#include "trecision/text.h"
#include "trecision/trecision.h"
#include "trecision/nl/message.h"
#include "trecision/nl/proto.h"
#include "trecision/graphics.h"
#include "trecision/defines.h"
namespace Trecision {
DialogManager::DialogManager(TrecisionEngine *vm) : _vm(vm) {

8
engines/trecision/fastfile.cpp
View File

@ -21,15 +21,13 @@
*/
#include "common/scummsys.h"
#include "common/str.h"
#include "common/substream.h"
#include "common/memstream.h"
#include "trecision/trecision.h"
#include "trecision/fastfile.h"
#include "trecision/video.h"
#include "common/str.h"
#include "common/file.h"
#include "common/substream.h"
#include <common/memstream.h>
namespace Trecision {
/* -----------------19/01/98 17.12-------------------

2
engines/trecision/fastfile.h
View File

@ -24,8 +24,8 @@
#define TRECISION_FASTFILE_H
#include "common/archive.h"
#include "common/stream.h"
#include "common/array.h"
#include "common/stream.h"
namespace Trecision {

8
engines/trecision/graphics.cpp
View File

@ -20,16 +20,16 @@
*
*/
#include "trecision/graphics.h"
#include "trecision/trecision.h"
#include "trecision/defines.h"
#include "common/system.h"
#include "engines/util.h"
#include "graphics/cursorman.h"
#include "graphics/pixelformat.h"
#include "graphics/surface.h"
#include "trecision/defines.h"
#include "trecision/graphics.h"
#include "trecision/trecision.h"
namespace Trecision {
const Graphics::PixelFormat GraphicsManager::kImageFormat(2, 5, 5, 5, 0, 10, 5, 0, 0); // RGB555

3
engines/trecision/inventory.cpp
View File

@ -20,15 +20,14 @@
*
*/
#include "text.h"
#include "trecision/3d.h"
#include "trecision/actor.h"
#include "trecision/defines.h"
#include "trecision/graphics.h"
#include "trecision/logic.h"
#include "trecision/text.h"
#include "trecision/trecision.h"
#include "trecision/video.h"
#include "trecision/nl/message.h"
#include "trecision/nl/proto.h"

9
engines/trecision/logic.cpp
View File

@ -26,15 +26,14 @@
#include "trecision/nl/message.h"
#include "trecision/nl/proto.h"
#include "trecision/nl/struct.h"
#include "trecision/defines.h"
#include "trecision/logic.h"
#include "trecision/text.h"
#include "trecision/3d.h"
#include "trecision/actor.h"
#include "trecision/defines.h"
#include "trecision/dialog.h"
#include "trecision/sound.h"
#include "trecision/graphics.h"
#include "trecision/logic.h"
#include "trecision/sound.h"
#include "trecision/text.h"
#include "trecision/trecision.h"
#include "trecision/video.h"

1
engines/trecision/logic.h
View File

@ -24,7 +24,6 @@
#define TRECISION_LOGIC_H
#include "common/scummsys.h"
#include "common/serializer.h"
namespace Trecision {
class TrecisionEngine;

1
engines/trecision/nl/3d/3dvar.cpp
View File

@ -21,6 +21,7 @@
*/
#include "common/scummsys.h"
#include "trecision/nl/3d/3dinc.h"
/*------------------------------------------------

8
engines/trecision/nl/3d/3dwalk.cpp
View File

@ -20,16 +20,16 @@
*
*/
#include "common/util.h"
#include "common/scummsys.h"
#include "common/str.h"
#include "trecision/3d.h"
#include "common/util.h"
#include "trecision/3d.h"
#include "trecision/actor.h"
#include "trecision/defines.h"
#include "trecision/nl/3d/3dinc.h"
#include "trecision/graphics.h"
#include "trecision/trecision.h"
#include "trecision/actor.h"
#include "trecision/nl/3d/3dinc.h"
namespace Trecision {

13
engines/trecision/nl/do.cpp
View File

@ -21,18 +21,17 @@
*/
#include "common/scummsys.h"
#include "trecision/3d.h"
#include "trecision/nl/3d/3dinc.h"
#include "trecision/nl/ll/llinc.h"
#include "trecision/defines.h"
#include "trecision/dialog.h"
#include "trecision/text.h"
#include "trecision/trecision.h"
#include "trecision/video.h"
#include "trecision/nl/3d/3dinc.h"
#include "trecision/nl/message.h"
#include "trecision/nl/proto.h"
#include "trecision/nl/struct.h"
#include "trecision/trecision.h"
#include "trecision/dialog.h"
#include "trecision/video.h"
#include "trecision/sound.h"
#include "trecision/text.h"
namespace Trecision {

1
engines/trecision/nl/ll/llinc.h
View File

@ -24,6 +24,7 @@
#define TRECISION_LLINC_H
#include "common/rect.h"
#include "trecision/defines.h"
#define DRAWMASK 1

4
engines/trecision/nl/ll/llmouse.cpp
View File

@ -20,14 +20,12 @@
*
*/
#include <cstring>
#include "common/scummsys.h"
#include "trecision/nl/ll/llinc.h"
#include "trecision/defines.h"
#include "trecision/graphics.h"
#include "trecision/trecision.h"
#include "trecision/nl/ll/llinc.h"
namespace Trecision {

18
engines/trecision/nl/ll/llscreen.cpp
View File

@ -20,21 +20,21 @@
*
*/
#include <common/file.h>
#include "common/system.h"
#include "common/file.h"
#include "common/scummsys.h"
#include "common/str.h"
#include "trecision/dialog.h"
#include "trecision/trecision.h"
#include "trecision/nl/3d/3dinc.h"
#include "common/system.h"
#include "trecision/defines.h"
#include "trecision/nl/proto.h"
#include "trecision/nl/struct.h"
#include "trecision/nl/ll/llinc.h"
#include "trecision/dialog.h"
#include "trecision/graphics.h"
#include "trecision/sound.h"
#include "trecision/trecision.h"
#include "trecision/video.h"
#include "trecision/nl/proto.h"
#include "trecision/nl/struct.h"
#include "trecision/nl/3d/3dinc.h"
#include "trecision/nl/ll/llinc.h"
namespace Trecision {

14
engines/trecision/nl/regen.cpp
View File

@ -22,18 +22,18 @@
#include "common/util.h"
#include "common/scummsys.h"
#include "trecision/3d.h"
#include "trecision/nl/3d/3dinc.h"
#include "trecision/3d.h"
#include "trecision/actor.h"
#include "trecision/defines.h"
#include "trecision/graphics.h"
#include "trecision/sound.h"
#include "trecision/trecision.h"
#include "trecision/video.h"
#include "trecision/nl/3d/3dinc.h"
#include "trecision/nl/proto.h"
#include "trecision/nl/struct.h"
#include "trecision/nl/ll/llinc.h"
#include "trecision/trecision.h"
#include "trecision/graphics.h"
#include "trecision/sound.h"
#include "trecision/video.h"
#include "trecision/actor.h"
namespace Trecision {

5
engines/trecision/nl/schedule.cpp
View File

@ -20,16 +20,15 @@
*
*/
#include "common/scummsys.h"
#include "trecision/dialog.h"
#include "trecision/text.h"
#include "trecision/trecision.h"
#include "trecision/nl/message.h"
#include "trecision/nl/proto.h"
#include "trecision/nl/struct.h"
#include "common/scummsys.h"
namespace Trecision {
int maxmesg, maxmesh, maxmesa;

8
engines/trecision/script.cpp
View File

@ -20,6 +20,9 @@
*
*/
#include "common/scummsys.h"
#include "graphics/scaler.h"
#include "trecision/3d.h"
#include "trecision/actor.h"
#include "trecision/dialog.h"
@ -29,14 +32,9 @@
#include "trecision/trecision.h"
#include "trecision/sound.h"
#include "trecision/text.h"
#include "common/scummsys.h"
#include "graphics/scaler.h"
#include "trecision/nl/proto.h"
#include "trecision/nl/message.h"
namespace Trecision {
void SScriptFrame::sendFrame() {

14
engines/trecision/sound.cpp
View File

@ -20,18 +20,18 @@
*
*/
#include "audio/audiostream.h"
#include "audio/mixer.h"
#include "audio/decoders/wave.h"
#include "common/memstream.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "trecision/3d.h" // for _defActionLen
#include "trecision/sound.h"
#include "trecision/trecision.h"
#include "trecision/defines.h"
#include "audio/decoders/wave.h"
#include "common/memstream.h"
#include "common/system.h"
#include "audio/mixer.h"
#include "audio/audiostream.h"
namespace Trecision {
SoundManager::SoundManager(TrecisionEngine *vm) : _vm(vm) {
@ -215,7 +215,7 @@ void SoundManager::waitEndFading() {
}
void SoundManager::SoundPasso(int midx, int midz, int act, int frame, uint16 *list) {
extern unsigned char _defActionLen[];
extern uint8 _defActionLen[];
bool stepRight = false;
bool stepLeft = false;

1
engines/trecision/sound.h
View File

@ -23,7 +23,6 @@
#ifndef TRECISION_SOUND_H
#define TRECISION_SOUND_H
#include "common/file.h"
#include "trecision/trecision.h"
namespace Trecision {

5
engines/trecision/text.cpp
View File

@ -20,16 +20,15 @@
*
*/
#include "common/config-manager.h"
#include "trecision/nl/message.h"
#include "trecision/nl/proto.h"
#include "trecision/trecision.h"
#include "trecision/sound.h"
#include "trecision/actor.h"
#include "trecision/text.h"
#include <common/config-manager.h>
namespace Trecision {
TextManager::TextManager(TrecisionEngine *vm) : _vm(vm) {

30
engines/trecision/trecision.cpp
View File

@ -20,10 +20,23 @@
*
*/
#include "common/scummsys.h"
#include "common/error.h"
#include "common/system.h"
#include "common/events.h"
#include "common/archive.h"
#include "common/config-manager.h"
#include "common/file.h"
#include "common/fs.h"
#include "common/savefile.h"
#include "common/str.h"
#include "common/translation.h"
#include "engines/util.h"
#include "gui/saveload.h"
#include "trecision/trecision.h"
#include "trecision/actor.h"
#include "trecision/3d.h"
#include "trecision/nl/3d/3dinc.h"
#include "trecision/defines.h"
#include "trecision/nl/message.h"
@ -36,21 +49,6 @@
#include "trecision/text.h"
#include "trecision/sound.h"
#include "engines/util.h"
#include "common/scummsys.h"
#include "common/error.h"
#include "common/system.h"
#include "common/events.h"
#include "common/archive.h"
#include "common/config-manager.h"
#include "common/file.h"
#include "common/fs.h"
#include "common/savefile.h"
#include "common/str.h"
#include "common/translation.h"
#include "gui/saveload.h"
namespace Common {
class File;
}

17
engines/trecision/trecision.h
View File

@ -23,20 +23,17 @@
#ifndef TRECISION_TRECISION_H
#define TRECISION_TRECISION_H
#include "engines/engine.h"
#include "trecision/nl/3d/3dinc.h"
#include "trecision/nl/ll/llinc.h"
#include "trecision/nl/struct.h"
#include "trecision/fastfile.h"
#include "trecision/video.h"
#include "trecision/defines.h"
#include "common/str-array.h"
#include "common/keyboard.h"
#include "graphics/surface.h"
#include "common/str.h"
#include "engines/engine.h"
#include "graphics/surface.h"
#include "trecision/defines.h"
#include "trecision/fastfile.h"
#include "trecision/video.h"
#include "trecision/nl/ll/llinc.h"
#include "trecision/nl/struct.h"
namespace Trecision {
class AnimManager;

9
engines/trecision/utils.cpp
View File

@ -20,16 +20,15 @@
*
*/
#include <common/system.h>
#include "common/system.h"
#include "trecision/text.h"
#include "trecision/graphics.h"
#include "trecision/actor.h"
#include "trecision/defines.h"
#include "trecision/graphics.h"
#include "trecision/logic.h"
#include "trecision/trecision.h"
#include "trecision/actor.h"
#include "trecision/nl/3d/3dinc.h"
#include "trecision/nl/message.h"
#include "trecision/nl/proto.h"
#include "trecision/nl/struct.h"

17
engines/trecision/video.cpp
View File

@ -21,23 +21,20 @@
*/
#include "common/config-manager.h"
#include "common/events.h"
#include "common/file.h"
#include "common/scummsys.h"
#include "common/system.h"
#include "common/file.h"
#include "common/events.h"
#include "trecision/actor.h"
#include "trecision/defines.h"
#include "trecision/nl/message.h"
#include "trecision/nl/proto.h"
#include "trecision/dialog.h"
#include "trecision/graphics.h"
#include "trecision/sound.h"
#include "trecision/trecision.h"
#include "trecision/video.h"
#include "actor.h"
#include "dialog.h"
#include "sound.h"
#include "trecision/nl/message.h"
#include "trecision/nl/proto.h"
namespace Trecision {

6
engines/trecision/video.h
View File

@ -23,11 +23,11 @@
#ifndef TRECISION_VIDEO_H
#define TRECISION_VIDEO_H
#include "trecision/nl/struct.h"
#include "common/file.h"
#include "video/smk_decoder.h"
#include "common/serializer.h"
#include "video/smk_decoder.h"
#include "trecision/nl/struct.h"
namespace Trecision {