Mercurial > fife-parpg
changeset 28:1e3b68c260a6
fix for instance facing location on actions + KDevelop project file upgrade
| author | jasoka@33b003aa-7bff-0310-803a-e67f0ece8222 |
|---|---|
| date | Fri, 11 Jul 2008 12:56:25 +0000 |
| parents | 788cb9525b2f |
| children | 0cb049f291e1 |
| files | build/linux/KDevelop/FIFE.kdevelop engine/core/view/camera.cpp |
| diffstat | 2 files changed, 20 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/build/linux/KDevelop/FIFE.kdevelop Fri Jul 11 11:57:48 2008 +0000 +++ b/build/linux/KDevelop/FIFE.kdevelop Fri Jul 11 12:56:25 2008 +0000 @@ -48,6 +48,23 @@ <general> <activedir/> </general> + <filetypes> + <filetype>*.java</filetype> + <filetype>*.h</filetype> + <filetype>*.H</filetype> + <filetype>*.hh</filetype> + <filetype>*.hxx</filetype> + <filetype>*.hpp</filetype> + <filetype>*.c</filetype> + <filetype>*.C</filetype> + <filetype>*.cc</filetype> + <filetype>*.cpp</filetype> + <filetype>*.c++</filetype> + <filetype>*.cxx</filetype> + <filetype>Makefile</filetype> + <filetype>CMakeLists.txt</filetype> + </filetypes> + <blacklist/> </kdevcustomproject> <kdevdebugger> <general> @@ -149,6 +166,8 @@ <usePermanentCaching>true</usePermanentCaching> <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces> <includePaths>.;</includePaths> + <parseMissingHeadersExperimental>false</parseMissingHeadersExperimental> + <resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental> </codecompletion> <qt> <used>false</used>
--- a/engine/core/view/camera.cpp Fri Jul 11 11:57:48 2008 +0000 +++ b/engine/core/view/camera.cpp Fri Jul 11 12:56:25 2008 +0000 @@ -508,7 +508,7 @@ // use cached values if there is no need to do full recalculation ScreenPoint drawpt; int angle = 0; - if (m_updated && (!m_iswarped) && (!(instance->getChangeInfo() & (ICHANGE_LOC | ICHANGE_ROTATION))) && (vc.image)) { + if (m_updated && (!m_iswarped) && (!(instance->getChangeInfo() & (ICHANGE_LOC | ICHANGE_ROTATION | ICHANGE_FACING_LOC))) && (vc.image)) { int pos_estimate_x = vc.screenpoint.x - cammove.x; int pos_estimate_y = vc.screenpoint.y - cammove.y; int pos_estimate_z = vc.screenpoint.z - cammove.z;