diff options
author | Chris Xiong <chirs241097@gmail.com> | 2015-10-06 11:27:15 +0800 |
---|---|---|
committer | Chris Xiong <chirs241097@gmail.com> | 2015-10-06 11:27:15 +0800 |
commit | 97caa971ba3d7f11ff608f7a333f098c0d2a0a8c (patch) | |
tree | ecef927aba5827d815337ef043e100ef60dd3e19 /src/core/fncmodules.cpp | |
parent | df888862b81d3c5baa011e79e41b33f3963d812a (diff) | |
download | bullet-lab-remix-97caa971ba3d7f11ff608f7a333f098c0d2a0a8c.tar.xz |
Forgot to add '-a'...
Diffstat (limited to 'src/core/fncmodules.cpp')
-rw-r--r-- | src/core/fncmodules.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/fncmodules.cpp b/src/core/fncmodules.cpp index 08747c8..767556e 100644 --- a/src/core/fncmodules.cpp +++ b/src/core/fncmodules.cpp @@ -6,7 +6,7 @@ Idata randr() { Idata ret;ret.type=1; extern blrScriptVM *vm; - ret.r()=(float)vm->re->nextDouble((float&)callStk.pop().r(),(float&)callStk.pop().r()); + ret.r()=(float)vm->re->nextDouble(callStk.pop().r(),callStk.pop().r()); return ret; } Idata randi() @@ -18,18 +18,18 @@ Idata randi() } Idata createBullet() { - float x,y,bs,rad; - rad=callStk.pop().r(); - bs=callStk.pop().r(); - y=callStk.pop().r(); + double x,y,bs,rad; x=callStk.pop().r(); + y=callStk.pop().r(); + bs=callStk.pop().r(); + rad=callStk.pop().r(); extern bulletManager *bmInstance; int i=bmInstance->createBullet<bulletBase>(); bmInstance->getHandle(i)->pos.x=x; bmInstance->getHandle(i)->pos.y=y; bmInstance->getHandle(i)->vel=bs*smvec2d(cos(rad),sin(rad)); bmInstance->getHandle(i)->acc=smvec2d(0,0); - bmInstance->getHandle(i)->basecolor=blue; + bmInstance->getHandle(i)->basecolor=cyan; bmInstance->getHandle(i)->rendercolor=0xC0FFFFFF; bmInstance->getHandle(i)->collrange=4; bmInstance->getHandle(i)->scollrange=16; |