projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed flip level transformer
[supertux.git]
/
src
/
object
/
infoblock.cpp
diff --git
a/src/object/infoblock.cpp
b/src/object/infoblock.cpp
index
6e98963
..
aff82ac
100644
(file)
--- a/
src/object/infoblock.cpp
+++ b/
src/object/infoblock.cpp
@@
-1,7
+1,7
@@
// $Id$
// $Id$
-//
+//
// SuperTux
// SuperTux
-// Copyright (C) 200
5
Matthias Braun <matze@braunis.de>
+// Copyright (C) 200
6
Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-12,11
+12,10
@@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <config.h>
#include <config.h>
@@
-27,7
+26,7
@@
#include "object_factory.hpp"
#include "lisp/lisp.hpp"
#include "sector.hpp"
#include "object_factory.hpp"
#include "lisp/lisp.hpp"
#include "sector.hpp"
-#include "
ms
g.hpp"
+#include "
lo
g.hpp"
InfoBlock::InfoBlock(const lisp::Lisp& lisp)
: Block(sprite_manager->create("images/objects/bonus_block/infoblock.sprite"))
InfoBlock::InfoBlock(const lisp::Lisp& lisp)
: Block(sprite_manager->create("images/objects/bonus_block/infoblock.sprite"))
@@
-38,7
+37,7
@@
InfoBlock::InfoBlock(const lisp::Lisp& lisp)
bbox.set_pos(pos);
if(!lisp.get("message", message)) {
bbox.set_pos(pos);
if(!lisp.get("message", message)) {
-
msg_warning("No message in InfoBlock")
;
+
log_warning << "No message in InfoBlock" << std::endl
;
}
//stopped = false;
//ringing = new AmbientSound(get_pos(), 0.5, 300, 1, "sounds/phone.wav");
}
//stopped = false;
//ringing = new AmbientSound(get_pos(), 0.5, 300, 1, "sounds/phone.wav");