try {
lisp::Parser parser;
- std::auto_ptr<lisp::Lisp> root (parser.parse(map_filename));
+ const lisp::Lisp* root = parser.parse(map_filename);
const lisp::Lisp* lisp = root->get_lisp("supertux-level");
if(!lisp)
try {
lisp::Parser parser;
- std::auto_ptr<lisp::Lisp> root (parser.parse(levels_path + level.get_name()));
+ const lisp::Lisp* root = parser.parse(levels_path + level.get_name());
const lisp::Lisp* level_lisp = root->get_lisp("supertux-level");
if(!level_lisp)
camera_offset.x = (int)solids->get_width()*32 - SCREEN_WIDTH;
if (camera_offset.y > (int)solids->get_height()*32 - SCREEN_HEIGHT)
camera_offset.y = (int)solids->get_height()*32 - SCREEN_HEIGHT;
-
+
if (int(solids->get_width()*32) < SCREEN_WIDTH)
camera_offset.x = solids->get_width()*16.0 - SCREEN_WIDTH/2.0;
if (int(solids->get_height()*32) < SCREEN_HEIGHT)
get_level_title(*level);
context.draw_text(white_text, level->title,
- Vector(SCREEN_WIDTH/2,
- SCREEN_HEIGHT - white_text->get_height() - 30),
- CENTER_ALLIGN, LAYER_FOREGROUND1);
+ Vector(SCREEN_WIDTH/2,
+ SCREEN_HEIGHT - white_text->get_height() - 30),
+ ALIGN_CENTER, LAYER_FOREGROUND1);
// if level is solved, draw level picture behind stats
/*
context.draw_text(gold_text, special_tile->map_message,
Vector(SCREEN_WIDTH/2,
SCREEN_HEIGHT - white_text->get_height() - 60),
- CENTER_ALLIGN, LAYER_FOREGROUND1);
+ ALIGN_CENTER, LAYER_FOREGROUND1);
break;
}
}
Teleporter* teleporter = at_teleporter(tux->get_tile_pos());
if (teleporter && (teleporter->message != "")) {
Vector pos = Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT - white_text->get_height() - 30);
- context.draw_text(white_text, teleporter->message, pos, CENTER_ALLIGN, LAYER_FOREGROUND1);
+ context.draw_text(white_text, teleporter->message, pos, ALIGN_CENTER, LAYER_FOREGROUND1);
}
}
if(passive_message_timer.started())
context.draw_text(gold_text, passive_message,
Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT - white_text->get_height() - 60),
- CENTER_ALLIGN, LAYER_FOREGROUND1);
+ ALIGN_CENTER, LAYER_FOREGROUND1);
context.pop_transform();
}
// push world into worlds table
sq_createslot(vm, -3);
- } catch(std::exception& e) {
+ } catch(std::exception& ) {
sq_settop(vm, oldtop);
}
sq_settop(vm, oldtop);
-
+
if(World::current() != NULL)
World::current()->save_state();
}