mirror of
https://github.com/SpartanJ/eepp.git
synced 2026-08-11 17:17:42 +03:00
Removed typedefs for structs.
--HG-- branch : dev
This commit is contained in:
@@ -56,10 +56,10 @@ class tSoundManager {
|
||||
|
||||
~tSoundManager();
|
||||
private:
|
||||
typedef struct sSound {
|
||||
struct sSound {
|
||||
SoundBuffer Buf;
|
||||
std::vector<Sound> Snd;
|
||||
} sSound;
|
||||
};
|
||||
std::map<T, sSound> tSounds;
|
||||
};
|
||||
|
||||
|
||||
@@ -161,11 +161,11 @@ class EE_API Console : protected LogReaderInterface {
|
||||
Primitives mPri;
|
||||
Uint32 mTexId;
|
||||
|
||||
typedef struct {
|
||||
struct sCon {
|
||||
int ConMin;
|
||||
int ConMax;
|
||||
int ConModif;
|
||||
} sCon;
|
||||
};
|
||||
sCon mCon;
|
||||
|
||||
Float mCurAlpha;
|
||||
|
||||
@@ -9,7 +9,7 @@ namespace EE { namespace Graphics { namespace Private {
|
||||
|
||||
#define HDR_NAME_SIZE 64
|
||||
|
||||
typedef struct sTextureRegionHdrSN {
|
||||
struct sTextureRegionHdr {
|
||||
char Name[ HDR_NAME_SIZE ];
|
||||
Uint64 Date;
|
||||
Int32 X;
|
||||
@@ -24,18 +24,18 @@ typedef struct sTextureRegionHdrSN {
|
||||
Int32 DestHeight;
|
||||
Uint32 Flags;
|
||||
Uint32 PixelDensity;
|
||||
} sTextureRegionHdr;
|
||||
};
|
||||
|
||||
#define HDR_TEXTUREREGION_FLAG_FLIPED ( 1 << 0 )
|
||||
|
||||
typedef struct sTextureHdrS {
|
||||
struct sTextureHdr {
|
||||
char Name[ HDR_NAME_SIZE ];
|
||||
Uint32 ResourceID;
|
||||
Uint32 Size;
|
||||
Int32 TextureRegionCount;
|
||||
} sTextureHdr;
|
||||
};
|
||||
|
||||
typedef struct sTextureAtlasHdrSN {
|
||||
struct sTextureAtlasHdr {
|
||||
Uint32 Magic;
|
||||
Uint32 Version;
|
||||
Uint64 Date;
|
||||
@@ -47,7 +47,7 @@ typedef struct sTextureAtlasHdrSN {
|
||||
Uint32 Flags;
|
||||
char TextureFilter;
|
||||
char Reserved[15];
|
||||
} sTextureAtlasHdr;
|
||||
};
|
||||
|
||||
#define HDR_TEXTURE_ATLAS_ALLOW_FLIPPING ( 1 << 0 )
|
||||
#define HDR_TEXTURE_ATLAS_REMOVE_EXTENSION ( 1 << 1 )
|
||||
|
||||
@@ -148,10 +148,10 @@ class EE_API TextureAtlasLoader {
|
||||
GLLoadCallback mLoadCallback;
|
||||
std::vector<Texture*> mTexturesLoaded;
|
||||
|
||||
typedef struct sTempTexAtlasS {
|
||||
struct sTempTexAtlas {
|
||||
sTextureHdr Texture;
|
||||
std::vector<sTextureRegionHdr> TextureRegions;
|
||||
} sTempTexAtlas;
|
||||
};
|
||||
|
||||
sTextureAtlasHdr mTexGrHdr;
|
||||
std::vector<sTempTexAtlas> mTempAtlass;
|
||||
|
||||
@@ -9,20 +9,20 @@ namespace EE { namespace Maps {
|
||||
#define LAYER_NAME_SIZE (64)
|
||||
#define MAP_TEXTUREATLAS_PATH_SIZE (128)
|
||||
|
||||
typedef struct sPropertyHdrS {
|
||||
struct sPropertyHdr {
|
||||
char Name[ MAP_PROPERTY_SIZE ];
|
||||
char Value[ MAP_PROPERTY_SIZE ];
|
||||
} sPropertyHdr;
|
||||
};
|
||||
|
||||
typedef struct sMapTextureAtlasS {
|
||||
struct sMapTextureAtlas {
|
||||
char Path[ MAP_TEXTUREATLAS_PATH_SIZE ];
|
||||
} sMapTextureAtlas;
|
||||
};
|
||||
|
||||
typedef struct sVirtualObjS {
|
||||
struct sVirtualObj {
|
||||
char Name[ MAP_PROPERTY_SIZE ];
|
||||
} sVirtualObj;
|
||||
};
|
||||
|
||||
typedef struct sMapHdrS {
|
||||
struct sMapHdr {
|
||||
Uint32 Magic;
|
||||
Uint32 SizeX;
|
||||
Uint32 SizeY;
|
||||
@@ -36,9 +36,9 @@ typedef struct sMapHdrS {
|
||||
Uint32 VirtualObjectTypesCount;
|
||||
Uint32 BaseColor;
|
||||
Uint32 LightsCount;
|
||||
} sMapHdr;
|
||||
};
|
||||
|
||||
typedef struct sLayerHdrS {
|
||||
struct sLayerHdr {
|
||||
char Name[ LAYER_NAME_SIZE ];
|
||||
Uint32 Type;
|
||||
Uint32 Flags;
|
||||
@@ -46,36 +46,36 @@ typedef struct sLayerHdrS {
|
||||
Int32 OffsetY;
|
||||
Uint32 PropertyCount;
|
||||
Uint32 ObjectCount; //! Only used by the Object Layer
|
||||
} sLayerHdr;
|
||||
};
|
||||
|
||||
typedef struct sMapTileGOHdrS {
|
||||
struct sMapTileGOHdr {
|
||||
Uint32 Type;
|
||||
Uint32 Id;
|
||||
Uint32 Flags;
|
||||
} sMapTileGOHdr;
|
||||
};
|
||||
|
||||
typedef struct sMapObjGOHdrS {
|
||||
struct sMapObjGOHdr {
|
||||
Uint32 Type;
|
||||
Uint32 Id;
|
||||
Uint32 Flags;
|
||||
Int32 PosX;
|
||||
Int32 PosY;
|
||||
} sMapObjGOHdr;
|
||||
};
|
||||
|
||||
typedef struct sMapLightHdrS {
|
||||
struct sMapLightHdr {
|
||||
Uint32 Radius;
|
||||
Int32 PosX;
|
||||
Int32 PosY;
|
||||
Uint32 Color;
|
||||
Uint32 Type;
|
||||
} sMapLightHdr;
|
||||
};
|
||||
|
||||
typedef struct sMapObjObjHdrS {
|
||||
struct sMapObjObjHdr {
|
||||
char Name[ MAP_PROPERTY_SIZE ];
|
||||
char Type[ MAP_PROPERTY_SIZE ];
|
||||
Uint32 PointCount;
|
||||
Uint32 PropertyCount;
|
||||
} sMapObjObjHdr;
|
||||
};
|
||||
|
||||
class GObjFlags {
|
||||
public:
|
||||
|
||||
@@ -9,13 +9,13 @@ namespace EE { namespace System {
|
||||
|
||||
class MD5 {
|
||||
public:
|
||||
typedef struct {
|
||||
struct Result {
|
||||
std::vector<Uint8> digest;
|
||||
|
||||
std::string toHexString() {
|
||||
return MD5::hexDigest( digest );
|
||||
}
|
||||
} Result;
|
||||
};
|
||||
|
||||
/** @return Calculates the md5 hash from a stream */
|
||||
static Result fromStream( IOStream& stream );
|
||||
@@ -34,12 +34,12 @@ class MD5 {
|
||||
protected:
|
||||
typedef unsigned int MD5_u32plus;
|
||||
|
||||
typedef struct {
|
||||
struct Context {
|
||||
MD5_u32plus lo, hi;
|
||||
MD5_u32plus a, b, c, d;
|
||||
unsigned char buffer[64];
|
||||
MD5_u32plus block[16];
|
||||
} Context;
|
||||
};
|
||||
|
||||
static const void * body( Context *ctx, const void *data, unsigned long size );
|
||||
|
||||
|
||||
@@ -74,24 +74,24 @@ class EE_API Pak : public Pack {
|
||||
protected:
|
||||
friend class IOStreamPak;
|
||||
|
||||
typedef struct pakheader_t {
|
||||
struct pakHeader {
|
||||
char head[4]; //! Header of the file ( default: 'PACK' )
|
||||
Uint32 dir_offset; //! Offset to the first pakEntry on the pakFile
|
||||
Uint32 dir_length; //! Space ocuped by all the pakEntrys ( num of pakEntrys = dir_length / sizeof(pakEntry) )
|
||||
} pakHeader; //! The header of the file
|
||||
}; //! The header of the file
|
||||
|
||||
typedef struct dirsection_t {
|
||||
struct pakEntry {
|
||||
char filename[56]; //! File name
|
||||
Uint32 file_position; //! The file position on the file ( in bytes )
|
||||
Uint32 file_length; //! THe file length ( in bytes )
|
||||
} pakEntry; //! The stored file info
|
||||
}; //! The stored file info
|
||||
|
||||
typedef struct pakfile_t {
|
||||
struct pakFile {
|
||||
IOStreamFile * fs;
|
||||
pakHeader header;
|
||||
Uint32 pakFilesNum;
|
||||
std::string pakPath;
|
||||
} pakFile;
|
||||
};
|
||||
|
||||
pakFile mPak;
|
||||
std::vector<pakEntry> mPakFiles;
|
||||
|
||||
@@ -50,9 +50,9 @@ class EE_API RC4 {
|
||||
/** @brief Decrypt a file ( you must set the key first ). */
|
||||
bool decryptFile( const std::string& SourceFile, const std::string& DestFile );
|
||||
private:
|
||||
typedef struct _RC4Key {
|
||||
struct RC4Key {
|
||||
Uint8 state[256];
|
||||
} RC4Key;
|
||||
};
|
||||
RC4Key mKey;
|
||||
|
||||
void swap( Uint8& a, Uint8& b );
|
||||
|
||||
Reference in New Issue
Block a user