| … | |
… | |
| 132 | static void |
132 | static void |
| 133 | clear_map (player *pl) |
133 | clear_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 && 0) |
| 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 | |
158 | clear_map (pl); |
|
|
159 | } |
|
|
160 | else if (socket.current_map != ob->map) |
|
|
161 | { |
| 155 | clear_map (pl); |
162 | clear_map (pl); |
| 156 | |
163 | |
| 157 | if (socket.mapinfocmd) |
164 | if (socket.mapinfocmd) |
| 158 | { |
165 | { |
| 159 | if (ob->map && ob->map->path[0]) |
166 | if (ob->map && ob->map->path[0]) |
