- did a bit of header cleanup to reduce the dependency on dobject.h.

This commit is contained in:
Christoph Oelckers 2017-03-09 23:30:42 +01:00
commit a4710bcdb0
48 changed files with 226 additions and 274 deletions

View file

@ -35,16 +35,12 @@
#define __G_LEVEL_H__
#include "doomtype.h"
#include "doomdef.h"
#include "sc_man.h"
#include "s_sound.h"
#include "p_acs.h"
#include "textures/textures.h"
#include "resourcefiles/file_zip.h"
struct level_info_t;
struct cluster_info_t;
class FScanner;
class FSerializer;
#if defined(_MSC_VER)
#pragma section(".yreg$u",read)
@ -55,6 +51,24 @@ class FScanner;
#define GCC_YSEG __attribute__((section(SECTION_YREG))) __attribute__((used))
#endif
// The structure used to control scripts between maps
struct acsdefered_t
{
enum EType
{
defexecute,
defexealways,
defsuspend,
defterminate
} type;
int script;
int args[3];
int playernum;
};
FSerializer &Serialize(FSerializer &arc, const char *key, acsdefered_t &defer, acsdefered_t *def);
struct FIntermissionDescriptor;
struct FIntermissionAction;
@ -339,7 +353,7 @@ struct level_info_t
TArray<FSpecialAction> specialactions;
TArray<FSoundID> PrecacheSounds;
TArray<int> PrecacheSounds;
TArray<FString> PrecacheTextures;
TArray<FName> PrecacheClasses;