projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrote Yeti to rely on position instead of ellapsed time
[supertux.git]
/
src
/
object
/
block.cpp
diff --git
a/src/object/block.cpp
b/src/object/block.cpp
index
0e9fe52
..
6d0c5f4
100644
(file)
--- a/
src/object/block.cpp
+++ b/
src/object/block.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,15
+12,15
@@
// 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 "block.hpp"
#include <config.h>
#include "block.hpp"
-#include "
ms
g.hpp"
+#include "
lo
g.hpp"
#include <stdexcept>
#include <stdexcept>
@@
-134,7
+134,7
@@
BonusBlock::BonusBlock(const Vector& pos, int data)
case 4: contents = CONTENT_1UP; break;
case 5: contents = CONTENT_ICEGROW; break;
default:
case 4: contents = CONTENT_1UP; break;
case 5: contents = CONTENT_ICEGROW; break;
default:
-
ms
g_warning << "Invalid box contents" << std::endl;
+
lo
g_warning << "Invalid box contents" << std::endl;
contents = CONTENT_COIN;
break;
}
contents = CONTENT_COIN;
break;
}
@@
-169,7
+169,7
@@
BonusBlock::BonusBlock(const lisp::Lisp& lisp)
} else if(contentstring == "custom") {
contents = CONTENT_CUSTOM;
} else {
} else if(contentstring == "custom") {
contents = CONTENT_CUSTOM;
} else {
-
ms
g_warning << "Invalid box contents '" << contentstring << "'" << std::endl;
+
lo
g_warning << "Invalid box contents '" << contentstring << "'" << std::endl;
}
} else {
if(contents == CONTENT_CUSTOM) {
}
} else {
if(contents == CONTENT_CUSTOM) {
@@
-179,7
+179,7
@@
BonusBlock::BonusBlock(const lisp::Lisp& lisp)
throw std::runtime_error(
"Only MovingObjects are allowed inside BonusBlocks");
} else {
throw std::runtime_error(
"Only MovingObjects are allowed inside BonusBlocks");
} else {
-
ms
g_warning << "Invalid element '" << token << "' in bonusblock" << std::endl;
+
lo
g_warning << "Invalid element '" << token << "' in bonusblock" << std::endl;
}
}
}
}
}
}
@@
-204,7
+204,7
@@
BonusBlock::hit(Player& )
void
BonusBlock::try_open()
{
void
BonusBlock::try_open()
{
- if(sprite->get_action
_name
() == "empty") {
+ if(sprite->get_action() == "empty") {
sound_manager->play("sounds/brick.wav");
return;
}
sound_manager->play("sounds/brick.wav");
return;
}
@@
-214,7
+214,7
@@
BonusBlock::try_open()
switch(contents) {
case CONTENT_COIN:
Sector::current()->add_object(new BouncyCoin(get_pos()));
switch(contents) {
case CONTENT_COIN:
Sector::current()->add_object(new BouncyCoin(get_pos()));
- player.get_status()->
incCoins(
);
+ player.get_status()->
add_coins(1
);
break;
case CONTENT_FIREGROW:
break;
case CONTENT_FIREGROW:
@@
-282,7
+282,7
@@
Brick::Brick(const Vector& pos, int data)
void
Brick::hit(Player& )
{
void
Brick::hit(Player& )
{
- if(sprite->get_action
_name
() == "empty")
+ if(sprite->get_action() == "empty")
return;
try_break(true);
return;
try_break(true);
@@
-291,7
+291,7
@@
Brick::hit(Player& )
void
Brick::try_break(bool playerhit)
{
void
Brick::try_break(bool playerhit)
{
- if(sprite->get_action
_name
() == "empty")
+ if(sprite->get_action() == "empty")
return;
sound_manager->play("sounds/brick.wav");
return;
sound_manager->play("sounds/brick.wav");
@@
-300,7
+300,7
@@
Brick::try_break(bool playerhit)
if(coin_counter > 0) {
sector->add_object(new BouncyCoin(get_pos()));
coin_counter--;
if(coin_counter > 0) {
sector->add_object(new BouncyCoin(get_pos()));
coin_counter--;
- player.get_status()->
incCoins(
);
+ player.get_status()->
add_coins(1
);
if(coin_counter == 0)
sprite->set_action("empty");
start_bounce();
if(coin_counter == 0)
sprite->set_action("empty");
start_bounce();