Catch a system error that OSX's SFML produces since it's at the end and looks like just a cleanup mistake.
This commit is contained in:
parent
b7948f8154
commit
b68fd249ca
1 changed files with 38 additions and 30 deletions
68
main.cpp
68
main.cpp
|
@ -2,41 +2,49 @@
|
||||||
#include "textures.hpp"
|
#include "textures.hpp"
|
||||||
#include "sound.hpp"
|
#include "sound.hpp"
|
||||||
#include "autowalker.hpp"
|
#include "autowalker.hpp"
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
int main(int argc, char* argv[]) {
|
int main(int argc, char* argv[]) {
|
||||||
textures::init();
|
try {
|
||||||
sound::init();
|
textures::init();
|
||||||
sound::mute(false);
|
sound::init();
|
||||||
gui::FSM main;
|
sound::mute(false);
|
||||||
main.event(gui::Event::STARTED);
|
gui::FSM main;
|
||||||
Autowalker walker(main);
|
main.event(gui::Event::STARTED);
|
||||||
|
Autowalker walker(main);
|
||||||
|
|
||||||
sound::play("ambient_1", true);
|
sound::play("ambient_1", true);
|
||||||
|
|
||||||
if(argc > 1 && argv[1][0] == 't') {
|
if(argc > 1 && argv[1][0] == 't') {
|
||||||
walker.start_autowalk();
|
walker.start_autowalk();
|
||||||
}
|
|
||||||
|
|
||||||
while(main.active()) {
|
|
||||||
main.render();
|
|
||||||
|
|
||||||
// ZED: need to sort out how to deal with this in the FSM
|
|
||||||
if(main.in_state(gui::State::IDLE)
|
|
||||||
|| main.in_state(gui::State::NEXT_LEVEL)
|
|
||||||
|| main.in_state(gui::State::MAPPING)
|
|
||||||
|| main.in_state(gui::State::IN_COMBAT))
|
|
||||||
{
|
|
||||||
if(main.autowalking) {
|
|
||||||
walker.autowalk();
|
|
||||||
} else {
|
|
||||||
main.keyboard_mouse();
|
|
||||||
}
|
|
||||||
} else{
|
|
||||||
main.event(gui::Event::TICK);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
main.handle_world_events();
|
while(main.active()) {
|
||||||
}
|
main.render();
|
||||||
|
|
||||||
return 0;
|
// ZED: need to sort out how to deal with this in the FSM
|
||||||
|
if(main.in_state(gui::State::IDLE)
|
||||||
|
|| main.in_state(gui::State::NEXT_LEVEL)
|
||||||
|
|| main.in_state(gui::State::MAPPING)
|
||||||
|
|| main.in_state(gui::State::IN_COMBAT))
|
||||||
|
{
|
||||||
|
if(main.autowalking) {
|
||||||
|
walker.autowalk();
|
||||||
|
} else {
|
||||||
|
main.keyboard_mouse();
|
||||||
|
}
|
||||||
|
} else{
|
||||||
|
main.event(gui::Event::TICK);
|
||||||
|
}
|
||||||
|
|
||||||
|
main.handle_world_events();
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
} catch(const std::system_error& e) {
|
||||||
|
std::cout << "WARNING: On OSX you'll get this error on shutdown.\n";
|
||||||
|
std::cout << "Caught system_error with code "
|
||||||
|
"[" << e.code() << "] meaning "
|
||||||
|
"[" << e.what() << "]\n";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue