mirror of
https://github.com/ioquake/jedi-academy.git
synced 2024-11-21 20:01:10 +00:00
remove the use of 'typedef enum' without an indentifier
This commit is contained in:
parent
7d29fb84a5
commit
6ae7218c21
15 changed files with 34 additions and 34 deletions
|
@ -72,7 +72,7 @@ typedef struct campspot_s
|
|||
} campspot_t;
|
||||
|
||||
//FIXME: these are game specific
|
||||
typedef enum {
|
||||
enum {
|
||||
GT_FFA, // free for all
|
||||
GT_HOLOCRON, // holocron match
|
||||
GT_JEDIMASTER, // jedi master
|
||||
|
|
|
@ -27,7 +27,7 @@ extern int cg_vehicleAmmoWarning;
|
|||
extern int cg_vehicleAmmoWarningTime;
|
||||
|
||||
//I know, not siege, but...
|
||||
typedef enum
|
||||
enum
|
||||
{
|
||||
TAUNT_TAUNT = 0,
|
||||
TAUNT_BOW,
|
||||
|
|
|
@ -1046,7 +1046,7 @@ extern cgscreffects_t cgScreenEffects;
|
|||
void CGCam_Shake( float intensity, int duration );
|
||||
void CGCam_SetMusicMult( float multiplier, int duration );
|
||||
|
||||
typedef enum
|
||||
enum
|
||||
{
|
||||
CHUNK_METAL1 = 0,
|
||||
CHUNK_METAL2,
|
||||
|
|
|
@ -275,7 +275,7 @@ typedef struct {
|
|||
} refdef_t;
|
||||
|
||||
|
||||
typedef enum {
|
||||
enum {
|
||||
STEREO_CENTER,
|
||||
STEREO_LEFT,
|
||||
STEREO_RIGHT
|
||||
|
|
|
@ -180,7 +180,7 @@ typedef enum
|
|||
//for supplier class items
|
||||
#define TOSS_DEBOUNCE_TIME 5000
|
||||
|
||||
typedef enum {
|
||||
enum {
|
||||
GT_FFA, // free for all
|
||||
GT_HOLOCRON, // holocron ffa
|
||||
GT_JEDIMASTER, // jedi master
|
||||
|
@ -206,7 +206,7 @@ extern vec3_t WP_MuzzlePoint[WP_NUM_WEAPONS];
|
|||
extern int forcePowerSorted[NUM_FORCE_POWERS];
|
||||
#include "../namespace_end.h"
|
||||
|
||||
typedef enum
|
||||
enum
|
||||
{
|
||||
SABERLOCK_TOP,
|
||||
SABERLOCK_SIDE,
|
||||
|
@ -217,7 +217,7 @@ typedef enum
|
|||
SABERLOCK_LOSE
|
||||
};
|
||||
|
||||
typedef enum
|
||||
enum
|
||||
{
|
||||
DIR_RIGHT,
|
||||
DIR_LEFT,
|
||||
|
@ -380,7 +380,7 @@ typedef enum {
|
|||
} weaponstate_t;
|
||||
|
||||
|
||||
typedef enum {
|
||||
enum {
|
||||
FORCE_MASTERY_UNINITIATED,
|
||||
FORCE_MASTERY_INITIATE,
|
||||
FORCE_MASTERY_PADAWAN,
|
||||
|
@ -649,7 +649,7 @@ typedef enum {
|
|||
} effectTypes_t;
|
||||
|
||||
// NOTE: may not have more than 16
|
||||
typedef enum {
|
||||
enum {
|
||||
PW_NONE,
|
||||
|
||||
PW_QUAD,
|
||||
|
@ -683,7 +683,7 @@ typedef enum {
|
|||
};
|
||||
typedef int powerup_t;
|
||||
|
||||
typedef enum {
|
||||
enum {
|
||||
HI_NONE,
|
||||
|
||||
HI_SEEKER,
|
||||
|
@ -1006,7 +1006,7 @@ typedef enum {
|
|||
|
||||
|
||||
|
||||
typedef enum {
|
||||
enum {
|
||||
TEAM_FREE,
|
||||
TEAM_RED,
|
||||
TEAM_BLUE,
|
||||
|
@ -1102,7 +1102,7 @@ typedef enum {
|
|||
//---------------------------------------------------------
|
||||
|
||||
// gitem_t->type
|
||||
typedef enum {
|
||||
enum {
|
||||
IT_BAD,
|
||||
IT_WEAPON, // EFX: rotate + upscale + minlight
|
||||
IT_AMMO, // EFX: rotate
|
||||
|
@ -1286,7 +1286,7 @@ typedef struct
|
|||
#undef LS_NONE
|
||||
#endif
|
||||
|
||||
typedef enum {
|
||||
enum {
|
||||
//totally invalid
|
||||
LS_INVALID = -1,
|
||||
// Invalid, or saber not armed
|
||||
|
|
|
@ -403,7 +403,7 @@ extern int numVehicles;
|
|||
#define VEH_MOUNT_THROW_RIGHT -6
|
||||
|
||||
|
||||
typedef enum
|
||||
enum
|
||||
{
|
||||
VEH_EJECT_LEFT,
|
||||
VEH_EJECT_RIGHT,
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#ifndef __WEAPONS_H__
|
||||
#define __WEAPONS_H__
|
||||
|
||||
typedef enum {
|
||||
enum {
|
||||
WP_NONE,
|
||||
|
||||
WP_STUN_BATON,
|
||||
|
|
|
@ -1650,7 +1650,7 @@ void G_HeldByMonster( gentity_t *ent, usercmd_t **ucmd )
|
|||
(*ucmd)->upmove = 0;
|
||||
}
|
||||
|
||||
typedef enum
|
||||
enum
|
||||
{
|
||||
TAUNT_TAUNT = 0,
|
||||
TAUNT_BOW,
|
||||
|
|
|
@ -95,7 +95,7 @@ typedef enum {
|
|||
|
||||
#define SP_PODIUM_MODEL "models/mapobjects/podium/podium4.md3"
|
||||
|
||||
typedef enum
|
||||
enum
|
||||
{
|
||||
HL_NONE = 0,
|
||||
HL_FOOT_RT,
|
||||
|
@ -363,7 +363,7 @@ struct gentity_s {
|
|||
#define DAMAGEREDIRECT_RLEG 2
|
||||
#define DAMAGEREDIRECT_LLEG 3
|
||||
|
||||
typedef enum {
|
||||
enum {
|
||||
CON_DISCONNECTED,
|
||||
CON_CONNECTING,
|
||||
CON_CONNECTED
|
||||
|
|
|
@ -617,7 +617,7 @@ typedef enum {
|
|||
|
||||
|
||||
|
||||
typedef enum
|
||||
enum
|
||||
{
|
||||
SABER_RED,
|
||||
SABER_ORANGE,
|
||||
|
@ -630,7 +630,7 @@ typedef enum
|
|||
};
|
||||
typedef int saber_colors_t;
|
||||
|
||||
typedef enum
|
||||
enum
|
||||
{
|
||||
FP_FIRST = 0,//marker
|
||||
FP_HEAL = 0,//instant
|
||||
|
@ -883,7 +883,7 @@ typedef struct
|
|||
} saberInfo_t;
|
||||
#define MAX_SABERS 2
|
||||
|
||||
typedef enum
|
||||
enum
|
||||
{
|
||||
FORCE_LEVEL_0,
|
||||
FORCE_LEVEL_1,
|
||||
|
@ -1007,7 +1007,7 @@ enum sharedEIKMoveState
|
|||
};
|
||||
|
||||
//material stuff needs to be shared
|
||||
typedef enum //# material_e
|
||||
enum //# material_e
|
||||
{
|
||||
MAT_METAL = 0, // scorched blue-grey metal
|
||||
MAT_GLASS, // not a real chunk type, just plays an effect with glass sprites
|
||||
|
@ -1995,7 +1995,7 @@ typedef struct {
|
|||
// sound channels
|
||||
// channel 0 never willingly overrides
|
||||
// other channels will allways override a playing sound on that channel
|
||||
typedef enum {
|
||||
enum {
|
||||
CHAN_AUTO, //## %s !!"W:\game\base\!!sound\*.wav;*.mp3" # Auto-picks an empty channel to play sound on
|
||||
CHAN_LOCAL, //## %s !!"W:\game\base\!!sound\*.wav;*.mp3" # menu sounds, etc
|
||||
CHAN_WEAPON,//## %s !!"W:\game\base\!!sound\*.wav;*.mp3"
|
||||
|
@ -3082,7 +3082,7 @@ typedef struct qtime_s {
|
|||
#define AS_MPLAYER 3 // (Obsolete)
|
||||
|
||||
// cinematic states
|
||||
typedef enum {
|
||||
enum {
|
||||
FMV_IDLE,
|
||||
FMV_PLAY, // play
|
||||
FMV_EOF, // all other conditions, i.e. stop/EOF/abort
|
||||
|
@ -3093,7 +3093,7 @@ typedef enum {
|
|||
};
|
||||
typedef int e_status;
|
||||
|
||||
typedef enum _flag_status {
|
||||
enum _flag_status {
|
||||
FLAG_ATBASE = 0,
|
||||
FLAG_TAKEN, // CTF
|
||||
FLAG_TAKEN_RED, // One Flag CTF
|
||||
|
@ -3136,7 +3136,7 @@ typedef struct {
|
|||
|
||||
// For ghoul2 axis use
|
||||
|
||||
typedef enum Eorientations
|
||||
enum Eorientations
|
||||
{
|
||||
ORIGIN = 0,
|
||||
POSITIVE_X,
|
||||
|
@ -3154,7 +3154,7 @@ Ghoul2 Insert End
|
|||
// define the new memory tags for the zone, used by all modules now
|
||||
//
|
||||
#define TAGDEF(blah) TAG_ ## blah
|
||||
typedef enum {
|
||||
enum {
|
||||
#include "../qcommon/tags.h"
|
||||
};
|
||||
typedef char memtag_t;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef TEAMS_H
|
||||
#define TEAMS_H
|
||||
|
||||
typedef enum //# team_e
|
||||
enum //# team_e
|
||||
{
|
||||
NPCTEAM_FREE, // also TEAM_FREE - caution, some code checks a team_t via "if (!team_t_varname)" so I guess this should stay as entry 0, great or what? -slc
|
||||
NPCTEAM_ENEMY, // also TEAM_RED
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#define FORCE_LIGHTNING_RADIUS 300
|
||||
#define MAX_DRAIN_DISTANCE 512
|
||||
|
||||
typedef enum
|
||||
enum
|
||||
{
|
||||
FJ_FORWARD,
|
||||
FJ_BACKWARD,
|
||||
|
|
|
@ -138,7 +138,7 @@ class CNavigator
|
|||
|
||||
#if __NEWCOLLECT
|
||||
|
||||
typedef struct nodeList_t
|
||||
struct nodeList_t
|
||||
{
|
||||
int nodeID;
|
||||
unsigned int distance;
|
||||
|
@ -277,4 +277,4 @@ private:
|
|||
|
||||
extern CNavigator navigator;
|
||||
|
||||
#endif //__G_NAVIGATOR__
|
||||
#endif //__G_NAVIGATOR__
|
||||
|
|
|
@ -363,7 +363,7 @@ void UI_XBL_FriendsListScript(char **args, const char *name)
|
|||
#endif // _XBOX
|
||||
|
||||
// Movedata Sounds
|
||||
typedef enum
|
||||
enum
|
||||
{
|
||||
MDS_NONE = 0,
|
||||
MDS_FORCE_JUMP,
|
||||
|
@ -372,7 +372,7 @@ typedef enum
|
|||
MDS_MOVE_SOUNDS_MAX
|
||||
};
|
||||
|
||||
typedef enum
|
||||
enum
|
||||
{
|
||||
MD_ACROBATICS = 0,
|
||||
MD_SINGLE_FAST,
|
||||
|
|
|
@ -191,7 +191,7 @@ Ghoul2 Insert End
|
|||
*/
|
||||
} uiImport_t;
|
||||
|
||||
typedef enum {
|
||||
enum {
|
||||
UIMENU_NONE,
|
||||
UIMENU_MAIN,
|
||||
UIMENU_INGAME,
|
||||
|
|
Loading…
Reference in a new issue