ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.c
(Generate patch)

Comparing deliantra/server/socket/request.c (file contents):
Revision 1.1 by root, Fri Feb 3 07:14:46 2006 UTC vs.
Revision 1.6 by root, Mon Apr 17 07:31:54 2006 UTC

1/* 1/*
2 * static char *rcsid_init_c = 2 * static char *rcsid_init_c =
3 * "$Id: request.c,v 1.1 2006/02/03 07:14:46 root Exp $"; 3 * "$Id: request.c,v 1.6 2006/04/17 07:31:54 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
… …
104 -1, /* Internal */ 104 -1, /* Internal */
105 -1, /* life stealing */ 105 -1, /* life stealing */
106 -1 /* Disease - not fully done yet */ 106 -1 /* Disease - not fully done yet */
107}; 107};
108 108
109/** check for map change and send new map data */
110static void
111check_map_change (player *pl)
112{
113 char buf[MAX_BUF]; /* eauugggh */
114
115 object *ob = pl->ob;
116
117 if (!pl->socket.mapinfocmd)
118 return;
119
120 if (pl->socket.current_map != ob->map)
121 {
122 pl->socket.current_map = ob->map;
123
124 if (ob->map && ob->map->path [0])
125 {
126 int flags = 0;
127
128 if (ob->map->tile_path [0]) flags |= 1;
129 if (ob->map->tile_path [1]) flags |= 2;
130 if (ob->map->tile_path [2]) flags |= 4;
131 if (ob->map->tile_path [3]) flags |= 8;
132
133 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
134 flags, pl->socket.mapx / 2 - ob->x, pl->socket.mapy / 2 - ob->y,
135 ob->map->width, ob->map->height, ob->map->path);
136 }
137 else
138 snprintf (buf, MAX_BUF, "mapinfo current");
139
140 Write_String_To_Socket (&pl->socket, buf, strlen (buf));
141 }
142}
143
144void MapInfoCmd (char *buf, int len, player *pl)
145{
146 // <mapinfo tag spatial tile-path
147 // >mapinfo tag spatial flags x y w h hash
148
149 char bigbuf[MAX_BUF], *cp, *token;
150
151 token = buf;
152 // copy token
153 if (!(buf = strchr (buf, ' ')))
154 return;
155
156 *buf++ = 0;
157
158 if (!strncmp (buf, "spatial ", 8))
159 {
160 buf += 8;
161
162 // initial map and its origin
163 mapstruct *map = pl->ob->map;
164 sint16 dx, dy;
165 int mapx = pl->socket.mapx / 2 - pl->ob->x;
166 int mapy = pl->socket.mapy / 2 - pl->ob->y;
167 int max_distance = 8; // limit maximum path length to something generous
168
169 while (*buf && map && max_distance)
170 {
171 int dir = *buf++;
172
173 switch (dir)
174 {
175 case '1':
176 dx = 0; dy = -1; map = get_map_from_coord (map, &dx, &dy);
177 map && (mapy -= map->height);
178 break;
179 case '2':
180 mapx += map->width;
181 dx = map->width; dy = 0; map = get_map_from_coord (map, &dx, &dy);
182 break;
183 case '3':
184 mapy += map->height;
185 dx = 0; dy = map->height; map = get_map_from_coord (map, &dx, &dy);
186 break;
187 case '4':
188 dx = -1; dy = 0; map = get_map_from_coord (map, &dx, &dy);
189 map && (mapx -= map->width);
190 break;
191 }
192
193 --max_distance;
194 }
195
196 if (!max_distance)
197 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
198 else if (map && map->path [0])
199 {
200 int flags = 0;
201
202 if (map->tile_path [0]) flags |= 1;
203 if (map->tile_path [1]) flags |= 2;
204 if (map->tile_path [2]) flags |= 4;
205 if (map->tile_path [3]) flags |= 8;
206
207 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s",
208 token, flags, mapx, mapy,
209 map->width, map->height, map->path);
210 }
211 else
212 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
213 }
214 else
215 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
216
217 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf));
218}
219
109/** This is the Setup cmd - easy first implementation */ 220/** This is the Setup cmd - easy first implementation */
110void SetUp(char *buf, int len, NewSocket *ns) 221void SetUp(char *buf, int len, NewSocket *ns)
111{ 222{
112 int s; 223 int s, slen;
113 char *cmd, *param, cmdback[HUGE_BUF]; 224 char *cmd, *param, cmdback[HUGE_BUF];
114 225
115 /* run through the cmds of setup 226 /* run through the cmds of setup
116 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ... 227 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
117 * 228 *
… …
137 248
138 for(;buf[s] && buf[s] != ' ';s++) ; 249 for(;buf[s] && buf[s] != ' ';s++) ;
139 buf[s++]=0; 250 buf[s++]=0;
140 while (buf[s] == ' ') s++; 251 while (buf[s] == ' ') s++;
141 252
142 strcat(cmdback, " "); 253 slen = strlen(cmdback);
143 strcat(cmdback, cmd); 254 safe_strcat(cmdback, " ", &slen, HUGE_BUF);
144 strcat(cmdback, " "); 255 safe_strcat(cmdback, cmd, &slen, HUGE_BUF);
145 256 safe_strcat(cmdback, " ", &slen, HUGE_BUF);
146 257
147 if (!strcmp(cmd,"sound")) { 258 if (!strcmp(cmd,"sound")) {
148 ns->sound = atoi(param); 259 ns->sound = atoi(param);
149 strcat(cmdback, param); 260 safe_strcat(cmdback, param, &slen, HUGE_BUF);
150 } 261 }
151 else if (!strcmp(cmd,"exp64")) { 262 else if (!strcmp(cmd,"exp64")) {
152 ns->exp64 = atoi(param); 263 ns->exp64 = atoi(param);
153 strcat(cmdback, param); 264 safe_strcat(cmdback, param, &slen, HUGE_BUF);
154 } else if (!strcmp(cmd, "spellmon")) { 265 } else if (!strcmp(cmd, "spellmon")) {
155 ns->monitor_spells = atoi(param); 266 ns->monitor_spells = atoi(param);
156 strcat(cmdback, param); 267 safe_strcat(cmdback, param, &slen, HUGE_BUF);
157 } else if (!strcmp(cmd,"darkness")) { 268 } else if (!strcmp(cmd,"darkness")) {
158 ns->darkness = atoi(param); 269 ns->darkness = atoi(param);
159 strcat(cmdback, param); 270 safe_strcat(cmdback, param, &slen, HUGE_BUF);
160 } else if (!strcmp(cmd,"map1cmd")) { 271 } else if (!strcmp(cmd,"map1cmd")) {
161 if (atoi(param)) ns->mapmode = Map1Cmd; 272 if (atoi(param)) ns->mapmode = Map1Cmd;
162 /* if beyond this size, need to use map1cmd no matter what */ 273 /* if beyond this size, need to use map1cmd no matter what */
163 if (ns->mapx>11 || ns->mapy>11) ns->mapmode = Map1Cmd; 274 if (ns->mapx>11 || ns->mapy>11) ns->mapmode = Map1Cmd;
164 strcat(cmdback, ns->mapmode == Map1Cmd?"1":"0"); 275 safe_strcat(cmdback, ns->mapmode == Map1Cmd?"1":"0", &slen, HUGE_BUF);
165 } else if (!strcmp(cmd,"map1acmd")) { 276 } else if (!strcmp(cmd,"map1acmd")) {
166 if (atoi(param)) ns->mapmode = Map1aCmd; 277 if (atoi(param)) ns->mapmode = Map1aCmd;
167 /* if beyond this size, need to use map1acmd no matter what */ 278 /* if beyond this size, need to use map1acmd no matter what */
168 if (ns->mapx>11 || ns->mapy>11) ns->mapmode = Map1aCmd; 279 if (ns->mapx>11 || ns->mapy>11) ns->mapmode = Map1aCmd;
169 strcat(cmdback, ns->mapmode == Map1aCmd?"1":"0"); 280 safe_strcat(cmdback, ns->mapmode == Map1aCmd?"1":"0", &slen, HUGE_BUF);
170 } else if (!strcmp(cmd,"newmapcmd")) { 281 } else if (!strcmp(cmd,"newmapcmd")) {
171 ns->newmapcmd= atoi(param); 282 ns->newmapcmd= atoi(param);
172 strcat(cmdback, param); 283 safe_strcat(cmdback, param, &slen, HUGE_BUF);
284// } else if (!strcmp(cmd,"plugincmd")) {
285// ns->plugincmd = atoi(param);
286// safe_strcat(cmdback, param, &slen, HUGE_BUF);
287 } else if (!strcmp(cmd,"mapinfocmd")) {
288 ns->mapinfocmd = atoi(param);
289 safe_strcat(cmdback, param, &slen, HUGE_BUF);
173 } else if (!strcmp(cmd,"facecache")) { 290 } else if (!strcmp(cmd,"facecache")) {
174 ns->facecache = atoi(param); 291 ns->facecache = atoi(param);
175 strcat(cmdback, param); 292 safe_strcat(cmdback, param, &slen, HUGE_BUF);
176 } else if (!strcmp(cmd,"faceset")) { 293 } else if (!strcmp(cmd,"faceset")) {
177 char tmpbuf[20]; 294 char tmpbuf[20];
178 int q = atoi(param); 295 int q = atoi(param);
179 296
180 if (is_valid_faceset(q)) 297 if (is_valid_faceset(q))
181 ns->faceset=q; 298 ns->faceset=q;
182 sprintf(tmpbuf,"%d", ns->faceset); 299 sprintf(tmpbuf,"%d", ns->faceset);
183 strcat(cmdback, tmpbuf); 300 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
184 /* if the client is using faceset, it knows about image2 command */ 301 /* if the client is using faceset, it knows about image2 command */
185 ns->image2=1; 302 ns->image2=1;
186 } else if (!strcmp(cmd,"itemcmd")) { 303 } else if (!strcmp(cmd,"itemcmd")) {
187 /* Version of the item protocol command to use. Currently, 304 /* Version of the item protocol command to use. Currently,
188 * only supported versions are 1 and 2. Using a numeric 305 * only supported versions are 1 and 2. Using a numeric
… …
194 strcpy(tmpbuf,"FALSE"); 311 strcpy(tmpbuf,"FALSE");
195 } else { 312 } else {
196 ns->itemcmd = q; 313 ns->itemcmd = q;
197 sprintf(tmpbuf,"%d", ns->itemcmd); 314 sprintf(tmpbuf,"%d", ns->itemcmd);
198 } 315 }
199 strcat(cmdback, tmpbuf); 316 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
200 } else if (!strcmp(cmd,"mapsize")) { 317 } else if (!strcmp(cmd,"mapsize")) {
201 int x, y=0; 318 int x, y=0;
202 char tmpbuf[MAX_BUF], *cp; 319 char tmpbuf[MAX_BUF], *cp;
203 320
204 x = atoi(param); 321 x = atoi(param);
… …
207 y = atoi(cp+1); 324 y = atoi(cp+1);
208 break; 325 break;
209 } 326 }
210 if (x < 9 || y < 9 || x>MAP_CLIENT_X || y > MAP_CLIENT_Y) { 327 if (x < 9 || y < 9 || x>MAP_CLIENT_X || y > MAP_CLIENT_Y) {
211 sprintf(tmpbuf," %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 328 sprintf(tmpbuf," %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
212 strcat(cmdback, tmpbuf); 329 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
213 } else { 330 } else {
214 ns->mapx = x; 331 ns->mapx = x;
215 ns->mapy = y; 332 ns->mapy = y;
216 /* better to send back what we are really using and not the 333 /* better to send back what we are really using and not the
217 * param as given to us in case it gets parsed differently. 334 * param as given to us in case it gets parsed differently.
218 */ 335 */
219 sprintf(tmpbuf,"%dx%d", x,y); 336 sprintf(tmpbuf,"%dx%d", x,y);
220 strcat(cmdback, tmpbuf); 337 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
221 /* If beyond this size and still using orig map command, need to 338 /* If beyond this size and still using orig map command, need to
222 * go to map1cmd. 339 * go to map1cmd.
223 */ 340 */
224 if ((x>11 || y>11) && ns->mapmode == Map0Cmd) ns->mapmode = Map1Cmd; 341 if ((x>11 || y>11) && ns->mapmode == Map0Cmd) ns->mapmode = Map1Cmd;
225 } 342 }
226 } else if (!strcmp(cmd,"extendedMapInfos")) { 343 } else if (!strcmp(cmd,"extendedMapInfos")) {
227 /* Added by tchize 344 /* Added by tchize
228 * prepare to use the mapextended command 345 * prepare to use the mapextended command
229 */ 346 */
230 char tmpbuf[20]; 347 char tmpbuf[20];
231 ns->ext_mapinfos = (atoi(param)); 348 ns->ext_mapinfos = (atoi(param));
232 sprintf(tmpbuf,"%d", ns->ext_mapinfos); 349 sprintf(tmpbuf,"%d", ns->ext_mapinfos);
233 strcat(cmdback, tmpbuf); 350 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
234 } else if (!strcmp(cmd,"extendedTextInfos")) { 351 } else if (!strcmp(cmd,"extendedTextInfos")) {
235 /* Added by tchize 352 /* Added by tchize
236 * prepare to use the extended text commands 353 * prepare to use the extended text commands
237 * Client toggle this to non zero to get exttext 354 * Client toggle this to non zero to get exttext
238 */ 355 */
239 char tmpbuf[20]; 356 char tmpbuf[20];
357
240 ns->has_readable_type = (atoi(param)); 358 ns->has_readable_type = (atoi(param));
241 sprintf(tmpbuf,"%d", ns->has_readable_type); 359 sprintf(tmpbuf,"%d", ns->has_readable_type);
242 strcat(cmdback, tmpbuf); 360 safe_strcat(cmdback, tmpbuf, &slen, HUGE_BUF);
243 } else { 361 } else {
244 /* Didn't get a setup command we understood - 362 /* Didn't get a setup command we understood -
245 * report a failure to the client. 363 * report a failure to the client.
246 */ 364 */
247 strcat(cmdback, "FALSE"); 365 safe_strcat(cmdback, "FALSE", &slen, HUGE_BUF);
248 } 366 }
249 } /* for processing all the setup commands */ 367 } /* for processing all the setup commands */
250 LOG(llevInfo,"SendBack SetupCmd:: %s\n", cmdback); 368 LOG(llevInfo,"SendBack SetupCmd:: %s\n", cmdback);
251 Write_String_To_Socket(ns, cmdback, strlen(cmdback)); 369 Write_String_To_Socket(ns, cmdback, strlen(cmdback));
252} 370}
… …
362 * Basically, it makes no sense to wait for the client to request a 480 * Basically, it makes no sense to wait for the client to request a
363 * a piece of data from us that we know the client wants. So 481 * a piece of data from us that we know the client wants. So
364 * if we know the client wants it, might as well push it to the 482 * if we know the client wants it, might as well push it to the
365 * client. 483 * client.
366 */ 484 */
367void SendSmooth(NewSocket *ns, uint16 face) { 485static void SendSmooth(NewSocket *ns, uint16 face) {
368 uint16 smoothface; 486 uint16 smoothface;
369 uint8 reply[MAX_BUF]; 487 uint8 reply[MAX_BUF];
370 SockList sl; 488 SockList sl;
371 489
372 /* If we can't find a face, return and set it so we won't try to send this 490 /* If we can't find a face, return and set it so we won't try to send this
… …
617 LOG(llevDebug, "CS: scversion mismatch (%d,%d)\n",VERSION_SC,ns->sc_version); 735 LOG(llevDebug, "CS: scversion mismatch (%d,%d)\n",VERSION_SC,ns->sc_version);
618#endif 736#endif
619 } 737 }
620 cp = strchr(cp+1, ' '); 738 cp = strchr(cp+1, ' ');
621 if (cp) { 739 if (cp) {
622 LOG(llevDebug,"CS: connection from client of type <%s>\n", cp); 740 LOG(llevDebug,"CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
623 741
624 /* This is first implementation - i skip all beta DX clients with it 742 /* This is first implementation - i skip all beta DX clients with it
625 * Add later stuff here for other clients 743 * Add later stuff here for other clients
626 */ 744 */
627 745
… …
669{ 787{
670 if( pl->socket.newmapcmd == 1) { 788 if( pl->socket.newmapcmd == 1) {
671 memset(&pl->socket.lastmap, 0, sizeof(pl->socket.lastmap)); 789 memset(&pl->socket.lastmap, 0, sizeof(pl->socket.lastmap));
672 Write_String_To_Socket( &pl->socket, "newmap", 6); 790 Write_String_To_Socket( &pl->socket, "newmap", 6);
673 } 791 }
792 pl->socket.current_map = 0;
674} 793}
675 794
676 795
677 796
678/** 797/**
… …
1723 if (sl.len>startlen || pl->contr->socket.sent_scroll) { 1842 if (sl.len>startlen || pl->contr->socket.sent_scroll) {
1724 Send_With_Handling(&pl->contr->socket, &sl); 1843 Send_With_Handling(&pl->contr->socket, &sl);
1725 pl->contr->socket.sent_scroll = 0; 1844 pl->contr->socket.sent_scroll = 0;
1726 } 1845 }
1727 free(sl.buf); 1846 free(sl.buf);
1847
1848 check_map_change (pl->contr);
1728} 1849}
1729 1850
1730/** 1851/**
1731 * Draws client map. 1852 * Draws client map.
1732 */ 1853 */
… …
1736 sint16 ax, ay, nx, ny;/* ax and ay goes from 0 to max-size of arrays */ 1857 sint16 ax, ay, nx, ny;/* ax and ay goes from 0 to max-size of arrays */
1737 New_Face *face,*floor; 1858 New_Face *face,*floor;
1738 New_Face *floor2; 1859 New_Face *floor2;
1739 int d, mflags; 1860 int d, mflags;
1740 struct Map newmap; 1861 struct Map newmap;
1741 mapstruct *m; 1862 mapstruct *m, *pm;
1742 1863
1743 if (pl->type != PLAYER) { 1864 if (pl->type != PLAYER) {
1744 LOG(llevError,"draw_client_map called with non player/non eric-server\n"); 1865 LOG(llevError,"draw_client_map called with non player/non eric-server\n");
1745 return; 1866 return;
1746 } 1867 }
1747 1868
1869 if (pl->contr->transport) {
1870 pm = pl->contr->transport->map;
1871 }
1872 else
1873 pm = pl->map;
1874
1748 /* IF player is just joining the game, he isn't here yet, so the map 1875 /* If player is just joining the game, he isn't here yet, so the map
1749 * can get swapped out. If so, don't try to send them a map. All will 1876 * can get swapped out. If so, don't try to send them a map. All will
1750 * be OK once they really log in. 1877 * be OK once they really log in.
1751 */ 1878 */
1752 if (pl->map==NULL || pl->map->in_memory!=MAP_IN_MEMORY) return; 1879 if (pm==NULL || pm->in_memory!=MAP_IN_MEMORY) return;
1753 1880
1754 memset(&newmap, 0, sizeof(struct Map)); 1881 memset(&newmap, 0, sizeof(struct Map));
1755 1882
1756 for(j = (pl->y - pl->contr->socket.mapy/2) ; j < (pl->y + (pl->contr->socket.mapy+1)/2); j++) { 1883 for(j = (pl->y - pl->contr->socket.mapy/2) ; j < (pl->y + (pl->contr->socket.mapy+1)/2); j++) {
1757 for(i = (pl->x - pl->contr->socket.mapx/2) ; i < (pl->x + (pl->contr->socket.mapx+1)/2); i++) { 1884 for(i = (pl->x - pl->contr->socket.mapx/2) ; i < (pl->x + (pl->contr->socket.mapx+1)/2); i++) {
1758 ax=i; 1885 ax=i;
1759 ay=j; 1886 ay=j;
1760 m = pl->map; 1887 m = pm;
1761 mflags = get_map_flags(m, &m, ax, ay, &ax, &ay); 1888 mflags = get_map_flags(m, &m, ax, ay, &ax, &ay);
1762 if (mflags & P_OUT_OF_MAP) 1889 if (mflags & P_OUT_OF_MAP)
1763 continue; 1890 continue;
1764 if (mflags & P_NEED_UPDATE) 1891 if (mflags & P_NEED_UPDATE)
1765 update_position(m, ax, ay); 1892 update_position(m, ax, ay);
… …
1807 /* note the out_of_map and d>3 checks are both within the same 1934 /* note the out_of_map and d>3 checks are both within the same
1808 * negation check. 1935 * negation check.
1809 */ 1936 */
1810 nx = i; 1937 nx = i;
1811 ny = j; 1938 ny = j;
1812 m = get_map_from_coord(pl->map, &nx, &ny); 1939 m = get_map_from_coord(pm, &nx, &ny);
1813 if (m && d<4) { 1940 if (m && d<4) {
1814 face = GET_MAP_FACE(m, nx, ny,0); 1941 face = GET_MAP_FACE(m, nx, ny,0);
1815 floor2 = GET_MAP_FACE(m, nx, ny,1); 1942 floor2 = GET_MAP_FACE(m, nx, ny,1);
1816 floor = GET_MAP_FACE(m, nx, ny,2); 1943 floor = GET_MAP_FACE(m, nx, ny,2);
1817 1944
… …
1839 } 1966 }
1840 } /* Is a valid space */ 1967 } /* Is a valid space */
1841 } 1968 }
1842 } 1969 }
1843 esrv_map_doneredraw(&pl->contr->socket, &newmap); 1970 esrv_map_doneredraw(&pl->contr->socket, &newmap);
1971
1972 check_map_change (pl->contr);
1844} 1973}
1845 1974
1846 1975
1847void esrv_map_scroll(NewSocket *ns,int dx,int dy) 1976void esrv_map_scroll(NewSocket *ns,int dx,int dy)
1848{ 1977{
… …
1917{ 2046{
1918 SockList sl; 2047 SockList sl;
1919 int i; 2048 int i;
1920 2049
1921 sl.buf = malloc(MAXSOCKBUF); 2050 sl.buf = malloc(MAXSOCKBUF);
1922 strcpy(sl.buf,"replyinfo skill_info\n"); 2051 strcpy((char*)sl.buf,"replyinfo skill_info\n");
1923 for (i=1; i< NUM_SKILLS; i++) { 2052 for (i=1; i< NUM_SKILLS; i++) {
1924 sprintf(sl.buf + strlen(sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, 2053 sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO,
1925 skill_names[i]); 2054 skill_names[i]);
1926 } 2055 }
1927 sl.len = strlen(sl.buf); 2056 sl.len = strlen((char*)sl.buf);
1928 if (sl.len > MAXSOCKBUF) { 2057 if (sl.len > MAXSOCKBUF) {
1929 LOG(llevError,"Buffer overflow in send_skill_info!\n"); 2058 LOG(llevError,"Buffer overflow in send_skill_info!\n");
1930 fatal(0); 2059 fatal(0);
1931 } 2060 }
1932 Send_With_Handling(ns, &sl); 2061 Send_With_Handling(ns, &sl);
… …
1940void send_spell_paths (NewSocket *ns, char *params) { 2069void send_spell_paths (NewSocket *ns, char *params) {
1941 SockList sl; 2070 SockList sl;
1942 int i; 2071 int i;
1943 2072
1944 sl.buf = malloc(MAXSOCKBUF); 2073 sl.buf = malloc(MAXSOCKBUF);
1945 strcpy(sl.buf,"replyinfo spell_paths\n"); 2074 strcpy((char*)sl.buf,"replyinfo spell_paths\n");
1946 for(i=0; i<NRSPELLPATHS; i++) 2075 for(i=0; i<NRSPELLPATHS; i++)
1947 sprintf(sl.buf + strlen(sl.buf), "%d:%s\n", 1<<i, spellpathnames[i]); 2076 sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", 1<<i, spellpathnames[i]);
1948 sl.len = strlen(sl.buf); 2077 sl.len = strlen((char*)sl.buf);
1949 if (sl.len > MAXSOCKBUF) { 2078 if (sl.len > MAXSOCKBUF) {
1950 LOG(llevError,"Buffer overflow in send_spell_paths!\n"); 2079 LOG(llevError,"Buffer overflow in send_spell_paths!\n");
1951 fatal(0); 2080 fatal(0);
1952 } 2081 }
1953 Send_With_Handling(ns, &sl); 2082 Send_With_Handling(ns, &sl);
… …
1978 spell->last_eat = spell->stats.dam+SP_level_dam_adjust(pl->ob, spell); 2107 spell->last_eat = spell->stats.dam+SP_level_dam_adjust(pl->ob, spell);
1979 flags |= UPD_SP_DAMAGE; 2108 flags |= UPD_SP_DAMAGE;
1980 } 2109 }
1981 if (flags !=0) { 2110 if (flags !=0) {
1982 sl.buf = malloc(MAXSOCKBUF); 2111 sl.buf = malloc(MAXSOCKBUF);
1983 strcpy(sl.buf,"updspell "); 2112 strcpy((char*)sl.buf,"updspell ");
1984 sl.len=strlen((char*)sl.buf); 2113 sl.len=strlen((char*)sl.buf);
1985 SockList_AddChar(&sl, flags); 2114 SockList_AddChar(&sl, flags);
1986 SockList_AddInt(&sl, spell->count); 2115 SockList_AddInt(&sl, spell->count);
1987 if (flags & UPD_SP_MANA) SockList_AddShort(&sl, spell->last_sp); 2116 if (flags & UPD_SP_MANA) SockList_AddShort(&sl, spell->last_sp);
1988 if (flags & UPD_SP_GRACE) SockList_AddShort(&sl, spell->last_grace); 2117 if (flags & UPD_SP_GRACE) SockList_AddShort(&sl, spell->last_grace);
… …
2002 if (!pl || !spell || spell->env != pl->ob) { 2131 if (!pl || !spell || spell->env != pl->ob) {
2003 LOG(llevError, "Invalid call to esrv_remove_spell"); 2132 LOG(llevError, "Invalid call to esrv_remove_spell");
2004 return; 2133 return;
2005 } 2134 }
2006 sl.buf = malloc(MAXSOCKBUF); 2135 sl.buf = malloc(MAXSOCKBUF);
2007 strcpy(sl.buf,"delspell "); 2136 strcpy((char*)sl.buf,"delspell ");
2008 sl.len=strlen((char*)sl.buf); 2137 sl.len=strlen((char*)sl.buf);
2009 SockList_AddInt(&sl, spell->count); 2138 SockList_AddInt(&sl, spell->count);
2010 Send_With_Handling(&pl->socket, &sl); 2139 Send_With_Handling(&pl->socket, &sl);
2011 free(sl.buf); 2140 free(sl.buf);
2012} 2141}
2013 2142
2014/* appends the spell *spell to the Socklist we will send the data to. */ 2143/* appends the spell *spell to the Socklist we will send the data to. */
2015static void append_spell (player *pl, SockList *sl, object *spell) { 2144static void append_spell (player *pl, SockList *sl, object *spell) {
2016 int len, i, skill=0; 2145 int len, i, skill=0;
2017 2146
2018 if (!(spell->name)) { 2147 if (!(spell->name)) {
2019 LOG(llevError, "item number %d is a spell with no name.\n", spell->count); 2148 LOG(llevError, "item number %d is a spell with no name.\n", spell->count);
2020 return; 2149 return;
2021 } 2150 }
… …
2029 /* send the current values */ 2158 /* send the current values */
2030 SockList_AddShort(sl, spell->last_sp); 2159 SockList_AddShort(sl, spell->last_sp);
2031 SockList_AddShort(sl, spell->last_grace); 2160 SockList_AddShort(sl, spell->last_grace);
2032 SockList_AddShort(sl, spell->last_eat); 2161 SockList_AddShort(sl, spell->last_eat);
2033 2162
2034 /* figure out which skill it uses */ 2163 /* figure out which skill it uses, if it uses one */
2164 if (spell->skill) {
2035 for (i=1; i< NUM_SKILLS; i++) 2165 for (i=1; i< NUM_SKILLS; i++)
2036 if (!strcmp(spell->skill, skill_names[i])) { 2166 if (!strcmp(spell->skill, skill_names[i])) {
2037 skill = i+CS_STAT_SKILLINFO; 2167 skill = i+CS_STAT_SKILLINFO;
2038 break; 2168 break;
2039 } 2169 }
2040 skill = i+CS_STAT_SKILLINFO; 2170 }
2041 SockList_AddChar(sl, skill); 2171 SockList_AddChar(sl, skill);
2042 2172
2043 SockList_AddInt(sl, spell->path_attuned); 2173 SockList_AddInt(sl, spell->path_attuned);
2044 SockList_AddInt(sl, (spell->face)?spell->face->number:0); 2174 SockList_AddInt(sl, (spell->face)?spell->face->number:0);
2045 2175
… …
2069 LOG(llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2199 LOG(llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2070 return; 2200 return;
2071 } 2201 }
2072 if (!pl->socket.monitor_spells) return; 2202 if (!pl->socket.monitor_spells) return;
2073 sl.buf = malloc(MAXSOCKBUF); 2203 sl.buf = malloc(MAXSOCKBUF);
2074 strcpy(sl.buf,"addspell "); 2204 strcpy((char*)sl.buf,"addspell ");
2075 sl.len=strlen((char*)sl.buf); 2205 sl.len=strlen((char*)sl.buf);
2076 if (!spell) { 2206 if (!spell) {
2077 for (spell=pl->ob->inv; spell!=NULL; spell=spell->below) { 2207 for (spell=pl->ob->inv; spell!=NULL; spell=spell->below) {
2078 /* were we to simply keep appending data here, we could exceed 2208 /* were we to simply keep appending data here, we could exceed
2079 * MAXSOCKBUF if the player has enough spells to add, we know that 2209 * MAXSOCKBUF if the player has enough spells to add, we know that
… …
2090 */ 2220 */
2091 if (spell->type != SPELL) continue; 2221 if (spell->type != SPELL) continue;
2092 if (sl.len > (MAXSOCKBUF - (26 + strlen(spell->name) + 2222 if (sl.len > (MAXSOCKBUF - (26 + strlen(spell->name) +
2093 (spell->msg?strlen(spell->msg):0)))) { 2223 (spell->msg?strlen(spell->msg):0)))) {
2094 Send_With_Handling(&pl->socket, &sl); 2224 Send_With_Handling(&pl->socket, &sl);
2095 strcpy(sl.buf,"addspell "); 2225 strcpy((char*)sl.buf,"addspell ");
2096 sl.len=strlen((char*)sl.buf); 2226 sl.len=strlen((char*)sl.buf);
2097 } 2227 }
2098 append_spell(pl, &sl, spell); 2228 append_spell(pl, &sl, spell);
2099 } 2229 }
2100 } 2230 }

Diff Legend

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