ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

Comparing deliantra/server/server/player.C (file contents):
Revision 1.137 by root, Thu May 17 14:14:55 2007 UTC vs.
Revision 1.144 by root, Sat May 26 15:44:08 2007 UTC

… …
147 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 147 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
148 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news); 148 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
149 close_and_delete (fp, comp); 149 close_and_delete (fp, comp);
150} 150}
151 151
152float
153player::weapon_speed () const
154{
155 return ob->speed / weapon_sp * .5f;//TODO, the .5 is arbitrary
156}
157
158/* This loads the first map an puts the player on it. */ 152/* This loads the first map an puts the player on it. */
159static void 153static void
160set_first_map (object *op) 154set_first_map (object *op)
161{ 155{
162 op->contr->maplevel = first_map_path; 156 op->contr->maplevel = first_map_path;
163 op->x = -1; 157 op->x = -1;
164 op->y = -1; 158 op->y = -1;
165}
166
167void
168player::enter_map ()
169{
170 object *tmp = object::create ();
171
172 EXIT_PATH (tmp) = maplevel;
173 EXIT_X (tmp) = ob->x;
174 EXIT_Y (tmp) = ob->y;
175 ob->enter_exit (tmp);
176
177 tmp->destroy ();
178} 159}
179 160
180void 161void
181player::activate () 162player::activate ()
182{ 163{
… …
187 ob->remove (); 168 ob->remove ();
188 ob->map = 0; 169 ob->map = 0;
189 ob->activate_recursive (); 170 ob->activate_recursive ();
190 CLEAR_FLAG (ob, FLAG_FRIENDLY); 171 CLEAR_FLAG (ob, FLAG_FRIENDLY);
191 add_friendly_object (ob); 172 add_friendly_object (ob);
192 enter_map ();
193} 173}
194 174
195void 175void
196player::deactivate () 176player::deactivate ()
197{ 177{
… …
264 244
265 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 245 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
266 246
267 esrv_new_player (this, ob->weight + ob->carrying); 247 esrv_new_player (this, ob->weight + ob->carrying);
268 248
249 ob->flag [FLAG_READY_WEAPON] = false;
250 ob->flag [FLAG_READY_SKILL] = false;
251 ob->flag [FLAG_READY_BOW] = false;
252
269 for (object *op = ob->inv; op; op = op->below) 253 for (object *op = ob->inv; op; op = op->below)
270 if (op->flag [FLAG_APPLIED]) 254 if (op->flag [FLAG_APPLIED])
271 switch (op->type) 255 switch (op->type)
272 { 256 {
257 case SKILL:
258 ob->flag [FLAG_APPLIED] = false;
259 break;
260
273 case WAND: 261 case WAND:
274 case ROD: 262 case ROD:
275 case HORN: 263 case HORN:
276 case BOW: 264 case BOW:
277 case SKILL: 265 ranged_ob = op;
278 case SKILL_TOOL: 266 break;
267
279 case WEAPON: 268 case WEAPON:
280 apply_special (ob, op, AP_UNAPPLY); 269 combat_ob = op;
281 apply_special (ob, op, AP_APPLY);
282 break; 270 break;
283 } 271 }
284 272
273 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
285 ob->update_stats (); 274 ob->update_stats ();
275
286 ns->floorbox_update (); 276 ns->floorbox_update ();
287
288 esrv_send_inventory (ob, ob); 277 esrv_send_inventory (ob, ob);
289 esrv_add_spells (this, 0); 278 esrv_add_spells (this, 0);
290 279
291 activate (); 280 activate ();
292 281
… …
325player::set_object (object *op) 314player::set_object (object *op)
326{ 315{
327 ob = op; 316 ob = op;
328 ob->contr = this; /* this aren't yet in archetype */ 317 ob->contr = this; /* this aren't yet in archetype */
329 318
330 ob->speed_left = 0.5f;
331 ob->speed = 1.0f; 319 ob->speed = 1.0f;
320 ob->speed_left = 0.5f;
321
332 ob->direction = 5; /* So player faces south */ 322 ob->direction = 5; /* So player faces south */
333} 323}
334 324
335player::player () 325player::player ()
336{ 326{
337 /* There are some elements we want initialised to non zero value - 327 /* There are some elements we want initialised to non zero value -
… …
348 petmode = pet_normal; 338 petmode = pet_normal;
349 listening = 10; 339 listening = 10;
350 usekeys = containers; 340 usekeys = containers;
351 peaceful = 1; /* default peaceful */ 341 peaceful = 1; /* default peaceful */
352 do_los = 1; 342 do_los = 1;
343
344 weapon_sp = 1.0f;
345 weapon_sp_left = 0.5f;
353} 346}
354 347
355void 348void
356player::do_destroy () 349player::do_destroy ()
357{ 350{
… …
1632 arrow->stats.grace = arrow->attacktype; 1625 arrow->stats.grace = arrow->attacktype;
1633 1626
1634 if (arrow->slaying) 1627 if (arrow->slaying)
1635 arrow->spellarg = strdup (arrow->slaying); 1628 arrow->spellarg = strdup (arrow->slaying);
1636 1629
1630#if 0
1637 if (player *pl = op->contr) 1631 if (player *pl = op->contr)
1638 { 1632 {
1639 if (!pl->has_hit)
1640 {
1641 pl->has_hit = 1;
1642 pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
1643 }
1644#if 0
1645 float speed = pl->weapon_sp; 1633 float speed = pl->weapon_sp;
1646 1634
1647 /* penalize ROF for bestarrow */ 1635 /* penalize ROF for bestarrow */
1648 if (pl->bowtype == bow_bestarrow) 1636 if (pl->bowtype == bow_bestarrow)
1649 speed *= .9f; 1637 speed *= .9f;
1650 else 1638 else
1651 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f; 1639 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1652 1640
1653 op->speed_left += speed - op->speed; 1641 op->speed_left += speed - op->speed;
1642 }
1654#endif 1643#endif
1655 }
1656 1644
1657 SET_ANIMATION (arrow, arrow->direction); 1645 SET_ANIMATION (arrow, arrow->direction);
1658 1646
1659 /* update the speed */ 1647 /* update the speed */
1660 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 1648 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1661 + bow->stats.dam / 7.0; 1649 + bow->stats.dam / 7.f;
1662 1650
1663 arrow->set_speed (max (arrow->speed, 2.0)); 1651 arrow->set_speed (max (arrow->speed, 2.f));
1664 arrow->speed_left = 0; 1652 arrow->speed_left = 0;
1665 1653
1666 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; 1654 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1667 1655
1668 if (op->type == PLAYER) 1656 if (op->type == PLAYER)
… …
1827 } 1815 }
1828} 1816}
1829 1817
1830/* Received a fire command for the player - go and do it. 1818/* Received a fire command for the player - go and do it.
1831 */ 1819 */
1832void 1820bool
1833fire (object *op, int dir) 1821fire (object *op, int dir)
1834{ 1822{
1835 int spellcost = 0; 1823 int spellcost = 0;
1836 1824
1837 /* check for loss of invisiblity/hide */ 1825 /* check for loss of invisiblity/hide */
… …
1841 player *pl = op->contr; 1829 player *pl = op->contr;
1842 1830
1843 if (pl->golem) 1831 if (pl->golem)
1844 { 1832 {
1845 control_golem (op->contr->golem, dir); 1833 control_golem (op->contr->golem, dir);
1846 return; 1834 return false;
1847 } 1835 }
1848 1836
1849 object *ob = pl->ranged_ob; 1837 object *ob = pl->ranged_ob;
1850 1838
1851 if (!ob) 1839 if (!ob)
1852 return; 1840 return false;
1853 1841
1854 if (!op->change_weapon (ob)) 1842 if (!op->change_weapon (ob))
1855 return; 1843 return false;
1844
1845 if (op->speed_left > 0.f)
1846 --op->speed_left;
1847 else
1848 return false;
1856 1849
1857 switch (ob->type) 1850 switch (ob->type)
1858 { 1851 {
1859 case BOW: 1852 case BOW:
1860 player_fire_bow (op, dir); 1853 player_fire_bow (op, dir);
… …
1874 1867
1875 default: 1868 default:
1876 fire_misc_object (op, dir); 1869 fire_misc_object (op, dir);
1877 break; 1870 break;
1878 } 1871 }
1872
1873 return true;
1879} 1874}
1880 1875
1881/* find_key 1876/* find_key
1882 * We try to find a key for the door as passed. If we find a key 1877 * We try to find a key for the door as passed. If we find a key
1883 * and successfully use it, we return the key, otherwise NULL 1878 * and successfully use it, we return the key, otherwise NULL
… …
1970 * 0 otherwise 1965 * 0 otherwise
1971 */ 1966 */
1972static int 1967static int
1973player_attack_door (object *op, object *door) 1968player_attack_door (object *op, object *door)
1974{ 1969{
1975 /* If its a door, try to find a use a key. If we do destroy the door, 1970 /* If its a door, try to find a key. If we do destroy the door,
1976 * might as well return immediately as there is nothing more to do - 1971 * might as well return immediately as there is nothing more to do -
1977 * otherwise, we fall through to the rest of the code. 1972 * otherwise, we fall through to the rest of the code.
1978 */ 1973 */
1979 object *key = find_key (op, op, door); 1974 object *key = find_key (op, op, door);
1980 1975
1981 /* IF we found a key, do some extra work */ 1976 /* If we found a key, do some extra work */
1982 if (key) 1977 if (key)
1983 { 1978 {
1984 object *container = key->env; 1979 object *container = key->env;
1985 1980
1986 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1981 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
… …
2021 * It should keep the code cleaner. 2016 * It should keep the code cleaner.
2022 * When this is called, the players direction has been updated 2017 * When this is called, the players direction has been updated
2023 * (taking into account confusion.) The player is also actually 2018 * (taking into account confusion.) The player is also actually
2024 * going to try and move (not fire weapons). 2019 * going to try and move (not fire weapons).
2025 */ 2020 */
2026void 2021bool
2027move_player_attack (object *op, int dir) 2022move_player_attack (object *op, int dir)
2028{ 2023{
2029 object *tmp, *mon;
2030 int on_battleground; 2024 int on_battleground;
2031 maptile *m;
2032 2025
2033 sint16 nx = freearr_x[dir] + op->x; 2026 sint16 nx = freearr_x[dir] + op->x;
2034 sint16 ny = freearr_y[dir] + op->y; 2027 sint16 ny = freearr_y[dir] + op->y;
2035 2028
2036 on_battleground = op_on_battleground (op, 0, 0); 2029 on_battleground = op_on_battleground (op, 0, 0);
2030
2031 if (out_of_map (op->map, nx, ny))
2032 return false;
2033
2034 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2035 {
2036 --op->speed_left;
2037 return true;
2038 }
2037 2039
2038 /* If braced, or can't move to the square, and it is not out of the 2040 /* If braced, or can't move to the square, and it is not out of the
2039 * map, attack it. Note order of if statement is important - don't 2041 * map, attack it. Note order of if statement is important - don't
2040 * want to be calling move_ob if braced, because move_ob will move the 2042 * want to be calling move_ob if braced, because move_ob will move the
2041 * player. This is a pretty nasty hack, because if we could 2043 * player. This is a pretty nasty hack, because if we could
2042 * move to some space, it then means that if we are braced, we should 2044 * move to some space, it then means that if we are braced, we should
2043 * do nothing at all. As it is, if we are braced, we go through 2045 * do nothing at all. As it is, if we are braced, we go through
2044 * quite a bit of processing. However, it probably is less than what 2046 * quite a bit of processing. However, it probably is less than what
2045 * move_ob uses. 2047 * move_ob uses.
2046 */ 2048 */
2047 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2048 {
2049 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2050 {
2051 m = op->map->xy_find (nx, ny); 2049 maptile *m = op->map->xy_find (nx, ny);
2052 if (!m)
2053 return; /* Don't think this should happen */
2054 }
2055 else
2056 m = op->map;
2057 2050
2058 if (!(tmp = m->at (nx, ny).bot))
2059 return;
2060
2061 mon = 0;
2062 /* Go through all the objects, and find ones of interest. Only stop if 2051 /* Go through all the objects, and find ones of interest. Only stop if
2063 * we find a monster - that is something we know we want to attack. 2052 * we find a monster - that is something we know we want to attack.
2064 * if its a door or barrel (can roll) see if there may be monsters 2053 * if its a door or barrel (can roll) see if there may be monsters
2065 * on the space 2054 * on the space
2066 */ 2055 */
2067 while (tmp) 2056 object *mon;
2068 { 2057 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2069 if (tmp == op) 2058 {
2070 { 2059 if ((mon->flag [FLAG_ALIVE]
2071 tmp = tmp->above; 2060 || mon->type == LOCKED_DOOR
2072 continue; 2061 || mon->flag [FLAG_CAN_ROLL])
2073 }
2074
2075 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2076 {
2077 mon = tmp; 2062 && mon != op)
2078 break; 2063 break;
2079 } 2064 }
2080 2065
2081 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2082 mon = tmp;
2083
2084 tmp = tmp->above;
2085 }
2086
2087 if (!mon) /* This happens anytime the player tries to move */ 2066 if (!mon) /* This happens anytime the player tries to move */
2088 return; /* into a wall */ 2067 return false; /* into a wall */
2089 2068
2090 if (mon->head)
2091 mon = mon->head; 2069 mon = mon->head_ ();
2092 2070
2093 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2071 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2072 if (op->contr->weapon_sp_left > 0.f)
2094 if (player_attack_door (op, mon)) 2073 if (player_attack_door (op, mon))
2074 {
2075 --op->contr->weapon_sp_left;
2095 return; 2076 return true;
2077 }
2096 2078
2097 /* The following deals with possibly attacking peaceful 2079 /* The following deals with possibly attacking peaceful
2098 * or frienddly creatures. Basically, all players are considered 2080 * or friendly creatures. Basically, all players are considered
2099 * unaggressive. If the moving player has peaceful set, then the 2081 * unaggressive. If the moving player has peaceful set, then the
2100 * object should be pushed instead of attacked. It is assumed that 2082 * object should be pushed instead of attacked. It is assumed that
2101 * if you are braced, you will not attack friends accidently, 2083 * if you are braced, you will not attack friends accidently,
2102 * and thus will not push them. 2084 * and thus will not push them.
2103 */ 2085 */
2104 2086
2105 /* If the creature is a pet, push it even if the player is not 2087 /* If the creature is a pet, push it even if the player is not
2106 * peaceful. Our assumption is the creature is a pet if the 2088 * peaceful. Our assumption is the creature is a pet if the
2107 * player owns it and it is either friendly or unagressive. 2089 * player owns it and it is either friendly or unagressive.
2108 */ 2090 */
2109 if (op->type == PLAYER 2091 if (op->type == PLAYER
2110 && ((mon->owner && mon->owner->contr 2092 && ((mon->owner && mon->owner->contr
2111 && same_party (mon->owner->contr->party, op->contr->party)) 2093 && same_party (mon->owner->contr->party, op->contr->party))
2112 || mon->owner == op) 2094 || mon->owner == op)
2113 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2095 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2114 { 2096 {
2115 /* If we're braced, we don't want to switch places with it */ 2097 /* If we're braced, we don't want to switch places with it */
2116 if (op->contr->braced) 2098 if (op->contr->braced)
2117 return; 2099 return false;
2100
2101 if (op->speed_left > 0.f)
2102 {
2103 --op->speed_left;
2118 2104
2119 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2105 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2120 push_ob (mon, dir, op); 2106 push_ob (mon, dir, op);
2107
2121 if (op->contr->tmp_invis || op->hide) 2108 if (op->contr->tmp_invis || op->hide)
2122 make_visible (op); 2109 make_visible (op);
2123 2110
2124 return; 2111 return true;
2125 } 2112 }
2113 else
2114 return false;
2115 }
2126 2116
2127 /* in certain circumstances, you shouldn't attack friendly 2117 /* in certain circumstances, you shouldn't attack friendly
2128 * creatures. Note that if you are braced, you can't push 2118 * creatures. Note that if you are braced, you can't push
2129 * someone, but put it inside this loop so that you won't 2119 * someone, but put it inside this loop so that you won't
2130 * attack them either. 2120 * attack them either.
2131 */ 2121 */
2132 if ((mon->type == PLAYER || mon->enemy != op) 2122 if ((mon->type == PLAYER || mon->enemy != op)
2133 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) 2123 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2134 && ((op->contr->peaceful 2124 && ((op->contr->peaceful
2135 || (mon->type == PLAYER && mon->contr->peaceful)) 2125 || (mon->type == PLAYER && mon->contr->peaceful))
2136 && !on_battleground)) 2126 && !on_battleground))
2127 {
2128 if (op->speed_left > 0.f)
2137 { 2129 {
2130 --op->speed_left;
2131
2138 if (!op->contr->braced) 2132 if (!op->contr->braced)
2139 { 2133 {
2140 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2134 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2141 push_ob (mon, dir, op); 2135 push_ob (mon, dir, op);
2142 } 2136 }
2143 else 2137 else
2144 new_draw_info (0, 0, op, "You withhold your attack"); 2138 new_draw_info (0, 0, op, "You withhold your attack");
2145 2139
2146 if (op->contr->tmp_invis || op->hide) 2140 if (op->contr->tmp_invis || op->hide)
2147 make_visible (op); 2141 make_visible (op);
2148 }
2149 2142
2143 return true;
2144 }
2145 }
2150 /* If the object is a boulder or other rollable object, then 2146 /* If the object is a boulder or other rollable object, then
2151 * roll it if not braced. You can't roll it if you are braced. 2147 * roll it if not braced. You can't roll it if you are braced.
2152 */ 2148 */
2153 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2149 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2150 {
2151 if (op->speed_left > 0.f)
2154 { 2152 {
2153 --op->speed_left;
2154
2155 recursive_roll (mon, dir, op); 2155 recursive_roll (mon, dir, op);
2156 if (action_makes_visible (op)) 2156 if (action_makes_visible (op))
2157 make_visible (op); 2157 make_visible (op);
2158 }
2159 2158
2159 return true;
2160 }
2161 }
2160 /* Any generic living creature. Including things like doors. 2162 /* Any generic living creature. Including things like doors.
2161 * Way it works is like this: First, it must have some hit points 2163 * Way it works is like this: First, it must have some hit points
2162 * and be living. Then, it must be one of the following: 2164 * and be living. Then, it must be one of the following:
2163 * 1) Not a player, 2) A player, but of a different party. Note 2165 * 1) Not a player, 2) A player, but of a different party. Note
2164 * that party_number -1 is no party, so attacks can still happen. 2166 * that party_number -1 is no party, so attacks can still happen.
2165 */ 2167 */
2166 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2168 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2167 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2169 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2168 { 2170 {
2169 if (!op->contr->has_hit) 2171 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2170 { 2172 {
2171 op->contr->has_hit = 1; 2173 --op->contr->weapon_sp_left;
2172 op->speed_left += op->contr->weapon_speed () - op->speed;
2173 }
2174 2174
2175 skill_attack (mon, op, 0, 0, 0); 2175 skill_attack (mon, op, 0, 0, 0);
2176
2177 /* If attacking another player, that player gets automatic
2178 * hitback, and doesn't loose luck either.
2179 * Disable hitback on the battleground or if the target is
2180 * the wiz.
2181 */
2182 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2183 {
2184 short luck = mon->stats.luck;
2185
2186 mon->contr->has_hit = 1;
2187 skill_attack (op, mon, 0, 0, 0);
2188 mon->stats.luck = luck;
2189 }
2190 2176
2191 if (action_makes_visible (op)) 2177 if (action_makes_visible (op))
2192 make_visible (op); 2178 make_visible (op);
2193 }
2194 } /* if player should attack something */
2195}
2196 2179
2197int 2180 return true;
2181 }
2182 }
2183
2184 return false;
2185}
2186
2187bool
2198move_player (object *op, int dir) 2188move_player (object *op, int dir)
2199{ 2189{
2200 int pick; 2190 int pick;
2201 2191
2202 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2192 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
… …
2216 op->facing = dir; 2206 op->facing = dir;
2217 2207
2218 if (op->hide) 2208 if (op->hide)
2219 do_hidden_move (op); 2209 do_hidden_move (op);
2220 2210
2211 bool retval;
2212
2221 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2213 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2222 /*nop */ ; 2214 retval = RESULT_INT (0);
2223 else if (op->contr->fire_on) 2215 else if (op->contr->fire_on)
2224 fire (op, dir); 2216 retval = fire (op, dir);
2225 else 2217 else
2226 { 2218 {
2227 move_player_attack (op, dir); 2219 retval = move_player_attack (op, dir);
2228 pick = check_pick (op); 2220 pick = check_pick (op);
2229 } 2221 }
2230 2222
2231 /* Add special check for newcs players and fire on - this way, the 2223 /* Add special check for newcs players and fire on - this way, the
2232 * server can handle repeat firing. 2224 * server can handle repeat firing.
… …
2239 /* Update how the player looks. Use the facing, so direction may 2231 /* Update how the player looks. Use the facing, so direction may
2240 * get reset to zero. This allows for full animation capabilities 2232 * get reset to zero. This allows for full animation capabilities
2241 * for players. 2233 * for players.
2242 */ 2234 */
2243 animate_object (op, op->facing); 2235 animate_object (op, op->facing);
2244 return 0; 2236
2237 return retval;
2245} 2238}
2246 2239
2247/* This is similar to handle_player, below, but is only used by the 2240/* This is similar to handle_player, below, but is only used by the
2248 * new client/server stuff. 2241 * new client/server stuff.
2249 * This is sort of special, in that the new client/server actually uses 2242 * This is sort of special, in that the new client/server actually uses
2250 * the new speed values for commands. 2243 * the new speed values for commands.
2251 * 2244 *
2252 * Returns true if there are more actions we can do. 2245 * Returns true if there are more actions we can do. Should not do
2246 * many actions in a row, as that would be too unfair to other
2247 * players.
2253 */ 2248 */
2254int 2249bool
2255handle_newcs_player (object *op) 2250handle_newcs_player (object *op)
2256{ 2251{
2257 if (QUERY_FLAG (op, FLAG_SCARED)) 2252 if (QUERY_FLAG (op, FLAG_SCARED))
2258 { 2253 {
2259 flee_player (op); 2254 if (op->speed_left > 0.f)
2260
2261 /* If player is still scared, that is his action for this tick */
2262 if (op->flag [FLAG_SCARED])
2263 { 2255 {
2264 --op->speed_left; 2256 --op->speed_left;
2257 flee_player (op);
2258
2265 return 0; 2259 return true;
2266 } 2260 }
2261 else
2262 return false;
2267 } 2263 }
2268 2264
2269 /* call this here - we also will call this in do_ericserver, but 2265 /* call this here - we also will call this in do_ericserver, but
2270 * the players time has been increased when doericserver has been 2266 * the players time has been increased when doericserver has been
2271 * called, so we recheck it here. 2267 * called, so we recheck it here.
2272 */ 2268 */
2273 if (op->contr->ns->handle_command ()) 2269 if (op->contr->ns->handle_command ())
2274 return 1; 2270 return true;
2275 2271
2276 if (op->speed_left > 0.f)
2277 {
2278 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2272 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2279 {
2280 /* All move commands take 1 tick, at least for now */
2281 --op->speed_left;
2282
2283 /* Instead of all the stuff below, let move_player take care
2284 * of it. Also, some of the skill stuff is only put in
2285 * there, as well as the confusion stuff.
2286 */
2287 move_player (op, op->direction); 2273 return move_player (op, op->direction);
2288 2274
2289 return op->speed_left > 0.f;
2290 }
2291 }
2292
2293 return 0; 2275 return false;
2294} 2276}
2295 2277
2296int 2278int
2297save_life (object *op) 2279save_life (object *op)
2298{ 2280{
… …
3105/* For Hidden creatures - a chance of becoming 'unhidden' 3087/* For Hidden creatures - a chance of becoming 'unhidden'
3106 * every time they move - as we subtract off 'invisibility' 3088 * every time they move - as we subtract off 'invisibility'
3107 * AND, for players, if they move into a ridiculously unhideable 3089 * AND, for players, if they move into a ridiculously unhideable
3108 * spot (surrounded by clear terrain in broad daylight). -b.t. 3090 * spot (surrounded by clear terrain in broad daylight). -b.t.
3109 */ 3091 */
3110
3111void 3092void
3112do_hidden_move (object *op) 3093do_hidden_move (object *op)
3113{ 3094{
3114 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3095 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3115 object *skop; 3096 object *skop;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines