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

FREESCAPE: Entrance is now a header-only class

Browse Source
This commit is contained in:
neuromancer 2022-11-07 20:24:10 +01:00
parent 973276af57
commit bb7e29b538
3 changed files with 11 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/freescape/module.mk
View File

@ -16,7 +16,6 @@ MODULE_OBJS := \
metaengine.o \
movement.o \
neo.o \
objects/entrance.o \
objects/geometricobject.o \
sound.o

44
engines/freescape/objects/entrance.cpp
View File

@ -1,44 +0,0 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
// Based on Phantasma code by Thomas Harte (2013),
// available at https://github.com/TomHarte/Phantasma/ (MIT)
#include "freescape/objects/entrance.h"
namespace Freescape {
Entrance::Entrance(
uint16 objectID_,
const Math::Vector3d &origin_,
const Math::Vector3d &rotation_) {
_objectID = objectID_;
_origin = origin_;
_rotation = rotation_;
_flags = 0;
}
Entrance::~Entrance() {}
bool Entrance::isDrawable() { return false; }
bool Entrance::isPlanar() { return true; }
} // End of namespace Freescape

17
engines/freescape/objects/entrance.h
View File

@ -32,13 +32,18 @@ namespace Freescape {
class Entrance : public Object {
public:
Entrance(
uint16 objectID,
const Math::Vector3d &origin,
const Math::Vector3d &rotation);
virtual ~Entrance();
uint16 objectID_,
const Math::Vector3d &origin_,
const Math::Vector3d &rotation_) {
_objectID = objectID_;
_origin = origin_;
_rotation = rotation_;
_flags = 0;
}
virtual ~Entrance() {}
bool isDrawable() override;
bool isPlanar() override;
bool isDrawable() { return false; }
bool isPlanar() { return true; }
ObjectType getType() override { return ObjectType::kEntranceType; };
Math::Vector3d getRotation() { return _rotation; }