Fix several more warnings
- As a side-effect, weapons with key skills other than the conventional three (edged, bashing, pole) are now fully supported (though the scenario editor UI doesn't yet support them)
This commit is contained in:
@@ -175,7 +175,7 @@ template<> pair<string,cPict*> cDialog::parse(Element& who /*pict*/){
|
||||
return p;
|
||||
}
|
||||
|
||||
string dlogStringFilter(string toFilter) {
|
||||
static string dlogStringFilter(string toFilter) {
|
||||
string filtered;
|
||||
bool found_nl = false;
|
||||
for(char c : toFilter) {
|
||||
|
@@ -357,6 +357,7 @@ void cTextField::handleInput(cKey key) {
|
||||
contents.insert(contents.begin() + insertionPoint, char(key.c));
|
||||
selectionPoint = ++insertionPoint;
|
||||
} else switch(key.k) {
|
||||
case key_enter: break; // Shouldn't be receiving this anyway
|
||||
// TODO: Implement all the other special keys
|
||||
case key_left: case key_word_left:
|
||||
if(haveSelection && !select) {
|
||||
|
@@ -13,7 +13,7 @@ void cStack::attachClickHandler(click_callback_t f) throw(xHandlerNotSupported)
|
||||
onClick = f;
|
||||
}
|
||||
|
||||
void cStack::attachFocusHandler(focus_callback_t f) throw(xHandlerNotSupported) {
|
||||
void cStack::attachFocusHandler(focus_callback_t) throw(xHandlerNotSupported) {
|
||||
throw xHandlerNotSupported(true);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user