--- deliantra/server/socket/request.C 2007/06/03 17:42:39 1.102 +++ deliantra/server/socket/request.C 2007/06/05 13:05:03 1.104 @@ -524,7 +524,6 @@ pl->count = 0; } - /** * This handles the general commands from the client (ie, north, fire, cast, * etc.). It is a lot like PlayerCmd above, but is called with the @@ -740,9 +739,11 @@ if (pl->combat_ob) buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; +#if 0 //TODO: remove this when slot system is working, this is only for debugging if (pl->ob->chosen_skill) buf << " Skill*: " << pl->ob->chosen_skill->name; +#endif //TODO: maybe golem should become the current_weapon, quite simply? if (pl->golem) @@ -1234,7 +1235,7 @@ if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) { stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; - stat_width = op->arch->tail_x; + stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge } }