zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- everything works again, some changes were apparently lost in the last merge.

Browse source
This commit is contained in:
Christoph Oelckers 2019-09-19 23:39:35 +02:00
parent 8074d8251e
commit 23bc385393
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/rr/src/game.cpp
View file

@ -7526,10 +7526,10 @@ static void G_Startup(void)
if (g_modDir[0] != '/' && (cwd = getcwd(NULL, 0))) if (g_modDir[0] != '/' && (cwd = getcwd(NULL, 0)))
{ {
Bchdir(g_modDir); Bchdir(g_modDir);
if (artLoadFiles("tiles000.art",MAXCACHE1DSIZE) < 0) if (artLoadFiles("tiles%03d.art",MAXCACHE1DSIZE) < 0)
{ {
Bchdir(cwd); Bchdir(cwd);
if (artLoadFiles("tiles000.art",MAXCACHE1DSIZE) < 0) if (artLoadFiles("tiles%03d.art",MAXCACHE1DSIZE) < 0)
G_GameExit("Failed loading art."); G_GameExit("Failed loading art.");
} }
Bchdir(cwd); Bchdir(cwd);
@ -7538,7 +7538,7 @@ static void G_Startup(void)
#endif #endif
} }
else if (artLoadFiles("tiles000.art",MAXCACHE1DSIZE) < 0) else if (artLoadFiles("tiles%03d.art",MAXCACHE1DSIZE) < 0)
G_GameExit("Failed loading art."); G_GameExit("Failed loading art.");
} }

13
source/rr/src/osdfuncs.cpp
View file

@ -36,8 +36,17 @@ float osdscale = 1.f, osdrscale = 1.f;
#endif #endif
float osdscale2 = 1.f, osdrscale2 = 1.f; float osdscale2 = 1.f, osdrscale2 = 1.f;
#define OSD_SCALE(x) (int32_t)Blrintf(osdscale*osdscale2*(float)(x)) template<class valtype>
#define OSD_SCALEDIV(x) (int32_t)Blrintf((float)(x) * osdrscale * osdrscale2) int32_t OSD_SCALE(valtype x)
{
return (int32_t)Blrintf(osdscale * osdscale2 * (float)(x));
}
template<class valtype>
int32_t OSD_SCALEDIV(valtype x)
{
return (int32_t)Blrintf((float)(x)* osdrscale * osdrscale2);
}
#define OSDCHAR_WIDTH (tilesiz[STARTALPHANUM + 'W' - '!'].x) #define OSDCHAR_WIDTH (tilesiz[STARTALPHANUM + 'W' - '!'].x)
#define OSDCHAR_HEIGHT (tilesiz[STARTALPHANUM + 'W' - '!'].y + 1) #define OSDCHAR_HEIGHT (tilesiz[STARTALPHANUM + 'W' - '!'].y + 1)