zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-27 20:20:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed a bunch of compilation errors with MSVC 16.6.0

Browse source
This commit is contained in:
alexey.lysiuk 2020-05-21 10:29:59 +03:00
parent 559539bed2
commit 2974af3178
5 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/common/utility/files_decompress.cpp
View file

@ -39,6 +39,7 @@
#include <zlib.h> #include <zlib.h>
#include <bzlib.h> #include <bzlib.h>
#include <algorithm> #include <algorithm>
#include <stdexcept>
#include "files.h" #include "files.h"
#include "templates.h" #include "templates.h"

8
source/duke3d/src/anim.h
View file

@ -30,12 +30,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_DUKE_NS BEGIN_DUKE_NS
typedef struct { struct animsound_t {
uint16_t frame = 0; uint16_t frame = 0;
int16_t sound = 0; int16_t sound = 0;
} animsound_t; };
typedef struct struct dukeanim_t
{ {
FString name; FString name;
double frameaspect1 = 0.0, frameaspect2 = 0.0; double frameaspect1 = 0.0, frameaspect2 = 0.0;
@ -43,7 +43,7 @@ typedef struct
TArray<animsound_t> Sounds; TArray<animsound_t> Sounds;
uint8_t framedelay = 0; uint8_t framedelay = 0;
uint8_t frameflags = 0; uint8_t frameflags = 0;
} dukeanim_t; };
extern dukeanim_t* g_animPtr; extern dukeanim_t* g_animPtr;
extern TArray<dukeanim_t> g_Animations; extern TArray<dukeanim_t> g_Animations;

4
source/duke3d/src/savegame.h
View file

@ -36,7 +36,7 @@ BEGIN_DUKE_NS
#define SV_MINOR_VER 7 #define SV_MINOR_VER 7
#pragma pack(push,1) #pragma pack(push,1)
typedef struct struct savehead_t
{ {
char headerstr[11]; char headerstr[11];
uint8_t majorver, minorver, ptrsize; uint8_t majorver, minorver, ptrsize;
@ -56,7 +56,7 @@ typedef struct
// 286 bytes // 286 bytes
uint8_t getPtrSize() const { return ptrsize; } uint8_t getPtrSize() const { return ptrsize; }
} savehead_t; };
#pragma pack(pop) #pragma pack(pop)
extern int32_t g_fakeSaveID; extern int32_t g_fakeSaveID;

8
source/rr/src/anim.h
View file

@ -25,12 +25,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_RR_NS BEGIN_RR_NS
typedef struct { struct animsound_t {
uint16_t frame = 0; uint16_t frame = 0;
int16_t sound = 0; int16_t sound = 0;
} animsound_t; };
typedef struct struct dukeanim_t
{ {
FString name; FString name;
double frameaspect1 = 0, frameaspect2 = 0; double frameaspect1 = 0, frameaspect2 = 0;
@ -38,7 +38,7 @@ typedef struct
TArray<animsound_t> Sounds; TArray<animsound_t> Sounds;
uint8_t framedelay = 0; uint8_t framedelay = 0;
uint8_t frameflags = 0; uint8_t frameflags = 0;
} dukeanim_t; };
extern dukeanim_t* g_animPtr; extern dukeanim_t* g_animPtr;
extern TArray<dukeanim_t> g_Animations; extern TArray<dukeanim_t> g_Animations;

4
source/rr/src/savegame.h
View file

@ -31,7 +31,7 @@ BEGIN_RR_NS
#define SV_MINOR_VER 7 #define SV_MINOR_VER 7
#pragma pack(push,1) #pragma pack(push,1)
typedef struct struct savehead_t
{ {
char headerstr[11]; char headerstr[11];
uint8_t majorver, minorver, ptrsize; uint8_t majorver, minorver, ptrsize;
@ -51,7 +51,7 @@ typedef struct
// 286 bytes // 286 bytes
uint8_t getPtrSize() const { return ptrsize; } uint8_t getPtrSize() const { return ptrsize; }
} savehead_t; };
#pragma pack(pop) #pragma pack(pop)
int32_t sv_updatestate(int32_t frominit); int32_t sv_updatestate(int32_t frominit);