about summary refs log tree commit diff
path: root/src/game/gamecore.cpp
diff options
context:
space:
mode:
authorSushiTee <weichel.sascha@xxx.xx>2011-04-01 21:32:16 +0200
committeroy <Tom_Adams@web.de>2011-04-01 21:48:54 +0200
commit747113d85542a21fc1338309337d7272133b8dd5 (patch)
tree6bc30b4243b6d27cd3cf2cf6ef30d67ea19d7c8e /src/game/gamecore.cpp
parent053a1d19ecaad1f00265647ab15c58110a38ae28 (diff)
downloadzcatch-747113d85542a21fc1338309337d7272133b8dd5.tar.gz
zcatch-747113d85542a21fc1338309337d7272133b8dd5.zip
fixed moving if player collision is turned off
Diffstat (limited to 'src/game/gamecore.cpp')
-rw-r--r--src/game/gamecore.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/gamecore.cpp b/src/game/gamecore.cpp
index c8669a8e..e41e1fab 100644
--- a/src/game/gamecore.cpp
+++ b/src/game/gamecore.cpp
@@ -391,10 +391,10 @@ void CCharacterCore::Move()
 					return;

 				}

 			}

-		}

-	

-		m_Pos = NewPos;
+		}
 	}
+	
+	m_Pos = NewPos;
 }
 
 void CCharacterCore::Write(CNetObj_CharacterCore *pObjCore)