Menu
▾
▴
[Gemrb-commits] SF.net SVN: gemrb:[6037] gemrb/trunk
|
From: <ze...@us...> - 2009-05-22 08:44:55
|
Revision: 6037
http://gemrb.svn.sourceforge.net/gemrb/?rev=6037&view=rev
Author: zefklop
Date: 2009-05-22 08:44:47 +0000 (Fri, 22 May 2009)
Log Message:
-----------
Fix stance for projecxtile launchers
Modified Paths:
--------------
gemrb/trunk/gemrb/plugins/Core/Actor.cpp
gemrb/trunk/gemrb/plugins/Core/Actor.h
Added Paths:
-----------
gemrb/trunk/.project
gemrb/trunk/.pydevproject
Added: gemrb/trunk/.project
===================================================================
--- gemrb/trunk/.project (rev 0)
+++ gemrb/trunk/.project 2009-05-22 08:44:47 UTC (rev 6037)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>GemRB</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.python.pydev.PyDevBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.cdt.make.core.makeBuilder</name>
+ <triggers>clean,full,incremental,</triggers>
+ <arguments>
+ <dictionary>
+ <key>org.eclipse.cdt.core.errorOutputParser</key>
+ <value>org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.append_environment</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.autoBuildTarget</key>
+ <value>all</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.build.arguments</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.build.command</key>
+ <value>D:/Programmes/MinGW/bin/mingw32-make.exe</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.build.location</key>
+ <value>D:\Programmation\gemrb_build</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.build.target.auto</key>
+ <value>all</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.build.target.clean</key>
+ <value>clean</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.build.target.inc</key>
+ <value>install</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildArguments</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildLocation</key>
+ <value>D:/Programmation/workspace/GemRB</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+ <value>clean</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.contents</key>
+ <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+ <value>false</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableFullBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.environment</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.fullBuildTarget</key>
+ <value>all</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.stopOnError</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+ <value>false</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.cdt.make.core.ScannerConfigBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.cdt.core.ccnature</nature>
+ <nature>org.eclipse.cdt.make.core.makeNature</nature>
+ <nature>org.eclipse.cdt.make.core.ScannerConfigNature</nature>
+ <nature>org.eclipse.cdt.core.cnature</nature>
+ <nature>org.python.pydev.pythonNature</nature>
+ </natures>
+</projectDescription>
Added: gemrb/trunk/.pydevproject
===================================================================
--- gemrb/trunk/.pydevproject (rev 0)
+++ gemrb/trunk/.pydevproject 2009-05-22 08:44:47 UTC (rev 6037)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+</pydev_project>
Modified: gemrb/trunk/gemrb/plugins/Core/Actor.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Actor.cpp 2009-05-22 01:58:33 UTC (rev 6036)
+++ gemrb/trunk/gemrb/plugins/Core/Actor.cpp 2009-05-22 08:44:47 UTC (rev 6037)
@@ -2680,7 +2680,8 @@
return;
}
- SetStance(IE_ANI_ATTACK);
+ SetStance(AttackStance) ;
+
//last chance to disable attacking
//
attackcount = GetStat(IE_NUMBEROFATTACKS);
@@ -3480,9 +3481,10 @@
return true;
}
if (StanceID == IE_ANI_ATTACK || StanceID == IE_ANI_ATTACK_JAB ||
- StanceID == IE_ANI_ATTACK_SLASH || StanceID == IE_ANI_ATTACK_BACKSLASH)
+ StanceID == IE_ANI_ATTACK_SLASH || StanceID == IE_ANI_ATTACK_BACKSLASH ||
+ StanceID == IE_ANI_SHOOT)
{
- SetStance( IE_ANI_ATTACK );
+ SetStance( AttackStance );
return true;
}
return false;
@@ -3869,7 +3871,7 @@
}
if (!silent) {
- ieByte stance = IE_ANI_ATTACK;
+ ieByte stance = AttackStance;
for (int i=0;i<animcount;i++) {
if ( strnicmp(item->ItemResRef, itemanim[i].itemname, 8) == 0) {
stance = itemanim[i].animation;
@@ -3953,6 +3955,13 @@
//update the paperdoll weapon animation
core->SetEventFlag(EF_UPDATEANIM);
}
+ ITMExtHeader *header ;
+ GetWeapon(header, NULL) ;
+ if(header && header->AttackType == ITEM_AT_BOW) {
+ AttackStance = IE_ANI_SHOOT ;
+ return ;
+ }
+ AttackStance = IE_ANI_ATTACK;
}
void Actor::SetUsedShield(const char* AnimationType, int wt)
Modified: gemrb/trunk/gemrb/plugins/Core/Actor.h
===================================================================
--- gemrb/trunk/gemrb/plugins/Core/Actor.h 2009-05-22 01:58:33 UTC (rev 6036)
+++ gemrb/trunk/gemrb/plugins/Core/Actor.h 2009-05-22 08:44:47 UTC (rev 6037)
@@ -234,7 +234,7 @@
//when the next attack is scheduled (gametime+initiative)
ieDword initiative;
ieDword InTrap;
-
+ char AttackStance ;
/** paint the actor itself. Called internally by Draw() */
void DrawActorSprite(Region &screen, int cx, int cy, Region& bbox,
SpriteCover*& sc, Animation** anims,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|