#include "tile_manager.h"
#include "sector.h"
#include "gameloop.h"
+#include "object_factory.h"
#include "object/gameobjs.h"
#include "object/camera.h"
#include "object/tilemap.h"
tiles_board = new ButtonGroup(Vector(screen->w - 140, 100),
Vector(32,32), Vector(4,8));
- TileManager* tilemanager = TileManager::instance();
-
tiles_board->add_button(Button(img_rubber_bt, _("Eraser"), SDLKey(SDLK_DELETE)), 0);
- for(unsigned int id = 1; id < tilemanager->get_max_tileid(); id++)
+ unsigned int id;
+ for(id = 1; id < tile_manager->get_max_tileid(); id++)
{
- const Tile* tile = tilemanager->get(id);
+ const Tile* tile = tile_manager->get(id);
if(!tile)
continue;
- Surface* surface;
- if(tile->editor_images.size())
- surface = tile->editor_images[0];
- else if(tile->images.size())
- surface = tile->images[0];
- else
+ Surface* surface = tile->get_editor_image();
+ if(!surface)
continue;
Button button = Button(surface, "", SDLKey(0));
tiles_board->add_button(button, id);
}
-
- #if 0
- for(int i = 0; i < NUM_BadGuyKinds; i++)
- {
- // filter bomb, since it is only for internal use, not for levels
- if(i == BAD_BOMB)
- continue;
-
- BadGuyKind kind = BadGuyKind(i);
- BadGuy badguy(kind, 0,0);
- badguy.activate(LEFT);
-
- Surface *img = badguy.get_image();
- tiles_board->add_button(Button(img, "", SDLKey(SDLK_1+i)), -(i+1));
- }
- #endif
-
- #if 0
- tiles_board->add_button(Button(img_trampoline[0].get_frame(0), _("Trampoline"), SDLKey(0)), OBJ_TRAMPOLINE);
- tiles_board->add_button(Button(img_flying_platform->get_frame(0), _("Flying Platform"), SDLKey(0)), OBJ_FLYING_PLATFORM);
- #endif
+ gameobjs_first_id = id;
+
+ for(Factories::iterator i = object_factories->begin();
+ i != object_factories->end(); ++i) {
+
+// Surface *img = badguy.get_image();
+// FIXME: get image from object. Using the rubber in the meanwhile.
+ tiles_board->add_button(Button(img_rubber_bt, i->first,
+ SDLKey(SDLK_1+id)), id++);
+ }
tiles_layer = new ButtonGroup(Vector(12, screen->h-64), Vector(80,20), Vector(1,3));
tiles_layer->add_button(Button(img_foreground_bt, _("Edtit foreground tiles"),
{
vector.push_back(tilemap->get_tile(x +
(int)(((selection_ini.x+scroll.x)*zoom)/32),
- y + (int)(((selection_ini.y+scroll.y)*zoom)/32))->id);
+ y + (int)(((selection_ini.y+scroll.y)*zoom)/32))->getID());
}
selection.push_back(vector);
}
if(selection[0][0] == 0 && selection.size() == 1)
context.draw_surface(img_rubber_bt, Vector(event.button.x - 8,
event.button.y - 8), LAYER_GUI-2);
- else if(selection[0][0] < 0)
+ else if(selection[0][0] >= gameobjs_first_id || selection[0][0] < 0)
{
+// FIXME: this should draw an object image near cursor
+#if 0
int id = selection[0][0];
-#if 0
if(id == OBJ_TRAMPOLINE)
context.draw_surface(img_trampoline[0].get_frame(0), Vector(event.button.x - 8,
event.button.y - 8), LAYER_GUI-2);
context.draw_surface(img_flying_platform->get_frame(0), Vector(event.button.x - 8,
event.button.y - 8), LAYER_GUI-2);
else
-#endif
if(id == OBJ_DOOR)
/*context.draw_surface(door->get_frame(0), Vector(event.button.x - 8,
event.button.y - 8), LAYER_GUI-2);*/
;
else
{
-#if 0
BadGuyKind kind = BadGuyKind((-id)-1);
BadGuy badguy(kind, 0,0);
badguy.activate(LEFT);
context.draw_surface(img, Vector(event.button.x - 8,
event.button.y - 8), LAYER_GUI-2);
-#endif
}
+#endif
}
else
{
- TileManager* tilemanager = TileManager::instance();
for(unsigned int x = 0; x < selection.size(); x++)
for(unsigned int y = 0; y < selection[x].size(); y++) {
- const Tile* tile = tilemanager->get(selection[x][y]);
+ const Tile* tile = tile_manager->get(selection[x][y]);
tile->draw(context,
Vector(event.button.x + x*32 - 8, event.button.y + y*32 - 8),
LAYER_GUI-2);
/* Point foregrounds, backgrounds, solids to its layer */
for(Sector::GameObjects::iterator i = sector->gameobjects.begin(); i != sector->gameobjects.end(); i++)
{
-#if 0
- BadGuy* badguy = dynamic_cast<BadGuy*> (*i);
- if(badguy)
- badguy->activate(LEFT);
-#endif
-
TileMap* tilemap = dynamic_cast<TileMap*> (*i);
if(tilemap)
{
level_changed = true;
if(zoom != 1)
- { // no need to do this for normal view (no zoom)
+ {
+ // no need to do this for normal view (no zoom)
x = (int)(x * (zoom*32) / 32);
y = (int)(y * (zoom*32) / 32);
}
- if(newtile < 0) // add object
+ if(newtile >= gameobjs_first_id) // add object
{
// remove an active tile or object that might be there
change(x, y, 0, LAYER_TILES);
-#if 0
- if(newtile == OBJ_TRAMPOLINE)
- sector->add_object(new Trampoline(x, y));
- else if(newtile == OBJ_FLYING_PLATFORM)
- sector->add_object(new FlyingPlatform(x, y));
- else
- if(newtile == OBJ_DOOR)
- sector->add_object(new Door(x, y));
- else
- sector->add_bad_guy(x, y, BadGuyKind((-newtile)-1), true);
-#endif
-
- sector->update_game_objects();
+ int id = 0;
+ GameObject* object = 0;
+ for(Factories::iterator i = object_factories->begin(); i !=
+ object_factories->end(); ++i) {
+ if(id == newtile - gameobjs_first_id) {
+ object = create_object(i->first, Vector(x, y));
+ break;
+ }
+ id++;
+ }
+ if(object) {
+ sector->add_object(object);
+ sector->update_game_objects();
+ }
} else if(cur_layer == LAYER_FOREGROUNDTILES) {
foregrounds->change(x/32, y/32, newtile);
} else if(cur_layer == LAYER_TILES) {
// we /32 in order to round numbers
for(Sector::GameObjects::iterator i = sector->gameobjects.begin();
i < sector->gameobjects.end(); i++) {
+// FIXME: if there is a game objs in here, remove it!
#if 0
BadGuy* badguy = dynamic_cast<BadGuy*> (*i);
if(badguy)
if((int)badguy->base.x/32 == x/32 && (int)badguy->base.y/32 == y/32)
sector->gameobjects.erase(i);
-#endif
-#if 0
Trampoline* trampoline = dynamic_cast<Trampoline*> (*i);
if(trampoline)
{
if(flying_platform)
if((int)flying_platform->base.x/32 == x/32 && (int)flying_platform->base.y/32 == y/32)
sector->gameobjects.erase(i);
-#endif
-#if 0
Door* door = dynamic_cast<Door*> (*i);
if(door)
if((int)door->get_area().x/32 == x/32 && (int)door->get_area().y/32 == y/32)
projects / supertux.git / blobdiff