thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge public master

Browse source
This commit is contained in:
Eidolon 2025-08-18 16:29:56 -05:00
commit 6e8fdf7f59
4 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/hardware/hw_md2.c
View file

@ -495,7 +495,10 @@ void HWR_InitModels(void)
size_t i;
INT32 s;
FILE *f;
char name[24], filename[32];
char name[26], filename[32];
// name[24] is used to check for names in the models.dat file that match with sprites or player skins
// sprite names are always 4 characters long, and names is for player skins can be up to 19 characters long
// PLAYERMODELPREFIX is 6 characters long
float scale, offset;
size_t prefixlen;

2
src/lua_baselib.c
View file

@ -2832,7 +2832,7 @@ static int lib_sStartSound(lua_State *L)
if (!player || P_IsPartyPlayer(player))
{
if (hud_running || hook_cmd_running)
origin = NULL; // HUD rendering and CMD building startsound shouldn't have an origin, just remove it instead of having a retarded error.
origin = NULL; // HUD rendering and CMD building startsound shouldn't have an origin, just remove it instead of having a [Hyperlink Blocked] error.
S_StartSound(origin, sound_id);
}

14
src/m_misc.cpp
View file

@ -917,7 +917,7 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png
"Unknown";
#endif
char rendermodetxt[9];
char maptext[8];
char maptext[MAXMAPLUMPNAME];
char lvlttltext[48];
char locationtxt[40];
char ctrevision[40];
@ -937,12 +937,16 @@ static void M_PNGText(png_structp png_ptr, png_infop png_info_ptr, PNG_CONST png
break;
}
#if 0
if (gamestate == GS_LEVEL)
snprintf(maptext, 8, "%s", G_BuildMapName(gamemap));
{
const char* mapname = G_BuildMapName(gamemap);
if (mapname)
snprintf(maptext, sizeof(maptext), "%s", mapname);
else
snprintf(maptext, sizeof(maptext), "Unknown");
}
else
#endif
snprintf(maptext, 8, "Unknown");
snprintf(maptext, sizeof(maptext), "Unknown");
if (gamestate == GS_LEVEL && mapheaderinfo[gamemap-1]->lvlttl[0] != '\0')
snprintf(lvlttltext, 48, "%s%s%s",

1
src/p_saveg.cpp
View file

@ -5125,6 +5125,7 @@ static thinker_t* LoadThwompThinker(savebuffer_t *save, actionf_p1 thinker)
ht->delay = READINT32(save->p);
ht->tag = READINT16(save->p);
ht->sound = READUINT16(save->p);
ht->initDelay = READINT32(save->p);
if (ht->sector)
{