openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

allow empty strings in talk node keys

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-01-23 20:28:43 -06:00
parent de45b379e3
commit cb9e43519f
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/scenedit/scen.townout.cpp
View File

@@ -3,6 +3,7 @@
#include <cstring> #include <cstring>
#include <stack> #include <stack>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/algorithm/string/trim.hpp>
#include "scen.global.hpp" #include "scen.global.hpp"
#include "scenario/scenario.hpp" #include "scenario/scenario.hpp"
#include "scenario/town.hpp" #include "scenario/town.hpp"
@@ -25,6 +26,8 @@
#include "fileio/fileio.hpp" #include "fileio/fileio.hpp"
#include "fileio/resmgr/res_dialog.hpp" #include "fileio/resmgr/res_dialog.hpp"
using boost::algorithm::trim;
extern short cen_x, cen_y, overall_mode; extern short cen_x, cen_y, overall_mode;
extern bool mouse_button_held,change_made; extern bool mouse_button_held,change_made;
extern short cur_viewing_mode; extern short cur_viewing_mode;
@@ -932,6 +935,16 @@ static bool check_talk_key(cDialog& me, std::string item_hit, bool losing) {
if(!losing) return true; if(!losing) return true;
std::string key = me[item_hit].getText(); std::string key = me[item_hit].getText();
bool passes = true; bool passes = true;
// An empty string is fine, it just means there's only one key.
if(key.empty()){
// But there needs to be at least one.
if(me["key1"].getText() == me["key2"].getText()){
showError("At least one of the words in this node must be filled.");
return false;
}
return true;
}
if(key.length() != 4) passes = false; if(key.length() != 4) passes = false;
for(size_t i = 0; i < 4; i++) { for(size_t i = 0; i < 4; i++) {
if(i < key.length() && !islower(key[i])) if(i < key.length() && !islower(key[i]))
@@ -1088,8 +1101,10 @@ static bool save_talk_node(cDialog& me, std::stack<node_ref_t>& talk_edit_stack,
talk_node.personality = me["who"].getTextAsNum(); talk_node.personality = me["who"].getTextAsNum();
std::string link = me["key1"].getText(); std::string link = me["key1"].getText();
if(link.empty()) link = " ";
std::copy(link.begin(), link.begin() + 4, talk_node.link1); std::copy(link.begin(), link.begin() + 4, talk_node.link1);
link = me["key2"].getText(); link = me["key2"].getText();
if(link.empty()) link = " ";
std::copy(link.begin(), link.begin() + 4, talk_node.link2); std::copy(link.begin(), link.begin() + 4, talk_node.link2);
for(int i = 0; i < 4; i++) { for(int i = 0; i < 4; i++) {
@@ -1118,9 +1133,12 @@ static void put_talk_node_in_dlog(cDialog& me, std::stack<node_ref_t>& talk_edit
std::string link = ""; std::string link = "";
for(int i = 0; i < 4; i++) link += talk_node.link1[i]; for(int i = 0; i < 4; i++) link += talk_node.link1[i];
// I don't want 4 spaces in the text fields
trim(link);
me["key1"].setText(link); me["key1"].setText(link);
link = ""; link = "";
for(int i = 0; i < 4; i++) link += talk_node.link2[i]; for(int i = 0; i < 4; i++) link += talk_node.link2[i];
trim(link);
me["key2"].setText(link); me["key2"].setText(link);
int iDescBase = int(talk_node.type) * 7; int iDescBase = int(talk_node.type) * 7;