stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-26 04:11:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'uint8-wads-and-skins' into 'next'

Browse source 
Increase maximum WAD and skin counts

See merge request KartKrew/Kart-Public!291
This commit is contained in:
Sal 2022-08-22 23:47:05 +00:00
commit 9160c6bef4
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/doomdef.h
View file

@ -227,7 +227,7 @@ extern char logfilename[1024];
// NOTE: it needs more than this to increase the number of players... // NOTE: it needs more than this to increase the number of players...
#define MAXPLAYERS 16 #define MAXPLAYERS 16
#define MAXSKINS 128 #define MAXSKINS 255
#define PLAYERSMASK (MAXPLAYERS-1) #define PLAYERSMASK (MAXPLAYERS-1)
#define MAXPLAYERNAME 21 #define MAXPLAYERNAME 21

2
src/m_menu.c
View file

@ -2381,7 +2381,7 @@ static void M_ChangeCvar(INT32 choice)
{ {
if (cv == &cv_playercolor) if (cv == &cv_playercolor)
{ {
SINT8 skinno = R_SkinAvailable(cv_chooseskin.string); INT32 skinno = R_SkinAvailable(cv_chooseskin.string);
if (skinno != -1) if (skinno != -1)
CV_SetValue(cv,skins[skinno].prefcolor); CV_SetValue(cv,skins[skinno].prefcolor);
return; return;

7
src/w_wad.h
View file

@ -77,9 +77,10 @@ typedef struct
// ========================================================================= // =========================================================================
#define MAX_WADPATH 512 #define MAX_WADPATH 512
#define MAX_WADFILES 127 // maximum of wad files used at the same time #define MAX_WADFILES 255 // maximum of wad files used at the same time
// Replay code relies on it being an UINT8 and, just to be safe, in case some wad counter somewhere is a SINT8, you should NOT go above 127 here if you're lazy like me. // Replay code relies on it being an UINT8. There are no SINT8s handling WAD indices, though.
// Besides, are there truly 127 wads worth your interrest? // Can be set all the way up to 255 but not 256,
// because an UINT8 will never be >= 256, probably breaking some conditionals.
#define lumpcache_t void * #define lumpcache_t void *