Little bits
- Fix monster pic field stealing focus forever - Fix "ask to save" behaviour
This commit is contained in:
@@ -106,7 +106,8 @@ Never use a using namespace declaration in a header file. It's
|
||||
acceptable in a source file, but discouraged. Using declarations are
|
||||
fine in source files, but not in header files unless they're in an
|
||||
inline function or class declaration. Namespace aliases are encouraged
|
||||
for long namespaces.
|
||||
for long namespaces. When using std::bind within a function, always put
|
||||
a `using namespace std::placeholders;` line somewhere in the function.
|
||||
|
||||
Don't use nested classes.
|
||||
|
||||
|
@@ -3459,12 +3459,10 @@ bool save_check(std::string which_dlog) {
|
||||
return true;
|
||||
change_made = false;
|
||||
choice = cChoiceDlog(which_dlog, {"save","revert","cancel"}).show();
|
||||
if (choice == "okay")
|
||||
if(choice == "revert")
|
||||
return true;
|
||||
if (choice == "cancel") {
|
||||
change_made = false;
|
||||
else if(choice == "cancel")
|
||||
return false;
|
||||
}
|
||||
modify_lists();
|
||||
save_scenario();
|
||||
return true;
|
||||
|
@@ -540,7 +540,7 @@ bool check_monst_pic(cDialog& me, std::string id, bool losing, cMonster& store_m
|
||||
|
||||
}
|
||||
}
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool save_monst_info(cDialog& me, cMonster& store_monst) {
|
||||
|
Reference in New Issue
Block a user