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

- fixed compilation.

Browse source
This commit is contained in:
Christoph Oelckers 2019-12-29 22:47:40 +01:00
parent cdb08f22dd
commit f1891c7750
9 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/blood/src/blood.cpp
View file

@ -1693,7 +1693,7 @@ static int parsedefinitions_game(scriptfile *pScript, int firstPass)
if (have_size) if (have_size)
{ {
vec2_16_t const orig_size = tileGetSize(tile); vec2_16_t const orig_size = tilesiz[tile];
if (orig_size.x != tile_size.x && orig_size.y != tile_size.y) if (orig_size.x != tile_size.x && orig_size.y != tile_size.y)
{ {
// initprintf("Size of tile %d doesn't match! Size: (%d, %d), Expected: (%d, %d)\n", tile, orig_size.x, orig_size.y, tile_size.x, tile_size.y); // initprintf("Size of tile %d doesn't match! Size: (%d, %d), Expected: (%d, %d)\n", tile, orig_size.x, orig_size.y, tile_size.x, tile_size.y);

2
source/build/src/defs.cpp
View file

@ -761,7 +761,7 @@ static int32_t defsparser(scriptfile *script)
if (have_crc32) if (have_crc32)
{ {
int32_t const orig_crc32 = tileCRC(tile); int32_t const orig_crc32 = tileGetCRC32(tile);
if (orig_crc32 != tile_crc32) if (orig_crc32 != tile_crc32)
{ {
// initprintf("CRC32 of tile %d doesn't match! CRC32: %d, Expected: %d\n", tile, orig_crc32, tile_crc32); // initprintf("CRC32 of tile %d doesn't match! CRC32: %d, Expected: %d\n", tile, orig_crc32, tile_crc32);

2
source/build/src/mdsprite.cpp
View file

@ -1736,7 +1736,7 @@ static int32_t polymost_md3draw(md3model_t *m, tspriteptr_t tspr)
VSMatrix texmat(0); VSMatrix texmat(0);
texmat.translate(xpanning, ypanning, 1.0f); texmat.translate(xpanning, ypanning, 1.0f);
if (!(tspr->extra&TSPR_EXTRA_MDHACK)) if (tspr->clipdist & TSPR_FLAGS_MDHACK)
{ {
//POGOTODO: if we add support for palette indexing on model skins, the texture for the palswap could be setup here //POGOTODO: if we add support for palette indexing on model skins, the texture for the palswap could be setup here

2
source/common/textures/buildtiles.cpp
View file

@ -457,7 +457,7 @@ void BuildTiles::tileSetExternal(int tilenum, int width, int height, uint8_t* da
// //
//========================================================================== //==========================================================================
int32_t tileCRC(int tileNum) int32_t tileGetCRC32(int tileNum)
{ {
if ((unsigned)tileNum >= (unsigned)MAXTILES) return 0; if ((unsigned)tileNum >= (unsigned)MAXTILES) return 0;
auto tile = TileFiles.tiles[tileNum]; auto tile = TileFiles.tiles[tileNum];

2
source/common/textures/textures.h
View file

@ -553,7 +553,7 @@ struct BuildTiles
void InvalidateTile(int num); void InvalidateTile(int num);
}; };
int tileCRC(int tileNum); int tileGetCRC32(int tileNum);
int tileImportFromTexture(const char* fn, int tilenum, int alphacut, int istexture); int tileImportFromTexture(const char* fn, int tilenum, int alphacut, int istexture);
void tileCopy(int tile, int tempsource, int temppal, int xoffset, int yoffset, int flags); void tileCopy(int tile, int tempsource, int temppal, int xoffset, int yoffset, int flags);
void tileSetDummy(int tile, int width, int height); void tileSetDummy(int tile, int width, int height);

9
source/duke3d/src/common_game.h
View file

@ -7,7 +7,6 @@
#ifndef EDUKE32_COMMON_GAME_H_ #ifndef EDUKE32_COMMON_GAME_H_
#define EDUKE32_COMMON_GAME_H_ #define EDUKE32_COMMON_GAME_H_
#include "build.h"
#include "gamecontrol.h" #include "gamecontrol.h"
BEGIN_DUKE_NS BEGIN_DUKE_NS
@ -63,16 +62,10 @@ static inline void Duke_ApplySpritePropertiesToTSprite(tspriteptr_t tspr, usprit
EDUKE32_STATIC_ASSERT(CSTAT_SPRITE_RESERVED5 >> 11 == TSPR_FLAGS_INVISIBLE_WITH_SHADOW); EDUKE32_STATIC_ASSERT(CSTAT_SPRITE_RESERVED5 >> 11 == TSPR_FLAGS_INVISIBLE_WITH_SHADOW);
auto const cstat = spr->cstat; auto const cstat = spr->cstat;
tspr->clipdist |= ((cstat & CSTAT_SPRITE_RESERVED1) >> 9) | ((cstat & (CSTAT_SPRITE_RESERVED4|CSTAT_SPRITE_RESERVED5)) >> 11); tspr->clipdist |= ((cstat & CSTAT_SPRITE_RESERVED1) >> 9) | ((cstat & (CSTAT_SPRITE_RESERVED4 | CSTAT_SPRITE_RESERVED5)) >> 11);
} }
void Duke_CommonCleanup(void); void Duke_CommonCleanup(void);
#if defined HAVE_FLAC || defined HAVE_VORBIS
# define FORMAT_UPGRADE_ELIGIBLE
extern int g_maybeUpgradeSoundFormats;
extern buildvfs_kfd S_OpenAudio(const char *fn, char searchfirst, uint8_t ismusic);
#else
# define S_OpenAudio(fn, searchfirst, ismusic) kopen4loadfrommod(fn, searchfirst)
END_DUKE_NS END_DUKE_NS
#endif #endif

2
source/duke3d/src/gamevars.cpp
View file

@ -1219,8 +1219,6 @@ static void Gv_AddSystemVars(void)
} }
#endif #endif
char aszBuf[64];
for (int i=0; i<MAX_WEAPONS; i++) for (int i=0; i<MAX_WEAPONS; i++)
{ {
ADDWEAPONVAR(i, Clip); ADDWEAPONVAR(i, Clip);

2
source/exhumed/src/exhumed.h
View file

@ -249,8 +249,6 @@ extern int bVanilla;
extern double g_frameDelay; extern double g_frameDelay;
static inline double calcFrameDelay(unsigned int const maxFPS) { return maxFPS ? timerGetPerformanceFrequency() / (double)maxFPS : 0.0; }
enum { enum {
kPalNormal = 0, kPalNormal = 0,
kPalNoDim, kPalNoDim,

2
source/exhumed/src/menu.cpp
View file

@ -335,7 +335,7 @@ void menu_DoPlasma()
//uint32_t t = time(0) << 16; //uint32_t t = time(0) << 16;
//uint32_t t2 = time(0) | t; //uint32_t t2 = time(0) | t;
nRandom = timerGetPerformanceCounter(); nRandom = timerGetTicksU64();
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {