From b0a5672ad56bbcca766fd0791ae2888e74a55a68 Mon Sep 17 00:00:00 2001 From: Bukz Date: Fri, 29 Apr 2011 17:19:55 +0000 Subject: [PATCH] little inWater fix git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6394 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/physics.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/src/physics.cpp b/source/src/physics.cpp index 8c5fc709..3eb12f4e 100644 --- a/source/src/physics.cpp +++ b/source/src/physics.cpp @@ -768,7 +768,7 @@ void crouch(bool on) int inWater(int type = 0) { - if(type ? hdr.waterlevel > player1->o.z : hdr.waterlevel > (player1->o.z - player1->eyeheight)) return 1; + if(hdr.waterlevel > (type ? player1->o.z : (player1->o.z - player1->eyeheight))) return 1; else return 0; }