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.41 by root, Fri Dec 15 04:21:29 2006 UTC vs.
Revision 1.48 by root, Tue Dec 19 05:41:22 2006 UTC

… …
27#include <sounds.h> 27#include <sounds.h>
28#include <living.h> 28#include <living.h>
29#include <object.h> 29#include <object.h>
30#include <spells.h> 30#include <spells.h>
31#include <skills.h> 31#include <skills.h>
32#include <newclient.h>
33 32
34#ifdef COZY_SERVER 33#ifdef COZY_SERVER
35extern int same_party (partylist *a, partylist *b); 34extern int same_party (partylist *a, partylist *b);
36#endif 35#endif
37 36
… …
83 int comp; 82 int comp;
84 int size; 83 int size;
85 84
86 sprintf (buf, "%s/%s", settings.confdir, settings.motd); 85 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
87 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 86 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
88 {
89 return; 87 return;
90 } 88
91 motd[0] = '\0'; 89 motd[0] = '\0';
92 size = 0; 90 size = 0;
91
93 while (fgets (buf, MAX_BUF, fp) != NULL) 92 while (fgets (buf, MAX_BUF, fp) != NULL)
94 { 93 {
95 if (*buf == '#') 94 if (*buf == '#')
96 continue; 95 continue;
96
97 strncat (motd + size, buf, HUGE_BUF - size); 97 strncat (motd + size, buf, HUGE_BUF - size);
98 size += strlen (buf); 98 size += strlen (buf);
99 } 99 }
100
100 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL); 101 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
101 close_and_delete (fp, comp); 102 close_and_delete (fp, comp);
102} 103}
103 104
104void 105void
… …
110 int comp; 111 int comp;
111 int size; 112 int size;
112 113
113 sprintf (buf, "%s/%s", settings.confdir, settings.rules); 114 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
114 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 115 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
115 {
116 return; 116 return;
117 } 117
118 rules[0] = '\0'; 118 rules[0] = '\0';
119 size = 0; 119 size = 0;
120
120 while (fgets (buf, MAX_BUF, fp) != NULL) 121 while (fgets (buf, MAX_BUF, fp) != NULL)
121 { 122 {
122 if (*buf == '#') 123 if (*buf == '#')
123 continue; 124 continue;
125
124 if (size + strlen (buf) >= HUGE_BUF) 126 if (size + strlen (buf) >= HUGE_BUF)
125 { 127 {
126 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF); 128 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
127 break; 129 break;
128 } 130 }
131
129 strncat (rules + size, buf, HUGE_BUF - size); 132 strncat (rules + size, buf, HUGE_BUF - size);
130 size += strlen (buf); 133 size += strlen (buf);
131 } 134 }
135
132 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL); 136 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
133 close_and_delete (fp, comp); 137 close_and_delete (fp, comp);
134} 138}
135 139
136void 140void
… …
144 int size; 148 int size;
145 149
146 sprintf (buf, "%s/%s", settings.confdir, settings.news); 150 sprintf (buf, "%s/%s", settings.confdir, settings.news);
147 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 151 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
148 return; 152 return;
153
149 news[0] = '\0'; 154 news[0] = '\0';
150 subject[0] = '\0'; 155 subject[0] = '\0';
151 size = 0; 156 size = 0;
157
152 while (fgets (buf, MAX_BUF, fp) != NULL) 158 while (fgets (buf, MAX_BUF, fp) != NULL)
153 { 159 {
154 if (*buf == '#') 160 if (*buf == '#')
155 continue; 161 continue;
162
156 if (*buf == '%') 163 if (*buf == '%')
157 { /* send one news */ 164 { /* send one news */
158 if (size > 0) 165 if (size > 0)
159 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ 166 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */
160 strcpy (subject, buf + 1); 167 strcpy (subject, buf + 1);
… …
187 return 0; 194 return 0;
188 195
189 for (; *cp != '\0'; cp++) 196 for (; *cp != '\0'; cp++)
190 if (!((*cp >= 'a' && *cp <= 'z') || (*cp >= 'A' && *cp <= 'Z')) && *cp != '-' && *cp != '_') 197 if (!((*cp >= 'a' && *cp <= 'z') || (*cp >= 'A' && *cp <= 'Z')) && *cp != '-' && *cp != '_')
191 return 0; 198 return 0;
199
192 return 1; 200 return 1;
193} 201}
194 202
195/* This no longer sets the player map. Also, it now updates 203/* This no longer sets the player map. Also, it now updates
196 * all the pointers so the caller doesn't need to do that. 204 * all the pointers so the caller doesn't need to do that.
… …
255 p->usekeys = containers; 263 p->usekeys = containers;
256 p->last_weapon_sp = -1; 264 p->last_weapon_sp = -1;
257 p->peaceful = 1; /* default peaceful */ 265 p->peaceful = 1; /* default peaceful */
258 p->do_los = 1; 266 p->do_los = 1;
259 p->explore = 0; 267 p->explore = 0;
260 p->no_shout = 0; /* default can shout */
261 268
262 assign (p->title, op->arch->clone.name); 269 assign (p->title, op->arch->clone.name);
263 op->race = op->arch->clone.race; 270 op->race = op->arch->clone.race;
264 271
265 CLEAR_FLAG (op, FLAG_READY_SKILL); 272 CLEAR_FLAG (op, FLAG_READY_SKILL);
… …
292set_first_map (object *op) 299set_first_map (object *op)
293{ 300{
294 strcpy (op->contr->maplevel, first_map_path); 301 strcpy (op->contr->maplevel, first_map_path);
295 op->x = -1; 302 op->x = -1;
296 op->y = -1; 303 op->y = -1;
297 enter_exit (op, NULL); 304 enter_exit (op, 0);
298} 305}
299 306
300/* Tries to add player on the connection passwd in ns. 307/* Tries to add player on the connection passwd in ns.
301 * All we can really get in this is some settings like host and display 308 * All we can really get in this is some settings like host and display
302 * mode. 309 * mode.
303 */ 310 */
304 311
305int 312int
306add_player (client_socket *ns) 313add_player (client *ns)
307{ 314{
308 player *p = new player; 315 player *p = new player;
309 316
310 p->socket = ns; 317 p->socket = ns;
311 ns->pl = p; 318 ns->pl = p;
… …
341 { 348 {
342 if (at == NULL || at->next == NULL) 349 if (at == NULL || at->next == NULL)
343 at = first_archetype; 350 at = first_archetype;
344 else 351 else
345 at = at->next; 352 at = at->next;
353
346 if (at->clone.type == PLAYER) 354 if (at->clone.type == PLAYER)
347 return at; 355 return at;
356
348 if (at == start) 357 if (at == start)
349 { 358 {
350 LOG (llevError, "No Player archetypes\n"); 359 LOG (llevError, "No Player archetypes\n");
351 exit (-1); 360 exit (-1);
352 } 361 }
353 } 362 }
354} 363}
355
356 364
357object * 365object *
358get_nearest_player (object *mon) 366get_nearest_player (object *mon)
359{ 367{
360 object *op = NULL; 368 object *op = NULL;
… …
1084 * if the map isn't there, then stay on the 1092 * if the map isn't there, then stay on the
1085 * default initial map */ 1093 * default initial map */
1086 tmp->destroy (); 1094 tmp->destroy ();
1087 } 1095 }
1088 else 1096 else
1089 {
1090 LOG (llevDebug, "first_map_ext_path not set\n"); 1097 LOG (llevDebug, "first_map_ext_path not set\n");
1091 } 1098
1092 return 0; 1099 return 0;
1093 } 1100 }
1094 1101
1095 /* Following actually changes the race - this is the default command 1102 /* Following actually changes the race - this is the default command
1096 * if we don't match with one of the options above. 1103 * if we don't match with one of the options above.
… …
1793 if (!dir) 1800 if (!dir)
1794 { 1801 {
1795 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1802 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1796 return 0; 1803 return 0;
1797 } 1804 }
1805
1798 if (op->type == PLAYER) 1806 if (op->type == PLAYER)
1799 bow = op->contr->ranges[range_bow]; 1807 bow = op->contr->ranges[range_bow];
1800 else 1808 else
1801 { 1809 {
1802 for (bow = op->inv; bow; bow = bow->below) 1810 for (bow = op->inv; bow; bow = bow->below)
… …
1810 { 1818 {
1811 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1819 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1812 return 0; 1820 return 0;
1813 } 1821 }
1814 } 1822 }
1823
1815 if (!bow->race || !bow->skill) 1824 if (!bow->race || !bow->skill)
1816 { 1825 {
1817 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1826 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1818 return 0; 1827 return 0;
1819 } 1828 }
… …
1821 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex]; 1830 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1822 1831
1823 /* penalize ROF for bestarrow */ 1832 /* penalize ROF for bestarrow */
1824 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow) 1833 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1825 bowspeed -= dex_bonus[op->stats.Dex] + 5; 1834 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1835
1826 if (bowspeed < 1) 1836 if (bowspeed < 1)
1827 bowspeed = 1; 1837 bowspeed = 1;
1828 1838
1829 if (arrow == NULL) 1839 if (arrow == NULL)
1830 { 1840 {
… …
1836 else 1846 else
1837 CLEAR_FLAG (op, FLAG_READY_BOW); 1847 CLEAR_FLAG (op, FLAG_READY_BOW);
1838 return 0; 1848 return 0;
1839 } 1849 }
1840 } 1850 }
1851
1841 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1852 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1842 if (mflags & P_OUT_OF_MAP) 1853 if (mflags & P_OUT_OF_MAP)
1843 {
1844 return 0; 1854 return 0;
1845 } 1855
1846 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW) 1856 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1847 { 1857 {
1848 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1858 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1849 return 0; 1859 return 0;
1850 } 1860 }
… …
1856 return 0; 1866 return 0;
1857 } 1867 }
1858 1868
1859 left = arrow; /* these are arrows left to the player */ 1869 left = arrow; /* these are arrows left to the player */
1860 arrow = get_split_ob (arrow, 1); 1870 arrow = get_split_ob (arrow, 1);
1861 if (arrow == NULL) 1871 if (!arrow)
1862 { 1872 {
1863 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1873 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1864 return 0; 1874 return 0;
1865 } 1875 }
1876
1866 arrow->set_owner (op); 1877 arrow->set_owner (op);
1867 arrow->skill = bow->skill; 1878 arrow->skill = bow->skill;
1868 1879
1869 arrow->direction = dir; 1880 arrow->direction = dir;
1870 arrow->x = sx; 1881 arrow->x = sx;
… …
1913 } 1924 }
1914 1925
1915 if (arrow->attacktype == AT_PHYSICAL) 1926 if (arrow->attacktype == AT_PHYSICAL)
1916 arrow->attacktype |= bow->attacktype; 1927 arrow->attacktype |= bow->attacktype;
1917 1928
1918 if (bow->slaying != NULL) 1929 if (bow->slaying)
1919 arrow->slaying = bow->slaying; 1930 arrow->slaying = bow->slaying;
1920 1931
1921 arrow->map = m; 1932 arrow->map = m;
1922 arrow->move_type = MOVE_FLY_LOW; 1933 arrow->move_type = MOVE_FLY_LOW;
1923 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1934 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
… …
2545 2556
2546 /* call this here - we also will call this in do_ericserver, but 2557 /* call this here - we also will call this in do_ericserver, but
2547 * the players time has been increased when doericserver has been 2558 * the players time has been increased when doericserver has been
2548 * called, so we recheck it here. 2559 * called, so we recheck it here.
2549 */ 2560 */
2550 HandleClient (op->contr->socket, op->contr); 2561 //TODO: better than handling 8 commands, use some more intelligent rate-limiting
2562 for (int rep = 8; --rep && op->contr->socket->handle_command (); )
2563 ;
2564
2551 if (op->speed_left < 0) 2565 if (op->speed_left < 0)
2552 return 0; 2566 return 0;
2553 2567
2554 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2568 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2555 { 2569 {

Diff Legend

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