about summary refs log tree commit diff
path: root/src/engine/docs/prediction.txt
diff options
context:
space:
mode:
authorTeetime <TeetimeTW@yahoo.de>2012-02-17 19:31:43 +0100
committerTeetime <TeetimeTW@yahoo.de>2012-02-17 19:31:43 +0100
commitfc99167e687ba688ce9306bbec7e801450c917be (patch)
treeb440f2568a98b4b6a8db17925a299142adead7fa /src/engine/docs/prediction.txt
parent206e9adb9140c3c8963661f534703de33f8abe05 (diff)
parent44a47d4253a829abcf50dac5586fd9a351f0c66b (diff)
downloadzcatch-fc99167e687ba688ce9306bbec7e801450c917be.tar.gz
zcatch-fc99167e687ba688ce9306bbec7e801450c917be.zip
Merge branch 'master' into zCatch-Exp
Conflicts:
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/server/server.h
	src/engine/shared/network.h
	src/engine/shared/network_server.cpp
	src/game/server/player.h
Diffstat (limited to 'src/engine/docs/prediction.txt')
-rw-r--r--src/engine/docs/prediction.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/docs/prediction.txt b/src/engine/docs/prediction.txt
index d5771d1a..e740b1e8 100644
--- a/src/engine/docs/prediction.txt
+++ b/src/engine/docs/prediction.txt
@@ -8,7 +8,7 @@ Predicted input sent to the server can be retrived by calling <client_get_input>
 > {
 > 	int tick;
 > 	prediction_reset();
-> 
+>
 > 	for(tick = client_tick()+1; tick <= client_predtick(); tick++)
 > 	{
 > 		MY_INPUT *input = (MY_INPUT *)client_get_input();