Merge branch 'paul' into AL/races-potions
This commit is contained in:
21
src/main.cc
21
src/main.cc
@ -1,4 +1,6 @@
|
||||
#include "game.h"
|
||||
#include <iostream>
|
||||
|
||||
#include "cc3k.h"
|
||||
#include "arguments.h"
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
@ -14,14 +16,19 @@ int main(int argc, char **argv) {
|
||||
if (enabled_features &
|
||||
(FEATURE_PANIC | FEATURE_PANIC_FILE |
|
||||
FEATURE_CONFLICT | FEATURE_PANIC_SEED)) {
|
||||
panic_args(enabled_features);
|
||||
return RETURN_PANICKED;
|
||||
}
|
||||
panic_args(enabled_features);
|
||||
return RETURN_PANICKED;
|
||||
} else if (enabled_features & FEATURE_LIST_ARGS) {
|
||||
print_args_list();
|
||||
return RETURN_FINE;
|
||||
}
|
||||
|
||||
game game_proc(enabled_features, *in, *out, *log, *rng);
|
||||
// CC3K game_proc(enabled_features, *in, *out, *log, *rng);
|
||||
|
||||
while (game_proc.run() != game_status::terminated)
|
||||
out->render();
|
||||
// while (game_proc.run() != game_status::terminated) {
|
||||
// out->render();
|
||||
// out->clear();
|
||||
// }
|
||||
|
||||
return RETURN_FINE;
|
||||
}
|
||||
|
Reference in New Issue
Block a user