aboutsummaryrefslogtreecommitdiff
path: root/Source/GameTick.cpp
diff options
context:
space:
mode:
authortheoddone33 <theoddone33@5198baeb-e213-0410-be47-fc2ff85ca46f>2003-01-09 10:13:12 +0000
committertheoddone33 <theoddone33@5198baeb-e213-0410-be47-fc2ff85ca46f>2003-01-09 10:13:12 +0000
commit6f135aab1bf6f8fa9b3cb7b397bb5ac8724c1aaa (patch)
tree2fbbcecaa6a55a0add9cbe5a7efced90f4775f1c /Source/GameTick.cpp
parent1339813cef051daa74110bc53f1037c83d9fc9fb (diff)
downloadblackshades-6f135aab1bf6f8fa9b3cb7b397bb5ac8724c1aaa.tar.gz
Made game fun as opposed to crapulent
git-svn-id: svn://svn.icculus.org/blackshades/trunk@73 5198baeb-e213-0410-be47-fc2ff85ca46f
Diffstat (limited to 'Source/GameTick.cpp')
-rw-r--r--Source/GameTick.cpp19
1 files changed, 18 insertions, 1 deletions
diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 73dc222..21ddef6 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -153,7 +153,6 @@ void Game::Tick(){
mousex=(float)mouseloc.h*640/screenwidth;
mousey=480-(float)mouseloc.v*480/screenheight;
-
oldmouseoverbutton=mouseoverbutton;
@@ -720,6 +719,7 @@ void Game::Tick(){
}
+#if 0 // DDOI
GetMouse(&mouseloc);
if (mouseloc.h>600){MoveMouse(mouseloc.h-500,mouseloc.v,&mouseloc);}
@@ -734,11 +734,17 @@ void Game::Tick(){
GetMouse(&mouseloc);
+#else
+ GetMouseRel(&mouseloc);
+#endif
+
+#if 0 // DDOI
oldmouserotation=(oldmouseloc.h/1.3888)*mousesensitivity;
oldmouserotation2=(oldmouseloc.v/1.3888)*mousesensitivity;
+#endif
mouserotation=(mouseloc.h/1.3888)*mousesensitivity;
@@ -746,6 +752,7 @@ void Game::Tick(){
+#if 0 // DDOI
if(abs(oldmouseloc.h-mouseloc.h)<400)camera.rotation+=mouserotation-oldmouserotation;
if(abs(oldmouseloc.v-mouseloc.v)<200)camera.rotation2+=mouserotation2-oldmouserotation2;
@@ -757,6 +764,16 @@ void Game::Tick(){
if(mouseloc.v-oldmouseloc.v>200)camera.rotation2+=mouserotation2-oldmouserotation2-(300/1.3888*mousesensitivity);
if(mouseloc.v-oldmouseloc.v<-200)camera.rotation2+=mouserotation2-oldmouserotation2+(300/1.3888*mousesensitivity);
+#else
+ if(abs(mouseloc.h)<400)camera.rotation+=mouserotation;
+ if(abs(mouseloc.v)<200)camera.rotation2+=mouserotation2;
+ if(mouseloc.h>400)camera.rotation+=mouserotation-(500/1.3888*mousesensitivity);
+ if(mouseloc.h<-400)camera.rotation+=mouserotation+(500/1.3888*mousesensitivity);
+
+ if(mouseloc.v>200)camera.rotation2+=mouserotation2-(300/1.3888*mousesensitivity);
+
+ if(mouseloc.v<-200)camera.rotation2+=mouserotation2+(300/1.3888*mousesensitivity);
+#endif