aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2015-09-12 21:57:35 -0400
committerClyne Sullivan <tullivan99@gmail.com>2015-09-12 21:57:35 -0400
commit3ed745cf1c672dc39b726d6fc133641ddc86d10f (patch)
tree760bdda6ada6b200a3a275a18dd754cf12ffdc10
parent881a64b1db9048694e690422ab16e406e0ef3f2f (diff)
improved non-jitteriness
-rw-r--r--Makefile2
-rw-r--r--src/World.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index d260819..be0e49e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
FLAGS_LINUX = -lGL -lSDL2_image
FLAGS_WIN32 = -lopengl32 -lmingw32 -lSDL2_Image
-FLAGS = -m32 -Iinclude -Wall -Werror -lSDL2main -lSDL2
+FLAGS = -m32 -std=c++11 -Iinclude -Wall -Werror -lSDL2main -lSDL2
all:
@g++ src/*.cpp -o main $(FLAGS_LINUX) $(FLAGS)
diff --git a/src/World.cpp b/src/World.cpp
index 4c5d119..cb074b0 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -108,10 +108,10 @@ void World::detect(vec2 *v,vec2 *vel,const float width){
for(i=0;i<lineCount-10;i++){ // For every line in world
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; // Correct
+ vel->y=0;v->y=line[i].start+HLINE/4; // Correct
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;
+ vel->y=0;v->y=line[i].start+HLINE/4;
return; // ;)
}
}else if(v->y>line[i].start+HLINE){ // Trashy gravity handling