projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for #453 (Menu frame lingers)
[supertux.git]
/
src
/
worldmap
/
worldmap.cpp
diff --git
a/src/worldmap/worldmap.cpp
b/src/worldmap/worldmap.cpp
index
1f2e377
..
94856d1
100644
(file)
--- a/
src/worldmap/worldmap.cpp
+++ b/
src/worldmap/worldmap.cpp
@@
-355,7
+355,7
@@
WorldMap::load(const std::string& filename)
add_object(teleporter);
} else if(iter.item() == "ambient-light") {
std::vector<float> vColor;
add_object(teleporter);
} else if(iter.item() == "ambient-light") {
std::vector<float> vColor;
- sector->get
_vector
( "ambient-light", vColor );
+ sector->get( "ambient-light", vColor );
if(vColor.size() < 3) {
log_warning << "(ambient-light) requires a color as argument" << std::endl;
} else {
if(vColor.size() < 3) {
log_warning << "(ambient-light) requires a color as argument" << std::endl;
} else {
@@
-577,8
+577,6
@@
WorldMap::update(float delta)
if(!in_level) {
Menu* menu = Menu::current();
if(menu != NULL) {
if(!in_level) {
Menu* menu = Menu::current();
if(menu != NULL) {
- menu->update();
-
if(menu == worldmap_menu.get()) {
switch (worldmap_menu->check())
{
if(menu == worldmap_menu.get()) {
switch (worldmap_menu->check())
{