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

CON: Add user_map and m_user_map read-only userdefs.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6616 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2018-01-29 11:13:30 +00:00
parent 03fa42b17e
commit 0ca09c08da
4 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/duke3d/src/gamedef.cpp
View file

@ -1291,6 +1291,8 @@ const memberlabel_t UserdefsLabels[]=
{ "menutitle_pal", USERDEFS_MENUTITLE_PAL, 0, 0 }, { "menutitle_pal", USERDEFS_MENUTITLE_PAL, 0, 0 },
{ "slidebar_palselected", USERDEFS_SLIDEBAR_PALSELECTED, 0, 0 }, { "slidebar_palselected", USERDEFS_SLIDEBAR_PALSELECTED, 0, 0 },
{ "slidebar_paldisabled", USERDEFS_SLIDEBAR_PALDISABLED, 0, 0 }, { "slidebar_paldisabled", USERDEFS_SLIDEBAR_PALDISABLED, 0, 0 },
{ "user_map", USERDEFS_USER_MAP, 0, 0 },
{ "m_user_map", USERDEFS_M_USER_MAP, 0, 0 },
{ NULL, -1, 0, 0 } // END OF LIST { NULL, -1, 0, 0 } // END OF LIST
}; };

2
source/duke3d/src/gamedef.h
View file

@ -579,6 +579,8 @@ enum UserdefsLabel_t
USERDEFS_MENUTITLE_PAL, USERDEFS_MENUTITLE_PAL,
USERDEFS_SLIDEBAR_PALSELECTED, USERDEFS_SLIDEBAR_PALSELECTED,
USERDEFS_SLIDEBAR_PALDISABLED, USERDEFS_SLIDEBAR_PALDISABLED,
USERDEFS_USER_MAP,
USERDEFS_M_USER_MAP,
USERDEFS_END USERDEFS_END
}; };

2
source/duke3d/src/gamestructures.cpp
View file

@ -110,10 +110,12 @@ int32_t __fastcall VM_GetUserdef(int32_t labelNum)
case USERDEFS_M_PLAYER_SKILL: labelNum = ud.m_player_skill; break; case USERDEFS_M_PLAYER_SKILL: labelNum = ud.m_player_skill; break;
case USERDEFS_M_LEVEL_NUMBER: labelNum = ud.m_level_number; break; case USERDEFS_M_LEVEL_NUMBER: labelNum = ud.m_level_number; break;
case USERDEFS_M_VOLUME_NUMBER: labelNum = ud.m_volume_number; break; case USERDEFS_M_VOLUME_NUMBER: labelNum = ud.m_volume_number; break;
case USERDEFS_M_USER_MAP: labelNum = Menu_HaveUserMap(); break;
case USERDEFS_MULTIMODE: labelNum = ud.multimode; break; case USERDEFS_MULTIMODE: labelNum = ud.multimode; break;
case USERDEFS_PLAYER_SKILL: labelNum = ud.player_skill; break; case USERDEFS_PLAYER_SKILL: labelNum = ud.player_skill; break;
case USERDEFS_LEVEL_NUMBER: labelNum = ud.level_number; break; case USERDEFS_LEVEL_NUMBER: labelNum = ud.level_number; break;
case USERDEFS_VOLUME_NUMBER: labelNum = ud.volume_number; break; case USERDEFS_VOLUME_NUMBER: labelNum = ud.volume_number; break;
case USERDEFS_USER_MAP: labelNum = G_HaveUserMap(); break;
case USERDEFS_M_MARKER: labelNum = ud.m_marker; break; case USERDEFS_M_MARKER: labelNum = ud.m_marker; break;
case USERDEFS_MARKER: labelNum = ud.marker; break; case USERDEFS_MARKER: labelNum = ud.marker; break;
case USERDEFS_MOUSEFLIP: labelNum = ud.mouseflip; break; case USERDEFS_MOUSEFLIP: labelNum = ud.mouseflip; break;

3
source/duke3d/src/savegame.cpp
View file

@ -456,6 +456,9 @@ int32_t G_SavePlayer(savebrief_t & sv)
goto saveproblem; goto saveproblem;
} }
// temporary hack
ud.user_map = G_HaveUserMap();
#ifdef POLYMER #ifdef POLYMER
if (getrendermode() == REND_POLYMER) if (getrendermode() == REND_POLYMER)
polymer_resetlights(); polymer_resetlights();