ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/main.C
(Generate patch)

Comparing deliantra/server/server/main.C (file contents):
Revision 1.149 by root, Fri Mar 26 01:04:45 2010 UTC vs.
Revision 1.155 by root, Wed Apr 21 06:45:57 2010 UTC

… …
81 81
82 if (contr && map != newmap && map) 82 if (contr && map != newmap && map)
83 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 83 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
84 return; 84 return;
85 85
86 // remove, so stupid ob_locked does not trigger a failure 86 // remove, so stupid blocked does not trigger a failure
87 remove (); 87 remove ();
88 88
89 /* try to find a spot for the player */ 89 /* try to find a spot for the player */
90 if (blocked (newmap, x, y)) 90 if (blocked (newmap, x, y))
91 { /* First choice blocked */ 91 { /* First choice blocked */
… …
96 * Note that for the second and third calls, we could start at a position other 96 * Note that for the second and third calls, we could start at a position other
97 * than one, but then we could end up on the other side of walls and so forth. 97 * than one, but then we could end up on the other side of walls and so forth.
98 */ 98 */
99 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1); 99 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1);
100 100
101 if (i == -1) 101 if (i < 0)
102 { 102 {
103 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1); 103 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1);
104 if (i == -1) 104 if (i < 0)
105 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE); 105 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
106 } 106 }
107 107
108 if (i != -1) 108 if (i >= 0)
109 { 109 {
110 x += freearr_x[i]; 110 x += freearr_x[i];
111 y += freearr_y[i]; 111 y += freearr_y[i];
112 } 112 }
113 else 113 else
… …
122 122
123 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 123 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
124 return; 124 return;
125 } 125 }
126 126
127 this->x = x; 127 newmap->insert (this, x, y, 0, INS_NO_WALK_ON);
128 this->y = y;
129 map = newmap;
130
131 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
132 128
133 enemy = 0; 129 enemy = 0;
134 130
135 if (contr) 131 if (contr)
136 { 132 {
… …
147 if (i < 0) 143 if (i < 0)
148 golem->drop_and_destroy (); 144 golem->drop_and_destroy ();
149 else 145 else
150 { 146 {
151 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 147 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
152 golem->direction = find_dir_2 (x - golem->x, y - golem->y); 148 golem->direction = find_dir_2 (golem->x - x, golem->y - y);
153 } 149 }
154 } 150 }
155 151
156 /* since the players map is already loaded, we don't need to worry 152 /* since the players map is already loaded, we don't need to worry
157 * about pending objects. 153 * about pending objects.
… …
233 prefetch (&next->anim_speed, 0, 1); 229 prefetch (&next->anim_speed, 0, 1);
234 prefetch (&next->contr , 0, 1); 230 prefetch (&next->contr , 0, 1);
235 } 231 }
236 232
237 /* Now process op */ 233 /* Now process op */
238 if (expect_false (QUERY_FLAG (op, FLAG_FREED))) 234 if (expect_false (op->flag [FLAG_FREED]))
239 { 235 {
240 LOG (llevError, "BUG: process_events(): Free object on list\n"); 236 LOG (llevError, "BUG: process_events(): Free object on list\n");
241 op->set_speed (0); 237 op->set_speed (0);
242 continue; 238 continue;
243 } 239 }
… …
408 // then do some bookkeeping, should not really be here 404 // then do some bookkeeping, should not really be here
409 do_specials (); /* Routines called from time to time. */ 405 do_specials (); /* Routines called from time to time. */
410 attachable::check_mortals (); 406 attachable::check_mortals ();
411 407
412 ++pticks; 408 ++pticks;
409
410 if (object::object_count >= RESTART_COUNT)
411 cleanup ("running out of protocol ID values - need full restart");
413} 412}
414 413
415// normal main 414// normal main
416int 415int
417main (int argc, char **argv) 416main (int argc, char **argv)

Diff Legend

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