projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#303: Typo fixes from mathnerd314
[supertux.git]
/
src
/
object
/
scripted_object.cpp
diff --git
a/src/object/scripted_object.cpp
b/src/object/scripted_object.cpp
index
65dffb4
..
eadcc43
100644
(file)
--- a/
src/object/scripted_object.cpp
+++ b/
src/object/scripted_object.cpp
@@
-29,7
+29,7
@@
#include "math/vector.hpp"
ScriptedObject::ScriptedObject(const lisp::Lisp& lisp)
#include "math/vector.hpp"
ScriptedObject::ScriptedObject(const lisp::Lisp& lisp)
- : MovingSprite(lisp, LAYER_OBJECTS, COLGROUP_MOVING),
+ : MovingSprite(lisp, LAYER_OBJECTS, COLGROUP_MOVING
_STATIC
),
solid(true), physic_enabled(true), visible(true), new_vel_set(false)
{
lisp.get("name", name);
solid(true), physic_enabled(true), visible(true), new_vel_set(false)
{
lisp.get("name", name);
@@
-48,11
+48,7
@@
ScriptedObject::ScriptedObject(const lisp::Lisp& lisp)
lisp.get("visible", visible);
lisp.get("z-pos", layer);
if( solid ){
lisp.get("visible", visible);
lisp.get("z-pos", layer);
if( solid ){
- if( physic_enabled ){
- set_group( COLGROUP_MOVING );
- } else {
- set_group( COLGROUP_STATIC );
- }
+ set_group( COLGROUP_MOVING_STATIC );
} else {
set_group( COLGROUP_DISABLED );
}
} else {
set_group( COLGROUP_DISABLED );
}
@@
-134,11
+130,7
@@
ScriptedObject::set_solid(bool solid)
{
this->solid = solid;
if( solid ){
{
this->solid = solid;
if( solid ){
- if( physic_enabled ){
- set_group( COLGROUP_MOVING );
- } else {
- set_group( COLGROUP_STATIC );
- }
+ set_group( COLGROUP_MOVING_STATIC );
} else {
set_group( COLGROUP_DISABLED );
}
} else {
set_group( COLGROUP_DISABLED );
}
@@
-201,7
+193,7
@@
ScriptedObject::collision_solid(const CollisionHit& hit)
if(physic.get_velocity_y() > 0)
physic.set_velocity_y(0);
} else if(hit.top) {
if(physic.get_velocity_y() > 0)
physic.set_velocity_y(0);
} else if(hit.top) {
- physic.set_velocity_y(.1);
+ physic.set_velocity_y(.1
f
);
}
if(hit.left || hit.right) {
}
if(hit.left || hit.right) {