[ViewVC] Diff of: cvs/deliantra/server/socket/request.c

Comparing deliantra/server/socket/request.c (file contents):
Revision 1.4 by root, Sun Apr 16 04:36:34 2006 UTC vs.
Revision 1.10 by root, Mon Jun 19 10:15:44 2006 UTC

 /*
  * static char *rcsid_init_c =
- *    "$Id: request.c,v 1.4 2006/04/16 04:36:34 root Exp $";
+ *    "$Id: request.c,v 1.10 2006/06/19 10:15:44 root Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
       if (ob->map && ob->map->path [0])
         {
           int flags = 0;
-          if (ob->map->tile_map [0]) flags |= 1;
+          if (ob->map->tile_path [0]) flags |= 1;
-          if (ob->map->tile_map [1]) flags |= 2;
+          if (ob->map->tile_path [1]) flags |= 2;
-          if (ob->map->tile_map [2]) flags |= 4;
+          if (ob->map->tile_path [2]) flags |= 4;
-          if (ob->map->tile_map [3]) flags |= 8;
+          if (ob->map->tile_path [3]) flags |= 8;
-          snprintf (buf, MAX_BUF, "mapinfo current %d %d %d %d %d %s",
+          snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
-            flags, ob->x - pl->socket.mapx / 2, ob->y - pl->socket.mapy / 2,
+            flags, pl->socket.mapx / 2 - ob->x, pl->socket.mapy / 2 - ob->y,
             ob->map->width, ob->map->height, ob->map->path);
         }
       else
         snprintf (buf, MAX_BUF, "mapinfo current");
       Write_String_To_Socket (&pl->socket, buf, strlen (buf));
     }
+}
+void ExtCmd (char *buf, int len, player *pl)
+{
+  execute_global_event (EVENT_EXTCMD, pl, buf, len);
+}
+void MapInfoCmd (char *buf, int len, player *pl)
+{
+  // <mapinfo tag spatial tile-path
+  // >mapinfo tag spatial flags x y w h hash
+  char bigbuf[MAX_BUF], *cp, *token;
+  token = buf;
+  // copy token
+  if (!(buf = strchr (buf, ' ')))
+    return;
+  *buf++ = 0;
+  if (!strncmp (buf, "spatial ", 8))
+    {
+      buf += 8;
+      // initial map and its origin
+      mapstruct *map = pl->ob->map;
+      sint16 dx, dy;
+      int mapx = pl->socket.mapx / 2 - pl->ob->x;
+      int mapy = pl->socket.mapy / 2 - pl->ob->y;
+      int max_distance = 8; // limit maximum path length to something generous
+      while (*buf && map && max_distance)
+        {
+          int dir = *buf++;
+          switch (dir)
+            {
+              case '1':
+                dx = 0; dy = -1; map = get_map_from_coord (map, &dx, &dy);
+                map && (mapy -= map->height);
+                break;
+              case '2':
+                mapx += map->width;
+                dx = map->width; dy = 0; map = get_map_from_coord (map, &dx, &dy);
+                break;
+              case '3':
+                mapy += map->height;
+                dx = 0; dy = map->height; map = get_map_from_coord (map, &dx, &dy);
+                break;
+              case '4':
+                dx = -1; dy = 0; map = get_map_from_coord (map, &dx, &dy);
+                map && (mapx -= map->width);
+                break;
+            }
+          --max_distance;
+        }
+      if (!max_distance)
+        snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
+      else if (map && map->path [0])
+        {
+          int flags = 0;
+          if (map->tile_path [0]) flags |= 1;
+          if (map->tile_path [1]) flags |= 2;
+          if (map->tile_path [2]) flags |= 4;
+          if (map->tile_path [3]) flags |= 8;
+          snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s",
+            token, flags, mapx, mapy,
+            map->width, map->height, map->path);
+        }
+      else
+        snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
+    }
+  else
+    snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
+  Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf));
 }
 /** This is the Setup cmd - easy first implementation */
 void SetUp(char *buf, int len, NewSocket *ns)
 {
 //        } else if (!strcmp(cmd,"plugincmd")) {
 //            ns->plugincmd = atoi(param);
 //	    safe_strcat(cmdback, param, &slen, HUGE_BUF);
 	} else if (!strcmp(cmd,"mapinfocmd")) {
 	    ns->mapinfocmd = atoi(param);
-	    safe_strcat(cmdback, param, &slen, HUGE_BUF);
+	    safe_strcat(cmdback, "1", &slen, HUGE_BUF);
+	} else if (!strcmp(cmd,"extcmd")) {
+	    ns->extcmd = atoi(param);
+	    safe_strcat(cmdback, "1", &slen, HUGE_BUF);
 	} else if (!strcmp(cmd,"facecache")) {
 	    ns->facecache = atoi(param);
 	    safe_strcat(cmdback, param, &slen, HUGE_BUF);
 	} else if (!strcmp(cmd,"faceset")) {
 	    char tmpbuf[20];
     short packet;
     char    command[MAX_BUF];
     SockList sl;
     if (len < 7) {
-	LOG(llevDebug,"Corrupt ncom command - not long enough - discarding\n");
+	LOG(llevDebug,"Corrupt ncom command <%s> not long enough - discarding\n", buf);
 	return;
     }
     packet = GetShort_String(buf);
     repeat = GetInt_String(buf+2);
 {
     if( pl->socket.newmapcmd == 1) {
         memset(&pl->socket.lastmap, 0, sizeof(pl->socket.lastmap));
         Write_String_To_Socket( &pl->socket, "newmap", 6);
     }
+    pl->socket.current_map = 0;
 }
 /**
     for(y=pl->y-pl->contr->socket.mapy/2; y<max_y; y++,ay++) {
 	ax=0;
 	for(x=pl->x-pl->contr->socket.mapx/2;x<max_x;x++,ax++) {
-	    mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
-	    emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
+	    emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
 	    /* If this space is out of the normal viewable area, we only check
 	     * the heads value  ax or ay will only be greater than what
 	     * the client wants if using the map1a command - this is because
 	     * if the map1a command is not used, max_x and max_y will be
     for (i=1; i< NUM_SKILLS; i++) {
 	sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO,
 		skill_names[i]);
     }
     sl.len = strlen((char*)sl.buf);
-    if (sl.len > MAXSOCKBUF) {
+    if (sl.len >= MAXSOCKBUF) {
 	LOG(llevError,"Buffer overflow in send_skill_info!\n");
 	fatal(0);
     }
     Send_With_Handling(ns, &sl);
     free(sl.buf);
     sl.buf = malloc(MAXSOCKBUF);
     strcpy((char*)sl.buf,"replyinfo spell_paths\n");
     for(i=0; i<NRSPELLPATHS; i++)
 	sprintf((char*)sl.buf + strlen((char*)sl.buf), "%d:%s\n", 1<<i, spellpathnames[i]);
     sl.len = strlen((char*)sl.buf);
-    if (sl.len > MAXSOCKBUF) {
+    if (sl.len >= MAXSOCKBUF) {
 	LOG(llevError,"Buffer overflow in send_spell_paths!\n");
 	fatal(0);
     }
     Send_With_Handling(ns, &sl);
     free(sl.buf);
 	     * to show add_spell is 26 bytes + 2 strings.  However, the overun
 	     * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
 	     * like it will fix this
 	     */
 	    if (spell->type != SPELL) continue;
-	    if (sl.len > (MAXSOCKBUF - (26 + strlen(spell->name) +
+	    if (sl.len >= (MAXSOCKBUF - (26 + strlen(spell->name) +
 				(spell->msg?strlen(spell->msg):0)))) {
 		Send_With_Handling(&pl->socket, &sl);
 		strcpy((char*)sl.buf,"addspell ");
 		sl.len=strlen((char*)sl.buf);
 	    }
     else if (spell->type != SPELL) {
 	LOG(llevError, "Asked to send a non-spell object as a spell");
 	return;
     }
     else append_spell(pl, &sl, spell);
-    if (sl.len > MAXSOCKBUF) {
+    if (sl.len >= MAXSOCKBUF) {
 	LOG(llevError,"Buffer overflow in esrv_add_spells!\n");
 	fatal(0);
     }
     /* finally, we can send the packet */
     Send_With_Handling(&pl->socket, &sl);

Diff Legend

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

Comparing deliantra/server/socket/request.c (file contents): Revision 1.4 by root, Sun Apr 16 04:36:34 2006 UTC vs. Revision 1.10 by root, Mon Jun 19 10:15:44 2006 UTC

Diff Legend

Comparing deliantra/server/socket/request.c (file contents):
Revision 1.4 by root, Sun Apr 16 04:36:34 2006 UTC vs.
Revision 1.10 by root, Mon Jun 19 10:15:44 2006 UTC