X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcsqcmodellib%2Fcl_player.qc;h=3d5f9a00cbc0679eb0cdc0234a87a3c43189e6db;hb=86c9dc7c3696c329496b06375c1e79fb407401ce;hp=4360527674e16be74180abadb8a95aac5279e226;hpb=924ba9b521119651b5667c0280868df9f95ca488;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/csqcmodellib/cl_player.qc b/qcsrc/csqcmodellib/cl_player.qc index 436052767..3d5f9a00c 100644 --- a/qcsrc/csqcmodellib/cl_player.qc +++ b/qcsrc/csqcmodellib/cl_player.qc @@ -1,5 +1,6 @@ /* * Copyright (c) 2011 Rudolf Polzer + * Copyright (c) 2015 Micah Talkiewicz * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -30,6 +31,8 @@ #include "common.qh" #include "cl_model.qh" #include "cl_player.qh" + #include "../common/triggers/trigger/viewloc.qh" + #include "../common/viewloc.qh" #elif defined(MENUQC) #elif defined(SVQC) #endif @@ -139,7 +142,7 @@ void PM_Movement_Move() { runstandardplayerphysics(self); #ifdef CSQC - self.flags = + self.flags = ((self.pmove_flags & PMF_DUCKED) ? FL_DUCKED : 0) | (!(self.pmove_flags & PMF_JUMP_HELD) ? FL_JUMPRELEASED : 0) | ((self.pmove_flags & PMF_ONGROUND) ? FL_ONGROUND : 0); @@ -174,7 +177,7 @@ void CSQCPlayer_PredictTo(float endframe, float apply_error) { csqcplayer_moveframe = clientcommandframe; getinputstate(csqcplayer_moveframe-1); - print("the Weird code path got hit\n"); + LOG_INFO("the Weird code path got hit\n"); return; } #endif @@ -205,6 +208,11 @@ bool CSQCPlayer_IsLocalPlayer() return (self == csqcplayer); } +void CSQCPlayer_SetViewLocation() +{ + viewloc_SetViewLocation(); +} + void CSQCPlayer_SetCamera() { vector v0;