Merge pull request #10 from zaoqi/master

Fix some bug
master
D00Med 2017-01-26 19:29:18 +10:00 committed by GitHub
commit 6eb569fe7f
2 changed files with 7 additions and 1 deletions

6
AUTHORS Normal file
View File

@ -0,0 +1,6 @@
# Names should be added to this file as one of
# Organization's name
# Individual's name <submission email address>
# Individual's name <submission email address> <email2> <emailN>
D00Med <heiselong@gmx.com>
zaoqi <zaoqiff@gmail.com>

View File

@ -218,7 +218,7 @@ function vehicles.object_drive(entity, dtime, def)
entity.object:setvelocity({x=velo.x*0.9, y=velo.y+5, z=velo.z*0.9})
elseif is_watercraft and entity.on_water == false then
entity.object:setvelocity({x=velo.x*decell,y=velo.y-1,z=velo.z*decell})
elseif entity.on_water and not is_watercraft then
elseif (entity.on_water or entity.in_water) and not is_watercraft then
entity.object:setvelocity({x=velo.x*0.9, y=-1, z=velo.z*0.9})
--boost
elseif ctrl.up and not shoots2 and ctrl.aux1 and entity.boost then