diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2015-09-14 16:50:45 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2015-09-14 16:50:45 -0400 |
| commit | 78bd3d738a4b1cec8bd4504a36120f5795029e8b (patch) | |
| tree | 458b761360164f74a826570fa80cb07860c20ae9 /src/World.cpp | |
| parent | 329c8cb80d29aff078284db227af6c2cb114fc2f (diff) | |
fixes
Diffstat (limited to 'src/World.cpp')
| -rw-r--r-- | src/World.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/World.cpp b/src/World.cpp index 45df63c..41649d9 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -110,13 +110,14 @@ void World::detect(vec2 *v,vec2 *vel,const float width){ if(v->y<line[i].start){ // If we're inside the line
if(v->x>(HLINE*i)-1&&v->x<(HLINE*i)-1+HLINE){ // And we're inside it ;)
vel->y=0;v->y=line[i].start+HLINE/8; // Correct
-// return; // :/
+ return; // :/
}else if(v->x+width>(HLINE*i)-1&&v->x+width<(HLINE*i)-1+HLINE){ // Same as above, but coming from right side instead of left
vel->y=0;v->y=line[i].start+HLINE/8;
-// return; // ;)
+ return; // ;)
}
- }else if(v->y>line[i].start+HLINE){ // Trashy gravity handling
- vel->y-=.0000002;
+ }
+ if(v->y>line[i].start+HLINE){ // Trashy gravity handling
+ vel->y-=.0000001;
}
}
}
|