TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Split inferno.h to fwd-inferno.h

Browse source
This commit is contained in:
Kp 2022-02-12 18:57:12 +00:00
parent 504cbcc012
commit 8d9989024e
3 changed files with 43 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
common/main/fwd-inferno.h Normal file
View file

@ -0,0 +1,41 @@
/*
* 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.
*/
#pragma once
#include <cstdint>
#include <type_traits>
#include "fwd-event.h"
namespace dcx {
// the maximum length of a filename
constexpr std::integral_constant<std::size_t, 13> FILENAME_LEN{};
struct d_fname;
struct d_interface_unique_state;
struct d_game_view_unique_state;
// Default event handler for everything except the editor
window_event_result standard_handler(const d_event &event);
extern d_interface_unique_state InterfaceUniqueState;
extern d_game_view_unique_state GameViewUniqueState;
}

1
common/main/gameseq.h
View file

@ -26,6 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#pragma once
#include <cstddef>
#include "fwd-inferno.h"
#include "fwd-player.h"
#include "fwd-object.h"
#include "fwd-vclip.h"

12
common/main/inferno.h
View file

@ -26,7 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#pragma once
#include "dxxsconf.h"
#include "fwd-event.h"
#include "fwd-inferno.h"
#include "dsx-ns.h"
#include "ntstring.h"
#include "player-callsign.h"
@ -47,12 +47,6 @@ namespace dcx {
// How close two points must be in all dimensions to be considered the same point.
#define FIX_EPSILON 10
// the maximum length of a filename
constexpr std::integral_constant<std::size_t, 13> FILENAME_LEN{};
// Default event handler for everything except the editor
window_event_result standard_handler(const d_event &event);
// a filename, useful for declaring arrays of filenames
struct d_fname : ntstring<FILENAME_LEN - 1>
{
@ -77,15 +71,11 @@ struct d_interface_unique_state
void update_window_title();
};
extern d_interface_unique_state InterfaceUniqueState;
struct d_game_view_unique_state
{
uint8_t Death_sequence_aborted;
};
extern d_game_view_unique_state GameViewUniqueState;
}
#ifdef dsx