teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-21 19:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Harden the skill CCMD to test for valid skill range for loaded game, not the maximum size of the gSkillNames[] array which may not be completely filled. Also print valid skill names in addition to numbers to help the user.

Browse source
This commit is contained in:
Mitch Richters 2021-11-16 21:46:43 +11:00 committed by Christoph Oelckers
parent 68d653efe9
commit da7de8f1d8
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
source/core/cheats.cpp
View file

@ -530,20 +530,35 @@ CCMD(skill)
} }
else if (argsCount == 2) else if (argsCount == 2)
{ {
// Get maximum valid skills for loaded game.
auto maxvalidskills = 0;
for (auto i = 0; i < MAXSKILLS; i++)
{
if (gSkillNames[i].IsNotEmpty())
{
maxvalidskills++;
}
}
// Test and set skill if its legal.
auto newSkill = atoi(argv[1]); auto newSkill = atoi(argv[1]);
if (newSkill >= 0 and newSkill < MAXSKILLS) if (newSkill >= 0 && newSkill < maxvalidskills)
{ {
g_nextskill = newSkill; g_nextskill = newSkill;
Printf("Skill will be changed for next game.\n"); Printf("Skill will be changed for next game.\n");
} }
else else
{ {
Printf("Please specify a skill level between 0 and %d\n", MAXSKILLS - 1); Printf("Please specify a skill level between 0 and %d\n", maxvalidskills - 1);
for (auto i = 0; i < maxvalidskills; i++)
{
Printf("%d = '%s'\n", i, GStrings.localize(gSkillNames[i]));
}
} }
} }
else if (argsCount > 2) else if (argsCount > 2)
{ {
Printf(PRINT_BOLD, "skill <newskill>: returns the current skill level, and optionally sets the skill level for the next game.\n"); Printf(PRINT_BOLD, "skill <level>: returns the current skill level, and optionally sets the skill level for the next game if provided and is valid.\n");
} }
} }
else else