Skip to content
Snippets Groups Projects
Commit 9eeaef2e authored by Claire Ellis's avatar Claire Ellis :speech_balloon:
Browse files

Exception made in R_SkinUsable() for player bot types

parent 5e8313e1
No related branches found
No related tags found
1 merge request!1383Multiplayer Bot Features (aka AddPlayer)
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 4 deletions
src/r_skins.c
+ 1
− 4
View file @ 9eeaef2e
...@@ -198,6 +198,7 @@ boolean R_SkinUsable(INT32 playernum, INT32 skinnum) ...@@ -198,6 +198,7 @@ boolean R_SkinUsable(INT32 playernum, INT32 skinnum)
|| (Playing() && (R_SkinAvailable(mapheaderinfo[gamemap-1]->forcecharacter) == skinnum)) // Force 1. || (Playing() && (R_SkinAvailable(mapheaderinfo[gamemap-1]->forcecharacter) == skinnum)) // Force 1.
|| (netgame && (cv_forceskin.value == skinnum)) // Force 2. || (netgame && (cv_forceskin.value == skinnum)) // Force 2.
|| (metalrecording && skinnum == 5) // Force 3. || (metalrecording && skinnum == 5) // Force 3.
|| players[playernum].bot //Force (player is a bot)
); );
} }
...@@ -511,10 +512,6 @@ static boolean R_ProcessPatchableFields(skin_t *skin, char *stoken, char *value) ...@@ -511,10 +512,6 @@ static boolean R_ProcessPatchableFields(skin_t *skin, char *stoken, char *value)
GETFLAG(MULTIABILITY) GETFLAG(MULTIABILITY)
GETFLAG(NONIGHTSROTATION) GETFLAG(NONIGHTSROTATION)
GETFLAG(NONIGHTSSUPER) GETFLAG(NONIGHTSSUPER)
GETFLAG(NOSUPERSPRITES)
GETFLAG(NOSUPERJUMPBOOST)
GETFLAG(CANBUSTWALLS)
GETFLAG(NOSHIELDABILITY)
#undef GETFLAG #undef GETFLAG
else // let's check if it's a sound, otherwise error out else // let's check if it's a sound, otherwise error out
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment