changed typedef enum to enum
diff --git a/src/engine/API/CVarSystem_api.hpp b/src/engine/API/CVarSystem_api.hpp
index 26628b8..feb7e17 100644
--- a/src/engine/API/CVarSystem_api.hpp
+++ b/src/engine/API/CVarSystem_api.hpp
@@ -48,7 +48,7 @@ default values.
*/
//Dushan
-typedef enum cvar_flags_s
+enum cvar_flags_t
{
CVAR_ARCHIVE = BIT( 0 ), // set to cause it to be saved to vars.rc
// used for system variables, not for player
@@ -73,7 +73,7 @@ typedef enum cvar_flags_s
CVAR_SERVERINFO_NOUPDATE = BIT( 13 ), // gordon: WONT automatically send this to clients, but server browsers will see it
CVAR_SHADER = BIT( 14 ), // tell renderer to recompile shaders.
CVAR_NONEXISTENT = 0xFFFFFFFF // Cvar doesn't exist.
-} cvar_flags_t;
+};
// nothing outside the Cvar_*() functions should modify these fields!
typedef struct convar_s
diff --git a/src/engine/API/cm_api.hpp b/src/engine/API/cm_api.hpp
index 03d33e8..a3d3cf2 100644
--- a/src/engine/API/cm_api.hpp
+++ b/src/engine/API/cm_api.hpp
@@ -69,7 +69,7 @@ typedef struct
vec3_t axis[3];
} orientation_t;
-typedef enum
+enum traceType_t
{
TT_NONE,
@@ -78,7 +78,7 @@ typedef enum
TT_BISPHERE,
TT_NUM_TRACE_TYPES
-} traceType_t;
+};
//
// idCollisionModelManager
diff --git a/src/engine/API/download_api.hpp b/src/engine/API/download_api.hpp
index dc30145..216a2ad 100644
--- a/src/engine/API/download_api.hpp
+++ b/src/engine/API/download_api.hpp
@@ -38,19 +38,19 @@
#ifndef __DOWNLOAD_API_H__
#define __DOWNLOAD_API_H__
-typedef enum
+enum dlStatus_t
{
DL_CONTINUE,
DL_DONE,
DL_FAILED
-} dlStatus_t;
+};
// bitmask
-typedef enum
+enum dlFlags_t
{
DL_FLAG_DISCON = 0,
DL_FLAG_URL
-} dlFlags_t;
+};
//
// idDownloadSystem
diff --git a/src/engine/API/system_api.hpp b/src/engine/API/system_api.hpp
index 8ac382e..c7c640d 100644
--- a/src/engine/API/system_api.hpp
+++ b/src/engine/API/system_api.hpp
@@ -29,22 +29,22 @@
#ifndef __SYSTEM_API_H__
#define __SYSTEM_API_H__
-typedef enum
+enum dialogResult_t
{
DR_YES = 0,
DR_NO = 1,
DR_OK = 0,
DR_CANCEL = 1
-} dialogResult_t;
+};
-typedef enum
+enum dialogType_t
{
DT_INFO,
DT_WARNING,
DT_ERROR,
DT_YES_NO,
DT_OK_CANCEL
-} dialogType_t;
+};
//
// idServerSnapshotSystem
diff --git a/src/engine/GPURenderer/r_common.hpp b/src/engine/GPURenderer/r_common.hpp
index 1030d48..39a81b8 100644
--- a/src/engine/GPURenderer/r_common.hpp
+++ b/src/engine/GPURenderer/r_common.hpp
@@ -33,15 +33,15 @@
#if !defined ( DEDICATED ) && !defined ( UPDATE_SERVER )
-typedef enum
+enum imgType_t
{
IMGTYPE_COLORALPHA, // for color, lightmap, diffuse, and specular
IMGTYPE_NORMAL,
IMGTYPE_NORMALHEIGHT,
IMGTYPE_DELUXE, // normals are swizzled, deluxe are not
-} imgType_t;
+};
-typedef enum
+enum imgFlags_t
{
IMGFLAG_NONE = 0x0000,
IMGFLAG_MIPMAP = 0x0001,
@@ -53,7 +53,7 @@ typedef enum
IMGFLAG_GENNORMALMAP = 0x0100,
IMGFLAG_MUTABLE = 0x0200,
IMGFLAG_SRGB = 0x0400,
-} imgFlags_t;
+};
#define MIP_RAW_IMAGE ( IMGFLAG_MIPMAP | IMGFLAG_PICMIP )
diff --git a/src/engine/GPURenderer/r_glimp.cpp b/src/engine/GPURenderer/r_glimp.cpp
index af6cbba..a38594a 100644
--- a/src/engine/GPURenderer/r_glimp.cpp
+++ b/src/engine/GPURenderer/r_glimp.cpp
@@ -32,7 +32,7 @@
sint qglMajorVersion, qglMinorVersion;
sint qglesMajorVersion, qglesMinorVersion;
-typedef enum
+enum rserr_t
{
RSERR_OK,
@@ -40,7 +40,7 @@ typedef enum
RSERR_INVALID_MODE,
RSERR_UNKNOWN
-} rserr_t;
+};
SDL_Window* SDL_window = nullptr;
static SDL_GLContext SDL_glContext = nullptr;
diff --git a/src/engine/GPURenderer/r_glsl.cpp b/src/engine/GPURenderer/r_glsl.cpp
index 9065f0a..e4a9162 100644
--- a/src/engine/GPURenderer/r_glsl.cpp
+++ b/src/engine/GPURenderer/r_glsl.cpp
@@ -150,13 +150,12 @@ static uniformInfo_t uniformsInfo[] =
{ "u_Texture3", GLSL_INT },
};
-typedef enum
+enum glslPrintLog_t
{
GLSL_PRINTLOG_PROGRAM_INFO,
GLSL_PRINTLOG_SHADER_INFO,
GLSL_PRINTLOG_SHADER_SOURCE
-}
-glslPrintLog_t;
+};
static void GLSL_PrintLog( uint programOrShader, glslPrintLog_t type, bool developerOnly )
{
diff --git a/src/engine/GPURenderer/r_image_dds.cpp b/src/engine/GPURenderer/r_image_dds.cpp
index 13ce512..763d779 100644
--- a/src/engine/GPURenderer/r_image_dds.cpp
+++ b/src/engine/GPURenderer/r_image_dds.cpp
@@ -91,7 +91,7 @@ ddsHeaderDxt10_t;
// dxgiFormat
// from http://msdn.microsoft.com/en-us/library/windows/desktop/bb173059%28v=vs.85%29.aspx
-typedef enum DXGI_FORMAT
+enum DXGI_FORMAT
{
DXGI_FORMAT_UNKNOWN = 0,
DXGI_FORMAT_R32G32B32A32_TYPELESS = 1,
@@ -210,7 +210,7 @@ typedef enum DXGI_FORMAT
DXGI_FORMAT_A8P8 = 114,
DXGI_FORMAT_B4G4R4A4_UNORM = 115,
DXGI_FORMAT_FORCE_UINT = 0xffffffffUL
-} DXGI_FORMAT;
+};
#define EncodeFourCC(x) ((((uint)((x)[0])) ) | \
(((uint)((x)[1])) << 8 ) | \
diff --git a/src/engine/GPURenderer/r_local.hpp b/src/engine/GPURenderer/r_local.hpp
index 072da24..1965945 100644
--- a/src/engine/GPURenderer/r_local.hpp
+++ b/src/engine/GPURenderer/r_local.hpp
@@ -147,11 +147,11 @@ typedef struct
// Ensure this is >= the ATTR_INDEX_COUNT enum below
#define VAO_MAX_ATTRIBS 16
-typedef enum
+enum vaoUsage_t
{
VAO_USAGE_STATIC,
VAO_USAGE_DYNAMIC
-} vaoUsage_t;
+};
typedef struct vaoAttrib_s
{
@@ -182,7 +182,7 @@ typedef struct vao_s
//===============================================================================
-typedef enum
+enum shaderSort_t
{
SS_BAD,
SS_PORTAL, // mirrors, portals, viewscreens
@@ -208,12 +208,11 @@ typedef enum
SS_ALMOST_NEAREST, // gun smoke puffs
SS_NEAREST // blood blobs
-} shaderSort_t;
-
+};
#define MAX_SHADER_STAGES 8
-typedef enum
+enum genFunc_t
{
GF_NONE,
@@ -224,11 +223,9 @@ typedef enum
GF_INVERSE_SAWTOOTH,
GF_NOISE
-
-} genFunc_t;
-
+};
-typedef enum
+enum deform_t
{
DEFORM_NONE,
DEFORM_WAVE,
@@ -246,10 +243,10 @@ typedef enum
DEFORM_TEXT5,
DEFORM_TEXT6,
DEFORM_TEXT7
-} deform_t;
+};
// deformVertexes types that can be handled by the GPU
-typedef enum
+enum deformGen_t
{
// do not edit: same as genFunc_t
@@ -265,9 +262,9 @@ typedef enum
DGEN_BULGE,
DGEN_MOVE
-} deformGen_t;
+};
-typedef enum
+enum alphaGen_t
{
AGEN_IDENTITY,
AGEN_SKIP,
@@ -279,9 +276,9 @@ typedef enum
AGEN_WAVEFORM,
AGEN_PORTAL,
AGEN_CONST,
-} alphaGen_t;
+};
-typedef enum
+enum colorGen_t
{
CGEN_BAD,
CGEN_IDENTITY_LIGHTING, // tr.identityLight
@@ -297,9 +294,9 @@ typedef enum
CGEN_LIGHTING_DIFFUSE,
CGEN_FOG, // standard fog
CGEN_CONST // fixed color
-} colorGen_t;
+};
-typedef enum
+enum texCoordGen_t
{
TCGEN_BAD,
TCGEN_IDENTITY, // clear to 0,0
@@ -308,17 +305,17 @@ typedef enum
TCGEN_ENVIRONMENT_MAPPED,
TCGEN_FOG,
TCGEN_VECTOR // S and T from world coordinates
-} texCoordGen_t;
+};
-typedef enum
+enum acff_t
{
ACFF_NONE,
ACFF_MODULATE_RGB,
ACFF_MODULATE_RGBA,
ACFF_MODULATE_ALPHA
-} acff_t;
+};
-typedef struct
+struct waveForm_t
{
genFunc_t func;
@@ -326,11 +323,11 @@ typedef struct
float32 amplitude;
float32 phase;
float32 frequency;
-} waveForm_t;
+};
#define TR_MAX_TEXMODS 4
-typedef enum
+enum texMod_t
{
TMOD_NONE,
TMOD_TRANSFORM,
@@ -340,7 +337,7 @@ typedef enum
TMOD_STRETCH,
TMOD_ROTATE,
TMOD_ENTITY_TRANSLATE
-} texMod_t;
+};
#define MAX_SHADER_DEFORMS 3
typedef struct
@@ -421,7 +418,7 @@ enum
NUM_TEXTURE_BUNDLES = 9
};
-typedef enum
+enum stageType_t
{
// material shader stage types
ST_COLORMAP = 0, // vanilla Q3A style shader treatening
@@ -430,7 +427,7 @@ typedef enum
[... diff too long, it was truncated ...]
GitHub
sha: 9479b725