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.43 by root, Sat Dec 16 03:08:26 2006 UTC vs.
Revision 1.48 by root, Tue Dec 19 05:41:22 2006 UTC

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

Diff Legend

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