Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Merge branch 'showmap' into 'master'
Some checks are pending
Build and test / Windows (2019) (push) Blocked by required conditions
Details
Build and test / Windows (2022) (push) Blocked by required conditions
Details
Build and test / Ubuntu (push) Waiting to run
Details
Build and test / MacOS (push) Waiting to run
Details
Build and test / Read .env file and expose it as output (push) Waiting to run
Details

Browse source 
Require a non-empty argument in ShowMap (#8466)

Closes #8466

See merge request OpenMW/openmw!4649
This commit is contained in:
Alexei Kotov 2025-04-28 09:30:03 +03:00
commit 7b47019123
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwscript/guiextensions.cpp
View file

@ -115,6 +115,11 @@ namespace MWScript
std::string_view cell = runtime.getStringLiteral(runtime[0].mInteger); std::string_view cell = runtime.getStringLiteral(runtime[0].mInteger);
runtime.pop(); runtime.pop();
// In Morrowind, using an empty string either errors out (e.g. console) or kills the game
// so it should be reasonable to interrupt the script
if (cell.empty())
throw std::runtime_error("ShowMap substring must not be empty");
// "Will match complete or partial cells, so ShowMap, "Vivec" will show cells Vivec and Vivec, Fred's // "Will match complete or partial cells, so ShowMap, "Vivec" will show cells Vivec and Vivec, Fred's
// House as well." http://www.uesp.net/wiki/Tes3Mod:ShowMap // House as well." http://www.uesp.net/wiki/Tes3Mod:ShowMap