projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
forgot to add new files
[supertux.git]
/
src
/
leveleditor.cpp
diff --git
a/src/leveleditor.cpp
b/src/leveleditor.cpp
index
d6d8a2e
..
198c0c2
100644
(file)
--- a/
src/leveleditor.cpp
+++ b/
src/leveleditor.cpp
@@
-101,21
+101,15
@@
LevelEditor::LevelEditor()
tiles_board = new ButtonGroup(Vector(screen->w - 140, 100),
Vector(32,32), Vector(4,8));
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);
tiles_board->add_button(Button(img_rubber_bt, _("Eraser"), SDLKey(SDLK_DELETE)), 0);
- for(unsigned int id = 1; id < tilemanager->get_max_tileid(); id++)
+ for(unsigned int 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;
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));
continue;
Button button = Button(surface, "", SDLKey(0));
@@
-459,7
+453,7
@@
std::cerr << "previous sector.\n";
{
vector.push_back(tilemap->get_tile(x +
(int)(((selection_ini.x+scroll.x)*zoom)/32),
{
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);
}
}
selection.push_back(vector);
}
@@
-646,10
+640,9
@@
if(sector)
}
else
{
}
else
{
- TileManager* tilemanager = TileManager::instance();
for(unsigned int x = 0; x < selection.size(); x++)
for(unsigned int y = 0; y < selection[x].size(); y++) {
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);
tile->draw(context,
Vector(event.button.x + x*32 - 8, event.button.y + y*32 - 8),
LAYER_GUI-2);