zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-03-13 04:24:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Move PlayerUseItem() wrapper into DDukePlayer.

Browse source
This commit is contained in:
Mitchell Richters 2023-10-03 19:29:12 +11:00
parent ab47cf185e
commit cd755a8336
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/games/duke/src/inlines.h
View file

@ -105,12 +105,6 @@ inline bool isIn(int value, const std::initializer_list<int>& list)
return false; return false;
} }
// these are mainly here to avoid directly accessing the input data so that it can be more easily refactored later.
inline void PlayerSetItemUsed(int pl, int num)
{
getPlayer(pl)->cmd.ucmd.setItemUsed(num - 1);
}
inline void clearfriction() inline void clearfriction()
{ {
for (int i = 0; i != -1; i = connectpoint2[i]) for (int i = 0; i != -1; i = connectpoint2[i])

4
source/games/duke/src/input.cpp
View file

@ -123,9 +123,9 @@ void hud_input(int plnum)
{ {
SetGameVarID(g_iReturnVarID, 0, nullptr, plnum); SetGameVarID(g_iReturnVarID, 0, nullptr, plnum);
OnEvent(EVENT_INVENTORY, plnum, nullptr, -1); OnEvent(EVENT_INVENTORY, plnum, nullptr, -1);
if (GetGameVarID(g_iReturnVarID, nullptr, plnum).value() == 0) if (GetGameVarID(g_iReturnVarID, nullptr, plnum).value() == 0 && p->inven_icon > ICON_NONE && p->inven_icon <= ICON_HEATS)
{ {
if (p->inven_icon > ICON_NONE && p->inven_icon <= ICON_HEATS) PlayerSetItemUsed(plnum, p->inven_icon); p->useItem(p->inven_icon);
} }
} }

5
source/games/duke/src/types.h
View file

@ -404,6 +404,11 @@ public:
{ {
return cmd.ucmd.isItemUsed(num - 1); return cmd.ucmd.isItemUsed(num - 1);
} }
inline void useItem(int num)
{
cmd.ucmd.setItemUsed(num - 1);
}
}; };
struct Cycler struct Cycler