diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c6ad59040..6c934e01b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -587,7 +587,7 @@ if(${SRB2_CONFIG_SATURNJOIN}) add_definitions(-DDOSATURNJOIN) endif() -if(${SRB2_CONFIG_HWRENDER} AND ${SRB2_CONFIG_SCREENFBO}) +if(${SRB2_CONFIG_PHOBOS}) add_definitions(-DPHOBOS_BUILD) endif() diff --git a/src/doomdef.h b/src/doomdef.h index 7da340b5d..35338d685 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -144,8 +144,8 @@ extern char logfilename[1024]; #define CLIENTNAMEW L"Saturn lugdev Zzz..." #endif -#define VERSIONSTRING CLIENTNAME " v10" -#define VERSIONSTRINGW CLIENTNAMEW L" v10" +#define VERSIONSTRING CLIENTNAME " v10.1" +#define VERSIONSTRINGW CLIENTNAMEW L" v10.1" #define SATURN_TESTING // comment out for saturn release builds! diff --git a/src/m_menu.c b/src/m_menu.c index 21915660a..9d0c4466c 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -9907,6 +9907,7 @@ static void M_DrawLocalSkinMenu(void) V_DrawFill(mx + 220 - (charw/2), my+54, charw, 84, 239); #undef charw + // FIXME: is skins[displayskin.localnum] even correct? UINT8 *colormap = R_GetLocalTranslationColormap(&skins[displayskin.localnum], (displayskin.localskin ? &localskins[displayskin.localnum] : NULL), cv_playercolor.value, GTC_MENUCACHE, displayskin.localskin); V_DrawMappedPatch(mx, my+50, 0, (patch_t *)W_CachePatchName(displayskin.facewant, PU_PATCH), colormap); @@ -9924,7 +9925,7 @@ static void M_DrawLocalSkinMenu(void) my += 120; #ifdef HWRENDER - md2_t *md2 = (displayskin.localskin ? &md2_localplayermodels[skintodisplay] : &md2_playermodels[skintodisplay]); + md2_t *md2 = (displayskin.localskin ? &md2_localplayermodels[displayskin.localnum] : &md2_playermodels[skintodisplay]); // if we have 3d models enabled and a model exists // try to show it instead of the sprite