X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=5cb4a87a939dafec2ac154d1af3b08d7ed6e3d36;hb=51a4d7bd3abbbf10f0bf08643eda0a4aa12e0173;hp=4ebe719b646947b0cb1e6d423559d8230a94e168;hpb=50e059eff8da3d02abe11e16160a1300ea1af3b6;p=open-adventure.git diff --git a/main.c b/main.c index 4ebe719..5cb4a87 100644 --- a/main.c +++ b/main.c @@ -598,23 +598,22 @@ static bool playermove(token_t verb, int motion) if (T_TERMINATE(travel[travel_entry]) || travel[travel_entry].motion == motion) break; if (travel[travel_entry].stop) { - /* FIXME: Magic numbers! */ /* Couldn't find an entry matching the motion word passed * in. Various messages depending on word given. */ int spk = CANT_APPLY; - if (motion >= MOT_43 && motion <= MOT_50) + if (motion >= EAST && motion <= NW) spk = BAD_DIRECTION; - if (motion == MOT_29 || motion == MOT_30) + if (motion == UP || motion == DOWN) spk = BAD_DIRECTION; - if (motion == MOT_7 || motion == MOT_36 || motion == MOT_37) + if (motion == FORWARD || motion == LEFT || motion == RIGHT) spk = UNSURE_FACING; - if (motion == MOT_11 || motion == MOT_19) + if (motion == OUTSIDE || motion == INSIDE) spk = NO_INOUT_HERE; if (verb == FIND || verb == INVENTORY) spk = NEARBY; - if (motion == MOT_62 || motion == MOT_65) + if (motion == XYZZY || motion == PLUGH) spk = NOTHING_HAPPENS; - if (motion == MOT_17) + if (motion == CRAWL) spk = WHICH_WAY; rspeak(spk); return true;