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.78 by root, Thu Mar 15 14:59:43 2007 UTC vs.
Revision 1.82 by root, Sun Mar 18 03:05:41 2007 UTC

132static void 132static void
133clear_map (player *pl) 133clear_map (player *pl)
134{ 134{
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 136
137 pl->ns->force_newmap = false;
138
137 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
138 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
139 141
140 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
141} 143}
146{ 148{
147 client &socket = *pl->ns; 149 client &socket = *pl->ns;
148 object *ob = pl->ob; 150 object *ob = pl->ob;
149 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
150 152
151 if (socket.current_map != ob->map) 153 if (socket.force_newmap)
152 { 154 {
155 // force newmap is used for clients that do not redraw their map
156 // after image uploads.
153 socket.current_map = ob->map; 157 socket.current_map = ob->map;
154
155 clear_map (pl); 158 clear_map (pl);
159 }
160 else if (socket.current_map != ob->map)
161 {
162 clear_map (pl);
163 socket.current_map = ob->map;
156 164
157 if (socket.mapinfocmd) 165 if (socket.mapinfocmd)
158 { 166 {
159 if (ob->map && ob->map->path[0]) 167 if (ob->map && ob->map->path[0])
160 { 168 {
970/** 978/**
971 * Asks the client to query the user. This way, the client knows 979 * Asks the client to query the user. This way, the client knows
972 * it needs to send something back (vs just printing out a message) 980 * it needs to send something back (vs just printing out a message)
973 */ 981 */
974void 982void
975send_query (client *ns, uint8 flags, char *text) 983send_query (client *ns, uint8 flags, const char *text)
976{ 984{
977 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 985 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
978} 986}
979 987
980#define AddIfInt64(Old,New,Type) if (Old != New) {\ 988#define AddIfInt64(Old,New,Type) if (Old != New) {\

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines