X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.c;h=86f8507869cd3e28899b67dde5ed97ed59a9b348;hb=6ed13cec71fa9b348f609707c2fc02978609b249;hp=88264072da69f3673bda0b27e2e84b01a11e8ae3;hpb=7290dec4219eaa2325aa00ef6139f715743dba3a;p=plomrogue
diff --git a/src/main.c b/src/main.c
index 8826407..86f8507 100644
--- a/src/main.c
+++ b/src/main.c
@@ -26,7 +26,10 @@
#include "rrand.h" /* for rrand(), rrand_seed() */
#include "rexit.h" /* for exit_game(), exit_err() */
#include "command_db.h" /* for init_command_db(), is_command_id_shortdsc() */
-#include "control.h" /* for *_control(), get_available_keycode_to_action() */
+#include "control.h" /* for control_by_id(), player_control(),
+ * get_available_keycode_to_action()
+ */
+#include "map_object_actions.h" /* for init_map_object_actions() */
@@ -35,8 +38,11 @@ int main(int argc, char *argv[])
char * f_name = "main()";
world.turn = 0; /* Turns to 1 when map and objects are initalized. */
+ /* Initialize commands and map object actions. */
init_command_db();
set_cleanup_flag(CLEANUP_COMMAND_DB);
+ init_map_object_actions();
+ set_cleanup_flag(CLEANUP_MAPOBJACTS);
/* Check for corrupted savefile / recordfile savings. */
char * recordfile = "record";
@@ -150,12 +156,10 @@ int main(int argc, char *argv[])
curs_set(0);
keypad(screen, TRUE);
raw();
- char * err_winmem = "Trouble with init_win_meta() in main ().";
- exit_err(init_win_meta(screen, &world.wmeta), err_winmem);
+ init_win_meta(screen);
set_cleanup_flag(CLEANUP_WIN_META);
- load_interface_conf(/*&world*/);
+ load_interface_conf();
set_cleanup_flag(CLEANUP_INTERFACE_CONF);
- err_winmem = "Trouble with draw_all_wins() in main().";
/* Focus map on player. */
struct MapObj * player = get_player();
@@ -180,16 +184,17 @@ int main(int argc, char *argv[])
{
break;
}
- if (is_command_id_shortdsc(action, "drop"))
+ if ( is_command_id_shortdsc(action, "drop")
+ || is_command_id_shortdsc(action, "use"))
{
world.inventory_select = getc(file);
}
- record_control(action);
+ player_control_by_id(action);
}
}
while (1)
{
- draw_all_wins(world.wmeta);
+ draw_all_wins();
key = getch();
wc = get_winconf_by_win(world.wmeta->active);
if ( (1 == wc->view && wingeom_control(key))
@@ -203,11 +208,12 @@ int main(int argc, char *argv[])
action = getc(file);
if (EOF != action)
{
- if (is_command_id_shortdsc(action, "drop"))
+ if ( is_command_id_shortdsc(action, "drop")
+ || is_command_id_shortdsc(action, "use"))
{
world.inventory_select = getc(file);
}
- record_control(action);
+ player_control_by_id(action);
}
}
else if (meta_control(key))
@@ -224,25 +230,15 @@ int main(int argc, char *argv[])
while (1)
{
save_game();
- draw_all_wins(world.wmeta);
+ draw_all_wins();
key = getch();
wc = get_winconf_by_win(world.wmeta->active);
- if (1 == wc->view && wingeom_control(key))
- {
- continue;
- }
- else if (2 == wc->view && winkeyb_control(key))
- {
- continue;
- }
-
if ( (1 == wc->view && wingeom_control(key))
|| (2 == wc->view && winkeyb_control(key))
- || (0 != player->lifepoints && player_control(key)))
+ || (0 != player->lifepoints && player_control_by_key(key)))
{
continue;
}
-
if (meta_control(key))
{
exit_game();