Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-11 13:06:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove 'typedef' from enums and structs. This was required in C, but in C++ all it does is generate thousands of warnings.

Browse source
This commit is contained in:
hispidence 2021-07-18 15:22:15 +01:00
parent 82e73efc27
commit 21a867e821
34 changed files with 119 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TR5Main/Game/Box.h
View file

@ -3,7 +3,7 @@
#include "items.h"
#include "level.h"
typedef enum MOOD_TYPE
enum MOOD_TYPE
{
BORED_MOOD,
ATTACK_MOOD,
@ -11,14 +11,14 @@ typedef enum MOOD_TYPE
STALK_MOOD
};
typedef enum TARGET_TYPE
enum TARGET_TYPE
{
NO_TARGET,
PRIME_TARGET,
SECONDARY_TARGET
};
typedef enum ZoneType
enum ZoneType
{
ZONE_NULL = -1, // default zone
ZONE_SKELLY = 0,
@ -38,7 +38,7 @@ typedef enum ZoneType
ZONE_HUMAN_LONGJUMP_AND_MONKEY,
};
typedef struct OBJECT_Bones
struct OBJECT_Bones
{
short bone0;
short bone1;

4
TR5Main/Game/Lara/lara_fire.h
View file

@ -1,14 +1,14 @@
#pragma once
#include "lara.h"
typedef enum FireWeaponType
enum FireWeaponType
{
FW_MISS = -1,
FW_NOAMMO = 0,
FW_MAYBEHIT = 1
};
typedef struct WEAPON_INFO
struct WEAPON_INFO
{
short lockAngles[4];
short leftAngles[4];

25
TR5Main/Game/Lara/lara_struct.h
View file

@ -729,7 +729,7 @@ enum LARA_ANIM
};
#pragma endregion
typedef enum LARA_WATER_STATUS
enum LARA_WATER_STATUS
{
LW_ABOVE_WATER,
LW_UNDERWATER,
@ -738,7 +738,7 @@ typedef enum LARA_WATER_STATUS
LW_WADE
};
typedef enum LARA_GUN_STATUS
enum LARA_GUN_STATUS
{
LG_NO_ARMS,
LG_HANDS_BUSY,
@ -748,7 +748,7 @@ typedef enum LARA_GUN_STATUS
LG_SPECIAL
};
typedef enum WeaponAmmoType
enum WeaponAmmoType
{
WEAPON_AMMO1,
WEAPON_AMMO2,
@ -756,7 +756,7 @@ typedef enum WeaponAmmoType
MAX_AMMOTYPE
};
typedef enum LARA_MESHES
enum LARA_MESHES
{
LM_HIPS,
LM_LTHIGH,
@ -794,7 +794,7 @@ enum LARA_WEAPON_TYPE
NUM_WEAPONS
};
typedef enum LARA_WEAPON_TYPE_CARRIED
enum LARA_WEAPON_TYPE_CARRIED
{
WTYPE_MISSING = 0x0,
WTYPE_PRESENT = 0x1,
@ -807,12 +807,13 @@ typedef enum LARA_WEAPON_TYPE_CARRIED
};
typedef enum LARA_CLOTH_TYPES
enum LARA_CLOTH_TYPES
{
CLOTH_MISSING,
CLOTH_DRY,
CLOTH_WET
};
enum class HOLSTER_SLOT : int {
Empty = ID_LARA_HOLSTERS,
Pistols = ID_LARA_HOLSTERS_PISTOLS,
@ -918,7 +919,7 @@ public:
isInfinite = infinite;
}
};
typedef struct CarriedWeaponInfo
struct CarriedWeaponInfo
{
bool Present;
Ammo Ammo[MAX_AMMOTYPE];
@ -930,18 +931,18 @@ typedef struct CarriedWeaponInfo
#define MaxDiaryPages 64
#define MaxStringsPerPage 8
typedef struct DiaryString
struct DiaryString
{
int x, y;
short stringID;
};
typedef struct DiaryPage
struct DiaryPage
{
DiaryString Strings[MaxStringsPerPage];
};
typedef struct DiaryInfo
struct DiaryInfo
{
bool Present;
short numPages;
@ -949,7 +950,7 @@ typedef struct DiaryInfo
DiaryPage Pages[MaxDiaryPages];
};
typedef struct LARA_ARM
struct LARA_ARM
{
int frameBase;
short frameNumber;
@ -980,7 +981,7 @@ struct AnimsNew
bool FeetHanging; //Daniel's super awesome feet hanging
};
typedef struct LaraInfo
struct LaraInfo
{
short itemNumber;
LARA_GUN_STATUS gunStatus; // LG_enum

2
TR5Main/Game/Lara/lara_swim.cpp
View file

@ -15,7 +15,7 @@
#include "sound.h"
#include "GameFlowScript.h"
typedef struct SUBSUIT_INFO
struct SUBSUIT_INFO
{
short XRot;
short dXRot;

4
TR5Main/Game/camera.h
View file

@ -3,7 +3,7 @@
#include "items.h"
#include <Specific\setup.h>
typedef enum CAMERA_TYPE
enum CAMERA_TYPE
{
CHASE_CAMERA,
FIXED_CAMERA,
@ -13,7 +13,7 @@ typedef enum CAMERA_TYPE
HEAVY_CAMERA
};
typedef struct CAMERA_INFO
struct CAMERA_INFO
{
GAME_VECTOR pos; // size=16, offset=0
GAME_VECTOR target; // size=16, offset=16

14
TR5Main/Game/debris.h
View file

@ -6,7 +6,7 @@
#include "RendererVertex.h"
#define MAX_DEBRIS 256
typedef struct ILIGHT
struct ILIGHT
{
short x;
short y;
@ -18,12 +18,12 @@ typedef struct ILIGHT
unsigned char pad;
};
typedef struct ITEM_LIGHT
struct ITEM_LIGHT
{
ILIGHT light[4];
};
typedef struct SHATTER_ITEM
struct SHATTER_ITEM
{
SPHERE sphere;
ITEM_LIGHT* il;
@ -33,19 +33,19 @@ typedef struct SHATTER_ITEM
short flags;
};
typedef struct ShatterImpactInfo
struct ShatterImpactInfo
{
Vector3 impactDirection;
Vector3 impactLocation;
};
typedef struct DebrisMesh
struct DebrisMesh
{
BLEND_MODES blendMode;
std::array<T5M::Renderer::RendererVertex, 3> vertices;
};
typedef struct DebrisFragment
struct DebrisFragment
{
DebrisMesh mesh;
Quaternion rotation;
@ -63,7 +63,7 @@ typedef struct DebrisFragment
bool active;
};
typedef struct DEBRIS_STRUCT
struct DEBRIS_STRUCT
{
void* textInfo;
int x;

4
TR5Main/Game/door.h
View file

@ -3,14 +3,14 @@
#include "collide.h"
#include "room.h"
typedef struct DOORPOS_DATA
struct DOORPOS_DATA
{
FLOOR_INFO* floor;
FLOOR_INFO data;
short block;
};
typedef struct DOOR_DATA
struct DOOR_DATA
{
DOORPOS_DATA d1;
DOORPOS_DATA d1flip;

12
TR5Main/Game/effect2.h
View file

@ -56,7 +56,7 @@ struct NODEOFFSET_INFO
unsigned char gotIt;
};
typedef struct SPLASH_SETUP
struct SPLASH_SETUP
{
float x;
float y;
@ -66,7 +66,7 @@ typedef struct SPLASH_SETUP
int room;
};
typedef struct RIPPLE_STRUCT
struct RIPPLE_STRUCT
{
Vector4 currentColor;
Vector4 initialColor;
@ -82,7 +82,7 @@ typedef struct RIPPLE_STRUCT
bool isBillboard; //used for Blood
};
typedef struct SPARKS
struct SPARKS
{
int x;
int y;
@ -123,7 +123,7 @@ typedef struct SPARKS
unsigned char nodeNumber;
};
typedef struct SPLASH_STRUCT
struct SPLASH_STRUCT
{
float x;
float y;
@ -144,7 +144,7 @@ typedef struct SPLASH_STRUCT
bool isActive;
};
typedef struct DYNAMIC
struct DYNAMIC
{
int x;
int y;
@ -159,7 +159,7 @@ typedef struct DYNAMIC
int FalloffScale;
};
typedef struct SP_DYNAMIC
struct SP_DYNAMIC
{
byte On;
byte Falloff;

2
TR5Main/Game/gameflow.h
View file

@ -1,7 +1,7 @@
#pragma once
#include "savegame.h"
typedef struct SavegameInfo
struct SavegameInfo
{
bool present;
char levelName[75];

2
TR5Main/Game/health.h
View file

@ -3,7 +3,7 @@
enum GAME_OBJECT_ID : short;
typedef struct DISPLAY_PICKUP
struct DISPLAY_PICKUP
{
short life;
short objectNumber;

8
TR5Main/Game/items.h
View file

@ -3,7 +3,7 @@
enum GAME_OBJECT_ID : short;
typedef enum AIObjectType
enum AIObjectType
{
NO_AI = 0x0000,
GUARD = 0x0001,
@ -15,7 +15,7 @@ typedef enum AIObjectType
ALL_AIOBJ = (GUARD | AMBUSH | PATROL1 | MODIFY | FOLLOW | PATROL2)
};
typedef enum ItemStatus
enum ItemStatus
{
ITEM_NOT_ACTIVE = 0,
ITEM_ACTIVE = 1,
@ -23,7 +23,7 @@ typedef enum ItemStatus
ITEM_INVISIBLE = 3
};
typedef enum ItemFlags
enum ItemFlags
{
IFLAG_CLEAR_BODY = (1 << 7), // 0x0080
IFLAG_INVISIBLE = (1 << 8), // 0x0100
@ -38,7 +38,7 @@ struct ROOM_VECTOR
int yNumber;
};
typedef struct ITEM_INFO
struct ITEM_INFO
{
int floor;
DWORD touchBits;

2
TR5Main/Game/newinv2.h
View file

@ -435,7 +435,7 @@ enum inv_modes
IM_DIARY
};
typedef struct titleSettings
struct titleSettings
{
bool waitingForkey;//waiting for a key to be pressed when configuring controls
int videoMode;

24
TR5Main/Game/phd_global.h
View file

@ -1,6 +1,6 @@
#pragma once
typedef struct PHD_VECTOR
struct PHD_VECTOR
{
int x;
int y;
@ -21,7 +21,7 @@ typedef struct PHD_VECTOR
}
};
typedef struct PHD_3DPOS
struct PHD_3DPOS
{
int xPos;
int yPos;
@ -71,7 +71,7 @@ typedef struct PHD_3DPOS
}
};
typedef struct GAME_VECTOR
struct GAME_VECTOR
{
int x;
int y;
@ -116,7 +116,7 @@ typedef struct GAME_VECTOR
}
};
typedef struct LEVEL_CAMERA_INFO
struct LEVEL_CAMERA_INFO
{
int x;
int y;
@ -172,7 +172,7 @@ typedef struct LEVEL_CAMERA_INFO
}
};
typedef struct SINK_INFO
struct SINK_INFO
{
int x;
int y;
@ -218,7 +218,7 @@ typedef struct SINK_INFO
}
};
typedef struct SOUND_SOURCE_INFO
struct SOUND_SOURCE_INFO
{
int x;
int y;
@ -264,7 +264,7 @@ typedef struct SOUND_SOURCE_INFO
}
};
typedef struct VECTOR
struct VECTOR
{
int vx;
int vy;
@ -272,7 +272,7 @@ typedef struct VECTOR
int pad;
};
typedef struct SVECTOR
struct SVECTOR
{
short vx;
short vy;
@ -280,7 +280,7 @@ typedef struct SVECTOR
short pad;
};
typedef struct CVECTOR
struct CVECTOR
{
byte r;
byte g;
@ -288,21 +288,21 @@ typedef struct CVECTOR
byte cd;
};
typedef struct TR_VERTEX
struct TR_VERTEX
{
int x;
int y;
int z;
};
typedef enum MATRIX_ARRAY_VALUE
enum MATRIX_ARRAY_VALUE
{
M00, M01, M02, M03,
M10, M11, M12, M13,
M20, M21, M22, M23
};
typedef struct MATRIX3D
struct MATRIX3D
{
short m00;
short m01;

6
TR5Main/Game/room.h
View file

@ -22,7 +22,7 @@ struct ROOM_DOOR
Vector3 vertices[4];
};
typedef struct ROOM_LIGHT
struct ROOM_LIGHT
{
int x, y, z; // Position of light, in world coordinates
float r, g, b; // Colour of the light
@ -36,7 +36,7 @@ typedef struct ROOM_LIGHT
bool castShadows;
};
typedef struct MESH_INFO
struct MESH_INFO
{
int x;
int y;
@ -49,7 +49,7 @@ typedef struct MESH_INFO
std::string luaName;
};
typedef struct LIGHTINFO
struct LIGHTINFO
{
int x; // size=0, offset=0
int y; // size=0, offset=4

6
TR5Main/Game/savegame.h
View file

@ -9,7 +9,7 @@
#define SAVEGAME_BUFFER_SIZE 1048576
typedef struct STATS
struct STATS
{
unsigned int Timer;
unsigned int Distance;
@ -20,7 +20,7 @@ typedef struct STATS
unsigned char HealthUsed;
};
typedef struct SAVEGAME_INFO
struct SAVEGAME_INFO
{
short Checksum;
unsigned short VolumeCD;
@ -45,7 +45,7 @@ typedef struct SAVEGAME_INFO
unsigned char TLCount;
};
typedef struct SaveGameHeader
struct SaveGameHeader
{
std::string LevelName;
int Days;

22
TR5Main/Game/sound.h
View file

@ -10,7 +10,7 @@ enum SFX_TYPES
SFX_WATERONLY = (2 << 14)
};
typedef enum audio_tracks
enum audio_tracks
{
CDA_XA1_TL_10B, // TO CLIMB OUT, SWIM TO THE EDGE AND PRESS 'ACTION'.
CDA_XA1_Z10,
@ -151,7 +151,7 @@ typedef enum audio_tracks
CDA_XA18_TITLE_MENU
};
typedef enum sound_effects
enum sound_effects
{
SFX_TR4_LARA_FEET = 0,
SFX_TR4_LARA_CLIMB2 = 1,
@ -2065,7 +2065,7 @@ typedef enum sound_effects
#define TRACK_FOUND_SECRET "073_Secret"
#define TRACKS_PREFIX "Audio\\%s.%s"
typedef struct SoundEffectSlot
struct SoundEffectSlot
{
short state;
short effectID;
@ -2074,13 +2074,13 @@ typedef struct SoundEffectSlot
Vector3 origin;
};
typedef struct SoundTrackSlot
struct SoundTrackSlot
{
HSTREAM channel;
std::string track;
};
typedef enum sound_track_types
enum sound_track_types
{
SOUND_TRACK_ONESHOT,
SOUND_TRACK_BGM,
@ -2088,7 +2088,7 @@ typedef enum sound_track_types
NUM_SOUND_TRACK_TYPES
};
typedef enum sound_filters
enum sound_filters
{
SOUND_FILTER_REVERB,
SOUND_FILTER_COMPRESSOR,
@ -2097,14 +2097,14 @@ typedef enum sound_filters
NUM_SOUND_FILTERS
};
typedef enum sound_states
enum sound_states
{
SOUND_STATE_IDLE,
SOUND_STATE_ENDING,
SOUND_STATE_ENDED
};
typedef enum sound_flags
enum sound_flags
{
SOUND_NORMAL,
SOUND_WAIT,
@ -2112,7 +2112,7 @@ typedef enum sound_flags
SOUND_LOOPED
};
typedef enum reverb_type
enum reverb_type
{
RVB_OUTSIDE, // 0x00 no reverberation
RVB_SMALL_ROOM, // 0x01 little reverberation
@ -2123,7 +2123,7 @@ typedef enum reverb_type
NUM_REVERB_TYPES
};
typedef struct SAMPLE_INFO
struct SAMPLE_INFO
{
short number;
byte volume;
@ -2133,7 +2133,7 @@ typedef struct SAMPLE_INFO
short flags;
};
typedef struct AudioTrack
struct AudioTrack
{
std::string Name;
byte Mask;

2
TR5Main/Game/sphere.h
View file

@ -6,7 +6,7 @@
#define SPHERES_SPACE_BONE_ORIGIN 2
#define MAX_SPHERES 34
typedef struct SPHERE
struct SPHERE
{
int x;
int y;

2
TR5Main/Game/spotcam.h
View file

@ -7,7 +7,7 @@ struct QUAKE_CAMERA
GAME_VECTOR epos;
};
typedef struct SPOTCAM
struct SPOTCAM
{
int x;
int y;

18
TR5Main/Game/tomb4fx.h
View file

@ -2,7 +2,7 @@
#include "phd_global.h"
#include "items.h"
typedef struct ENERGY_ARC
struct ENERGY_ARC
{
PHD_VECTOR pos1;
PHD_VECTOR pos2;
@ -26,7 +26,7 @@ typedef struct ENERGY_ARC
int sLife;
};
typedef struct SMOKE_SPARKS
struct SMOKE_SPARKS
{
int x;
int y;
@ -59,13 +59,13 @@ typedef struct SMOKE_SPARKS
byte mirror;
};
typedef struct GUNFLASH_STRUCT
struct GUNFLASH_STRUCT
{
MATRIX3D matrix;
short on;
};
typedef struct SHOCKWAVE_STRUCT
struct SHOCKWAVE_STRUCT
{
int x;
int y;
@ -82,7 +82,7 @@ typedef struct SHOCKWAVE_STRUCT
short temp;
};
typedef struct GUNSHELL_STRUCT
struct GUNSHELL_STRUCT
{
PHD_3DPOS pos;
short fallspeed;
@ -93,7 +93,7 @@ typedef struct GUNSHELL_STRUCT
short objectNumber;
};
typedef struct DRIP_STRUCT
struct DRIP_STRUCT
{
int x;
int y;
@ -110,7 +110,7 @@ typedef struct DRIP_STRUCT
byte pad;
};
typedef struct FIRE_LIST
struct FIRE_LIST
{
int x;
int y;
@ -120,7 +120,7 @@ typedef struct FIRE_LIST
short roomNumber;
};
typedef struct FIRE_SPARKS
struct FIRE_SPARKS
{
short x;
short y;
@ -155,7 +155,7 @@ typedef struct FIRE_SPARKS
unsigned char life;
};
typedef struct BLOOD_STRUCT
struct BLOOD_STRUCT
{
int x;
int y;

2
TR5Main/Objects/TR3/Entity/tr3_mpstick.cpp
View file

@ -13,7 +13,7 @@
BITE_INFO mpstickBite1 = { 247, 10, 11, 13 };
BITE_INFO mpstickBite2 = { 0, 0, 100, 6 };
typedef enum MPSTICK_STATES {
enum MPSTICK_STATES {
BATON_EMPTY,
BATON_STOP,
BATON_WALK,

4
TR5Main/Objects/TR3/Vehicles/minecart.cpp
View file

@ -14,7 +14,7 @@
#include "input.h"
#include "sound.h"
using std::vector;
typedef enum MINECART_STATE {
enum MINECART_STATE {
CART_GETIN,
CART_GETOUT,
CART_GETOUTL,
@ -37,7 +37,7 @@ typedef enum MINECART_STATE {
CART_BRAKING
};
typedef enum MINECART_FLAGS
enum MINECART_FLAGS
{
CF_MESH = 1,
CF_TURNINGL = 2,

2
TR5Main/Objects/TR3/Vehicles/minecart.h
View file

@ -2,7 +2,7 @@
#include "items.h"
#include "collide.h"
typedef struct CART_INFO
struct CART_INFO
{
int Speed;
int MidPos;

6
TR5Main/Objects/TR3/Vehicles/quad.cpp
View file

@ -18,7 +18,7 @@
#include "prng.h"
using std::vector;
using namespace T5M::Math::Random;
typedef enum QUAD_EFFECTS_POSITIONS {
enum QUAD_EFFECTS_POSITIONS {
EXHAUST_LEFT = 0,
EXHAUST_RIGHT,
BACKLEFT_TYRE,
@ -27,12 +27,12 @@ typedef enum QUAD_EFFECTS_POSITIONS {
FRONTLEFT_TYRE
};
typedef enum QUAD_FLAGS {
enum QUAD_FLAGS {
QUAD_FLAGS_DEAD = 0x80,
QUAD_FLAGS_IS_FALLING = 0x40
};
typedef enum QUAD_ANIM_STATES {
enum QUAD_ANIM_STATES {
QUAD_STATE_DRIVE = 1,
QUAD_STATE_TURNL = 2,
QUAD_STATE_SLOW = 5,

2
TR5Main/Objects/TR3/Vehicles/quad.h
View file

@ -2,7 +2,7 @@
#include "items.h"
#include "collide.h"
typedef struct QUAD_INFO
struct QUAD_INFO
{
int velocity;
short frontRot;

2
TR5Main/Objects/TR5/Object/tr5_pushableblock.h
View file

@ -2,7 +2,7 @@
#include "items.h"
#include "collide.h"
typedef struct PUSHABLE_INFO
struct PUSHABLE_INFO
{
int height; // height for collision, also in floor procedure
int weight;

10
TR5Main/Objects/objectslist.h
View file

@ -1017,7 +1017,7 @@ template <typename T> std::enable_if_t<std::is_same_v<T, std::underlying_type_t<
return GAME_OBJECT_ID{ rhs };
}
typedef enum SPRITE_TYPES
enum SPRITE_TYPES
{
SPR_FIRE0,
SPR_FIRE1,
@ -1050,7 +1050,7 @@ typedef enum SPRITE_TYPES
SPR_LIGHTHING
};
typedef enum FLOOR_TYPES
enum FLOOR_TYPES
{
FLOOR_TYPE,
DOOR_TYPE,
@ -1076,7 +1076,7 @@ typedef enum FLOOR_TYPES
MINER_TYPE
};
typedef enum TRIGGER_TYPES
enum TRIGGER_TYPES
{
TRIGGER,
PAD,
@ -1097,7 +1097,7 @@ typedef enum TRIGGER_TYPES
CLIMB_T,
};
typedef enum TRIGOBJECTS_TYPES
enum TRIGOBJECTS_TYPES
{
TO_OBJECT,
TO_CAMERA,
@ -1115,7 +1115,7 @@ typedef enum TRIGOBJECTS_TYPES
TO_CUTSCENE
};
typedef enum FLOORDATA_MASKS
enum FLOORDATA_MASKS
{
FD_MASK_FUNCTION = 0x1F,
FD_MASK_SUBFUNCTION = 0x7F00,

22
TR5Main/Renderer/RenderEnums.h
View file

@ -1,12 +1,12 @@
#pragma once
typedef enum RENDERER_BUCKETS
enum RENDERER_BUCKETS
{
RENDERER_BUCKET_SOLID = 0,
RENDERER_BUCKET_TRANSPARENT = 1,
};
typedef enum RENDERER_PASSES
enum RENDERER_PASSES
{
RENDERER_PASS_DEPTH = 0,
RENDERER_PASS_DRAW = 1,
@ -16,7 +16,7 @@ typedef enum RENDERER_PASSES
RENDERER_PASS_RECONSTRUCT_DEPTH = 5
};
typedef enum MODEL_TYPES
enum MODEL_TYPES
{
MODEL_TYPE_HORIZON = 0,
MODEL_TYPE_ROOM = 1,
@ -30,7 +30,7 @@ typedef enum MODEL_TYPES
MODEL_TYPE_ROOM_UNDERWATER = 9
};
typedef enum LIGHT_TYPES
enum LIGHT_TYPES
{
LIGHT_TYPE_SUN = 0,
LIGHT_TYPE_POINT = 1,
@ -38,7 +38,7 @@ typedef enum LIGHT_TYPES
LIGHT_TYPE_SHADOW = 3
};
typedef enum BLEND_MODES
enum BLEND_MODES
{
BLENDMODE_OPAQUE = 0,
BLENDMODE_ALPHATEST = 1,
@ -48,14 +48,14 @@ typedef enum BLEND_MODES
NUM_BLENDMODES
};
typedef enum RENDERER_CULLMODE
enum RENDERER_CULLMODE
{
CULLMODE_NONE,
CULLMODE_CW,
CULLMODE_CCW
};
typedef enum RENDERER_BLENDSTATE
enum RENDERER_BLENDSTATE
{
BLENDSTATE_OPAQUE,
BLENDSTATE_ADDITIVE,
@ -63,7 +63,7 @@ typedef enum RENDERER_BLENDSTATE
BLENDSTATE_SPECIAL_Z_BUFFER
};
typedef enum RENDERER_SPRITE_TYPE
enum RENDERER_SPRITE_TYPE
{
SPRITE_TYPE_BILLBOARD,
SPRITE_TYPE_3D,
@ -71,7 +71,7 @@ typedef enum RENDERER_SPRITE_TYPE
SPRITE_TYPE_BILLBOARD_LOOKAT
};
typedef enum RENDERER_SPRITE_ROTATION
enum RENDERER_SPRITE_ROTATION
{
SPRITE_ROTATION_0_DEGREES,
SPRITE_ROTATION_90_DEGREES,
@ -79,13 +79,13 @@ typedef enum RENDERER_SPRITE_ROTATION
SPRITE_ROTATION_270_DEGREES,
};
typedef enum RENDERER_POLYGON_SHAPE
enum RENDERER_POLYGON_SHAPE
{
RENDERER_POLYGON_QUAD,
RENDERER_POLYGON_TRIANGLE
};
typedef enum RENDERER_FADE_STATUS
enum RENDERER_FADE_STATUS
{
NO_FADE,
FADE_IN,

4
TR5Main/Scripting/GameFlowScript.h
View file

@ -5,14 +5,14 @@
#define TITLE_FLYBY 0
#define TITLE_BACKGROUND 1
typedef enum WEATHER_TYPES
enum WEATHER_TYPES
{
WEATHER_NORMAL,
WEATHER_RAIN,
WEATHER_SNOW
};
typedef enum LARA_DRAW_TYPE
enum LARA_DRAW_TYPE
{
LARA_NORMAL = 1,
LARA_YOUNG = 2,

4
TR5Main/Scripting/GameLogicScript.h
View file

@ -12,7 +12,7 @@
#include "GameScriptRotation.h"
#include "GameScriptItemInfo.h"
typedef struct LuaFunction {
struct LuaFunction {
std::string Name;
std::string Code;
bool Executed;
@ -34,7 +34,7 @@ public:
void SetVariable(std::string key, sol::object value);
};
typedef struct LuaVariable
struct LuaVariable
{
bool IsGlobal;
std::string Name;

2
TR5Main/Specific/IO/ChunkWriter.h
View file

@ -3,7 +3,7 @@
#include "LEB128.h"
#include "ChunkId.h"
typedef struct ChunkWritingState
struct ChunkWritingState
{
private:
BaseStream* m_stream;

2
TR5Main/Specific/IO/LEB128.h
View file

@ -7,7 +7,7 @@
extern char* LevelDataPtr;
typedef struct LEB128
struct LEB128
{
static const uint64_t MaximumSize1Byte = 63L;
static const uint64_t MaximumSize2Byte = 8191L;

2
TR5Main/Specific/configuration.h
View file

@ -49,7 +49,7 @@
#define REGKEY_SOUND_DEVICE "SoundDevice"
#define REGKEY_SHADOW_MAP "ShadowMap"
typedef struct GameConfiguration {
struct GameConfiguration {
int Width;
int Height;
int RefreshRate;

4
TR5Main/Specific/level.h
View file

@ -18,13 +18,13 @@ struct SAMPLE_INFO;
struct BOX_INFO;
struct OVERLAP;
typedef struct OBJECT_TEXTURE_VERT
struct OBJECT_TEXTURE_VERT
{
float x;
float y;
};
typedef struct OBJECT_TEXTURE
struct OBJECT_TEXTURE
{
int attribute;
int tileAndFlag;

2
TR5Main/Specific/winmain.h
View file

@ -7,7 +7,7 @@
"publicKeyToken='6595b64144ccf1df' " \
"language='*'\"")
typedef struct WINAPP
struct WINAPP
{
HINSTANCE hInstance;
int nFillMode;