walkero
/
starfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made camera centering more gentle.

This commit is contained in:
onpon4 2015-02-27 01:10:27 -05:00
parent 8e753d9525
commit 5965f44bb1
1 changed files with 12 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/player.cpp
View File

@ -220,31 +220,17 @@ void doPlayer()
if (cd < 0) if (cd < 0)
{ {
cc = engine.ssx - cameraMaxSpeed; cc = engine.ssx - cameraMaxSpeed;
if (cd < cc) limitFloat(&cc, cd / 10, -cd / 10);
{
player.x -= cc; player.x -= cc;
engine.smx -= cc; engine.smx -= cc;
} }
else
{
player.x -= cd;
engine.smx -= cd;
}
}
else if (cd > 0) else if (cd > 0)
{ {
cc = cameraMaxSpeed + engine.ssx; cc = cameraMaxSpeed + engine.ssx;
if (cd > cc) limitFloat(&cc, -cd / 10, cd / 10);
{
player.x -= cc; player.x -= cc;
engine.smx -= cc; engine.smx -= cc;
} }
else
{
player.x -= cd;
engine.smx -= cd;
}
}
} }
if (ymoved) if (ymoved)
{ {
@ -265,31 +251,17 @@ void doPlayer()
if (cd < 0) if (cd < 0)
{ {
cc = engine.ssy - cameraMaxSpeed; cc = engine.ssy - cameraMaxSpeed;
if (cd < cc) limitFloat(&cc, cd / 10, -cd / 10);
{
player.y -= cc; player.y -= cc;
engine.smy -= cc; engine.smy -= cc;
} }
else
{
player.y -= cd;
engine.smy -= cd;
}
}
else if (cd > 0) else if (cd > 0)
{ {
cc = cameraMaxSpeed + engine.ssy; cc = cameraMaxSpeed + engine.ssy;
if (cd > cc) limitFloat(&cc, -cd / 10, cd / 10);
{
player.y -= cc; player.y -= cc;
engine.smy -= cc; engine.smy -= cc;
} }
else
{
player.y -= cd;
engine.smy -= cd;
}
}
} }
} }