c26fd86450
Commitd0d7545ec1("Unload robot movies on exit") intended to shorten the lifetime of the loaded data, but failed to save the unique_ptr, so the lifetime was shortened more than intended. Save the unique_ptr so that the movies remain loaded. Also, add a [[nodiscard]] annotation so that the compiler can warn if this mistake is repeated. Reported-by: Q3BFG10K <https://github.com/dxx-rebirth/dxx-rebirth/issues/599> Fixes:d0d7545ec1("Unload robot movies on exit")
80 lines
2.5 KiB
C++
80 lines
2.5 KiB
C++
/*
|
|
* Portions of this file are copyright Rebirth contributors and licensed as
|
|
* described in COPYING.txt.
|
|
* Portions of this file are copyright Parallax Software and licensed
|
|
* according to the Parallax license below.
|
|
* See COPYING.txt for license details.
|
|
|
|
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
|
|
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
|
|
END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
|
|
ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
|
|
IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
|
|
SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
|
|
FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
|
|
CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS
|
|
AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
|
|
COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|
*/
|
|
|
|
/*
|
|
*
|
|
* Header for movie.c
|
|
*
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <limits.h>
|
|
#include "d2x-rebirth/libmve/mvelib.h"
|
|
#include "dsx-ns.h"
|
|
|
|
namespace dsx {
|
|
|
|
#define MOVIE_ABORT_ON 1
|
|
#define MOVIE_ABORT_OFF 0
|
|
|
|
enum class movie_play_status : uint8_t
|
|
{
|
|
skipped, // movie wasn't present
|
|
started, // movie was present and started; it may or may not have completed
|
|
};
|
|
|
|
#if DXX_USE_OGL
|
|
#define MOVIE_WIDTH (!GameArg.GfxSkipHiresMovie && grd_curscreen->get_screen_width() < 640 ? static_cast<uint16_t>(640) : grd_curscreen->get_screen_width())
|
|
#define MOVIE_HEIGHT (!GameArg.GfxSkipHiresMovie && grd_curscreen->get_screen_height() < 480 ? static_cast<uint16_t>(480) : grd_curscreen->get_screen_height())
|
|
#else
|
|
#define MOVIE_WIDTH static_cast<uint16_t>(!GameArg.GfxSkipHiresMovie? 640 : 320)
|
|
#define MOVIE_HEIGHT static_cast<uint16_t>(!GameArg.GfxSkipHiresMovie? 480 : 200)
|
|
#endif
|
|
|
|
movie_play_status PlayMovie(const char *subtitles, const char *filename, int allow_abort);
|
|
int InitRobotMovie(const char *filename, MVESTREAM_ptr_t &pMovie);
|
|
int RotateRobot(MVESTREAM_ptr_t &pMovie);
|
|
void DeInitRobotMovie(MVESTREAM_ptr_t &pMovie);
|
|
|
|
struct LoadedMovie
|
|
{
|
|
std::array<char, PATH_MAX> pathname;
|
|
LoadedMovie()
|
|
{
|
|
pathname[0] = 0;
|
|
}
|
|
~LoadedMovie();
|
|
};
|
|
|
|
struct BuiltinMovies
|
|
{
|
|
std::array<LoadedMovie, 3> movies;
|
|
};
|
|
|
|
// find and initialize the movie libraries
|
|
[[nodiscard]]
|
|
std::unique_ptr<BuiltinMovies> init_movies();
|
|
[[nodiscard]]
|
|
std::unique_ptr<LoadedMovie> init_extra_robot_movie(const char *filename);
|
|
|
|
extern int MovieHires; // specifies whether movies use low or high res
|
|
|
|
}
|