- if (badguy == "snowball")
- Sector::current()->add_object(new SnowBall(get_pos().x, get_pos().y+32, dir, false));
- else if (badguy == "bouncingsnowball")
- Sector::current()->add_object(new BouncingSnowball(get_pos().x, get_pos().y+32, dir));
- else if (badguy == "mrbomb")
- Sector::current()->add_object(new MrBomb(get_pos().x, get_pos().y+32, dir, false));
- else if (badguy == "mriceblock")
- Sector::current()->add_object(new MrIceBlock(get_pos().x, get_pos().y+32, dir, false));
- else if (badguy == "snowsnail")
- Sector::current()->add_object(new SnowSnail(get_pos().x, get_pos().y+32, dir, false));
- else if (badguy == "mrrocket") {
- Sector::current()->add_object(new MrRocket(get_pos().x+(dir == LEFT ? -32 : 32), get_pos().y, dir));}
- else if (badguy == "poisonivy")
- Sector::current()->add_object(new PoisonIvy(get_pos().x, get_pos().y+32, dir, false));
- else if (badguy == "skullyhop")
- Sector::current()->add_object(new SkullyHop(get_pos().x, get_pos().y+44, dir));
- else if (badguy == "random")
- {
- switch (rand()%7)
+ Direction launchdir = dir;
+ if( !autotarget && start_dir == AUTO ){
+ Player* player = this->get_nearest_player();
+ if( player ){
+ launchdir = (player->get_pos().x > get_pos().x) ? RIGHT : LEFT;
+ }
+ }
+
+ if (badguys.size() > 1) {
+ if (random) {
+ next_badguy = gameRandom.rand(badguys.size());
+ }
+ else {
+ next_badguy++;
+
+ if (next_badguy >= badguys.size())
+ next_badguy = 0;
+ }
+ }
+
+ std::string badguy = badguys[next_badguy];
+
+ if(badguy == "random") {
+ log_warning << "random is outdated; use a list of badguys to select from." << std::endl;
+ return;
+ }
+ if(badguy == "goldbomb") {
+ log_warning << "goldbomb is not allowed to be dispensed" << std::endl;
+ return;
+ }
+
+ try {
+ GameObjectPtr game_object;
+ Vector spawnpoint;
+ Rectf object_bbox;
+
+ /* Need to allocate the badguy first to figure out its bounding box. */
+ game_object = ObjectFactory::instance().create(badguy, get_pos(), launchdir);
+ if (game_object == NULL)
+ throw std::runtime_error("Creating " + badguy + " object failed.");
+
+ BadGuy& bad_guy = dynamic_cast<BadGuy&>(*game_object);
+
+ object_bbox = bad_guy.get_bbox();
+
+ if (type == "dropper")