fix diving bugs (#335)

reset camera when diving to water surface

align health reduction after diving time is over to vanilla behavior (approx. -10/s)

Author: thokkat

game/camera.cpp

@@ -108,7 +108,7 @@ void Camera::setMode(Camera::Mode m) {
   if(camMod==m)
     return;
 
-  const bool reset = (m==Inventory || camMod==Inventory || camMod==Dialog);
+  const bool reset = (m==Inventory || camMod==Inventory || camMod==Dialog || camMod==Dive);
   camMod = m;
 
   if(reset)

game/game/movealgo.cpp

@@ -254,7 +254,7 @@ void MoveAlgo::tickSwim(uint64_t dt) {
   auto  ground = dropRay (pos+dp+Tempest::Vec3(0,fallThreshold,0), valid);
   auto  water  = waterRay(pos+dp+Tempest::Vec3(0,fallThreshold,0), &validW);
 
-  if(npc.isDead()){
+  if(npc.isDead()) {
     setAsSwim(false);
     setAsDive(false);
     return;

game/world/objects/npc.cpp

@@ -1955,7 +1955,7 @@ void Npc::tick(uint64_t dt) {
         t-=v;
         int dmg = t/tickSz - (t-int(dt))/tickSz;
         if(dmg>0)
-          changeAttribute(ATR_HITPOINTS,-100*dmg,false);
+          changeAttribute(ATR_HITPOINTS,-dmg,false);
         }
       }
     }