diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2015-09-12 20:55:37 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2015-09-12 20:55:37 -0400 |
| commit | f3028d986781fb9a5199b6a0394b5a79871af156 (patch) | |
| tree | 4adb1a0e97d5095c4087ebf9df25e592dc406421 /src/World.cpp | |
| parent | 16b3df909a66c9a70309e878f67a962230b799ed (diff) | |
jump
Diffstat (limited to 'src/World.cpp')
| -rw-r--r-- | src/World.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/World.cpp b/src/World.cpp index ca19ba1..e361608 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -104,21 +104,21 @@ LOOP2: }
}
}
-void World::detect(vec2 *v,const float width){
+void World::detect(vec2 *v,vec2 *vel,const float width){
unsigned int i;
// hey
// oh hai
for(i=0;i<lineCount-10;i++){
if(v->y<line[i].start){
if(v->x>(HLINE*i)-1&&v->x<(HLINE*i)-1+HLINE){
- v->y=line[i].start;
+ if(v->y<line[i].start){vel->y=0;v->y=line[i].start+HLINE;}
return;
}else if(v->x+width>(HLINE*i)-1&&v->x+width<(HLINE*i)-1+HLINE){
- v->y=line[i].start;
+ if(v->y<line[i].start){vel->y=0;v->y=line[i].start+HLINE;}
return;
}
- }else if(v->y>line[i].start+HLINE/4){
- v->y-=HLINE/32;
+ }else if(v->y>line[i].start+HLINE){
+ vel->y-=.00000001;
}
}
}
|