zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 11:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Pass the parameters of the warp and skill cheats to EVENT_ACTIVATECHEAT through userdef[].m_* and read them back afterward.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6445 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-09-23 03:17:22 +00:00
parent f203ca78a2
commit b713b8489d
1 changed files with 86 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
source/duke3d/src/cheats.cpp
View file

@ -314,8 +314,67 @@ void G_DoCheats(void)
FOUNDCHEAT:; FOUNDCHEAT:;
if (cheatNum == CHEAT_SCOTTY)
{
size_t const i = Bstrlen(CheatStrings[cheatNum])-3+VOLUMEONE;
if (!consoleCheat)
{
// JBF 20030914
int32_t volnume, levnume;
if (VOLUMEALL)
{
volnume = cheatbuf[i] - '0';
levnume = (cheatbuf[i+1] - '0')*10+(cheatbuf[i+2]-'0');
}
else
{
volnume = cheatbuf[i] - '0';
levnume = cheatbuf[i+1] - '0';
}
volnume--;
levnume--;
ud.m_volume_number = volnume;
ud.m_level_number = levnume;
}
else
{
// JBF 20030914
ud.m_volume_number = osdcmd_cheatsinfo_stat.volume;
ud.m_level_number = osdcmd_cheatsinfo_stat.level;
}
}
else if (cheatNum == CHEAT_SKILL)
{
if (!consoleCheat)
{
size_t const i = Bstrlen(CheatStrings[cheatNum])-1;
ud.m_player_skill = cheatbuf[i] - '1';
}
else
{
ud.m_player_skill = osdcmd_cheatsinfo_stat.volume;
}
}
int const originalCheatNum = cheatNum;
cheatNum = VM_OnEventWithReturn(EVENT_ACTIVATECHEAT, pPlayer->i, myconnectindex, cheatNum); cheatNum = VM_OnEventWithReturn(EVENT_ACTIVATECHEAT, pPlayer->i, myconnectindex, cheatNum);
// potential cleanup
if (originalCheatNum != cheatNum)
{
if (originalCheatNum == CHEAT_SCOTTY)
{
ud.m_volume_number = ud.volume_number;
ud.m_level_number = ud.level_number;
}
else if (originalCheatNum == CHEAT_SKILL)
{
ud.m_player_skill = ud.player_skill;
}
}
{ {
switch (cheatNum) switch (cheatNum)
{ {
@ -463,60 +522,36 @@ void G_DoCheats(void)
} }
case CHEAT_SCOTTY: case CHEAT_SCOTTY:
case CHEAT_SKILL:
if (cheatNum == CHEAT_SCOTTY)
{ {
size_t const i = Bstrlen(CheatStrings[cheatNum])-3+VOLUMEONE; int32_t const volnume = ud.m_volume_number, levnume = ud.m_level_number;
if (!consoleCheat)
if ((!VOLUMEONE || volnume == 0) && (unsigned)volnume < (unsigned)g_volumeCnt &&
(unsigned)levnume < MAXLEVELS && g_mapInfo[volnume*MAXLEVELS + levnume].filename != NULL)
{ {
// JBF 20030914 ud.volume_number = volnume;
int16_t volnume, levnume; ud.level_number = levnume;
if (VOLUMEALL)
{ #if 0
volnume = cheatbuf[i] - '0'; if (numplayers > 1 && g_netServer)
levnume = (cheatbuf[i+1] - '0')*10+(cheatbuf[i+2]-'0'); Net_NewGame(volnume, levnume);
}
else else
{ #endif
volnume = cheatbuf[i] - '0'; pPlayer->gm |= MODE_RESTART;
levnume = cheatbuf[i+1] - '0';
} }
volnume--;
levnume--;
if ((VOLUMEONE && volnume > 0) || volnume > g_volumeCnt-1 ||
levnume >= MAXLEVELS || g_mapInfo[volnume *MAXLEVELS+levnume].filename == NULL)
{
end_cheat(pPlayer); end_cheat(pPlayer);
return; return;
} }
ud.m_volume_number = ud.volume_number = volnume; case CHEAT_SKILL:
ud.m_level_number = ud.level_number = levnume; ud.player_skill = ud.m_player_skill;
}
else #if 0
{ if (numplayers > 1 && g_netServer)
// JBF 20030914
ud.m_volume_number = ud.volume_number = osdcmd_cheatsinfo_stat.volume;
ud.m_level_number = ud.level_number = osdcmd_cheatsinfo_stat.level;
}
}
else
{
if (!consoleCheat)
{
size_t const i = Bstrlen(CheatStrings[cheatNum])-1;
ud.m_player_skill = ud.player_skill = cheatbuf[i] - '1';
}
else
{
ud.m_player_skill = ud.player_skill = osdcmd_cheatsinfo_stat.volume;
}
}
/*if (numplayers > 1 && g_netServer)
Net_NewGame(ud.m_volume_number, ud.m_level_number); Net_NewGame(ud.m_volume_number, ud.m_level_number);
else*/ pPlayer->gm |= MODE_RESTART; else
#endif
pPlayer->gm |= MODE_RESTART;
end_cheat(pPlayer); end_cheat(pPlayer);
return; return;