feuerkraft-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Feuerkraft-CVS] rev 304 - in trunk: data data/images data/missions src


From: Ingo Ruhnke
Subject: [Feuerkraft-CVS] rev 304 - in trunk: data data/images data/missions src src/vehicles
Date: Sun, 07 Dec 2003 19:38:16 +0100

Author: grumbel
Date: 2003-12-07 19:38:15 +0100 (Sun, 07 Dec 2003)
New Revision: 304

Added:
   trunk/data/images/projectile1.png
   trunk/data/images/projectile2.png
Modified:
   trunk/data/feuerkraft.xml
   trunk/data/missions/airport.png
   trunk/data/missions/test.feu
   trunk/src/projectile.cxx
   trunk/src/property_set.cxx
   trunk/src/vehicles/helicopter.cxx
   trunk/src/vehicles/helicopter.hxx
   trunk/src/vehicles/vehicle.cxx
   trunk/src/vehicles/vehicle.hxx
Log:
- added machine gun
- fixed a few pathes
- fixed missing assert.h include

Modified: trunk/data/feuerkraft.xml
===================================================================
--- trunk/data/feuerkraft.xml   2003-12-06 15:27:52 UTC (rev 303)
+++ trunk/data/feuerkraft.xml   2003-12-07 18:38:15 UTC (rev 304)
@@ -182,7 +182,8 @@
     </sprite>
     
     <sprite name="projectile">
-      <image file="images/projectile.png" />
+      <image file="images/projectile1.png" delay="10" />
+      <image file="images/projectile2.png" delay="10" />
     </sprite>
 
     <sprite name="sandsmoke">

Added: trunk/data/images/projectile1.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/images/projectile1.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/images/projectile2.png
===================================================================
(Binary files differ)


Property changes on: trunk/data/images/projectile2.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/missions/airport.png
===================================================================
--- trunk/data/missions/airport.png     2003-12-06 15:27:52 UTC (rev 303)
+++ trunk/data/missions/airport.png     2003-12-07 18:38:15 UTC (rev 304)
@@ -1,6 +1,6 @@
 �PNG
 
-
IHDR�\�UPLTE����� u#wZ[�������z��obKGD�H       
pHYsn�n�2s��tIME�   ;18a)��IDATx���K��8΀�
+
IHDR�\�UPLTE����� u#wZ[�������z��obKGD�H       
pHYsR�R�����tIME�,�]6�IDATx���K��8΀�
 ���'P�fN�u�����+_��PRVE�����#�6?�xr��| ^��ϟ�~���
�we8�
���v��'address@hidden@��$�������W�=�N��$w����3��6�;�������S��t�/��O܀wx����������:address@hidden'mAxF!�-�N�啮eyM�����_Wt
 f+|�ǭ���=�d�zM�z-�bZEN�gS��    
@��V>Ϛ�H�x��:6��˦;/�Y*�dXA�0�;<I�4�]���Aǖ�-�N�W.E���:�]�؄���BP�~������+oI�ʏeB8���,R7�5t
E        address@hidden>u:u�GZs�Œ+v�|���hy�{���m�Kg)۰������   
I8!H��<$�3�A�e9�R 
 �%��q- ��\�+�:�h����넥r4t�{�����4���0�7v� 
��L��S����,R��i�J(|����BO*�2�J�x�t=��h���`,�����"�ۼ>�9��R-�P�pbz�\I[l�Ur�
������>address@hidden@3��4�����z�b�x|��
��;8b�,��%�R��6-�pX�����(��oQ�IӀ"�d�   
�`-�����g1�c\��c%H��u�J��[Q��rЇM8(��.k�����.,S���葍�w[      
�0j_ address@hidden&�L� 
$�A��5���4C8)H��$t!���߂k��:`J¸�ң��k����l������<
��]Ӎ�E=��X�<v�[0����,���z�:�0M7W׷��1>P��{�iO:����P!�^W
!��ҷ/*�؃��HPۥ�2��r��!Ġ0J3���~(�Ko\T�!��<rIQ� ��y�vG      
���S,�:(���~3�c*���In�C�iج><�� �tp^-�8�v��Mz+��S��w�bQ�
ל�Q�G�T������M�|�W�
um�S;address@hidden@Z۽�'MZ���!Д�wI%"o�
(�X︢�I\tW|address@hidden)��L�uI]��)T�e%1X�h+!+��)ed;address@hidden@ߡ�i:�<dG4W��h�]Ӵ8��
 �/�0�����WҲ)���)1�l�9s*Z8]K��G0&address@hidden  �����:@_.��K⇺Jy�V��(|
,վ�ھ�&Z4���Z�I�MZ�h����b.u�T��7 
�ry]�R��Ţe���V����:C|address@hidden<address@hidden(address@hiddenҝ����'�1f�½
�.�e�j�ݴ�'�CUB,p��1a���
[ ��w�����RU�7��Jڧ� *�(�� 6
㶧C,r\�&֣�Q)address@hidden
@@ -11,9 +11,15 @@
 ����sJ�*��ũ�B�:�y3VOKg�Ǘ���F(��a��-^���g�8�RW��Jq��6EX�,q6�>�Hn���  
address@hidden<�XU���OkT���fR�4�����Z^H�s��"~�i'�WD�% T/(:�_
o�����y��S� t��i�4H A�15���h�;<ق���
��A��N��$���[�Gc��\%���EJ��f�3-&address@hidden|<Z*���ұyB:"address@hidden
      
���>�a���d��'�u�11i+Z��qNR�qz��c���f�(�RV����2t�$����y^���g�.�d]n�;uC��
        5j������E�m���<0�r��c��'K�7���D�<1��HIZ�
 apn�j�����Ġ�{ �1���-0j�v[��3�(�49$�co��XS5'v���
Dp#DZё�:address@hidden>�:o7� 
�hl�����:�ĖH�-'���'address@hidden(�X�oA��)v
 ������I�<address@hidden'(|��`��s6�mm�}S�i�b7zb\�
%Tr"'4���n�x=v8� ����5�����?"N�8�)
��4g��s�I���G�]9^y0Oa`U��4�9�B0�/"8~��?������W��`�DҖ�����PV�A(address@hidden

�XA�$z���q����ȵ�x��k��>��>address@hidden'ұ"B�ڱ���A4�^({�E�QzH�bނK��Q�h�:R��ԈE(O՞m��
�Ё֧Q�ۧO*�D����
 ��M�~��Y6{u`#UC    
�zf���R���i_o���ǖ���r�Y�d�螬)aLF��l�LQ���va�K݂Ct'H�RY�LQKX�~���\   
��
-��(����@<��
�1P'f,�98|�2R��P�֙��a�n
address@hidden<�"U+�:����0�nmv��$B6�.�U�L%��+ձ9Z�|O�,����X��O戋(AXx�D�H
      �:�`���&(���Jhz�4����W�ӄ�D���1P�
���j�Nk�&��g5va�3]�k ~A��'��!r�E��-E������v`�]��ܕ���
�*u������E��[Z��I���U���wʑ����
��]�G}sP9PVC����ޠ;;�*jj��PO)@�*�ߡ�1��a���AÌgW���`��2�Q�舩������IuXpDb�BX3�2��j�*>���lk.�j�b��:��`s
 �U���k}�� z��RI`���z    ��N�k��d�RѕG V���\��ɤ����V#�K        
H��d"qD��n'q�
-�I���i��}5�����`�I"���9�l.�EfE��  
���Ug�DPE���T�:�Բ�/address@hidden)W%p)�ƪ�sl�3V�"address@hidden(����+�<�E�TӁ��x����y�u%(���?�]Y��<�M4����b;�
address@hidden �2,�S�u9��address@hidden:�\Դ�>��'`7kK��>address@hidden 
�%,��>b������ń�id0��J[���i�"���LD��C?m�M�B�4����s�������+c�,�Jߢ�˅$
address@hidden/��}��"#A'� �ôS2o�dK" $
f�.PR"�*����CyTmۺ�ټ��1&z�|��>����Zi�gi��+�K#���!K3:�Z]V���xrn�F��W��2�ˊSQ���x�w��Hښ�
 8Ə���#k㐍���Cp�\(w�j�;�<�}iI7�M���
�A;address@hidden(�ȔsGC�a"+H�L�0����(zH��%���ᆤ/��>-z#  
D~��h<�3�r�������r�)��L����l�K�^�����Ui���������J�2a��V�뾩e�O}���{��X3#,~:����A7Qf$'>�[s3�6z��(������wF����=�R;9�^��.`���
��n�ڌ9t�!���&��M�>[m�˦&ԡ�Zp�u^��J���60g�}�>�9y���:p�
���=�������%������v��-�E�w��lP�#]YC��*�8������D`o�7�( 
?8&����V�m��� �[�address@hidden|�PEp
-�x�he~&�=��%�m����&�G�h�"address@hidden/s�|address@hidden
@�I+�1����Y�oid����M���2Hc$P�D����gf���,Ȗ��Ҙuh�i`�6
-p69�%9i�fh|o�,��
W�"��s��*W�j5"address@hidden,���|h�wE���Q�0z�(address@hidden&���v�j�Q�v麪zH�iA�������:9›����Z�?c�en��.�m�(�l�WEPn`{��_��4C�
�E��g��b}h'��MP�|��^Tu/?6\�-����xPD0ova���Fr��{�eD|
]FƧ@|address@hidden'cm�~y��s�4����Vs�n6GY�Ic#$V���������O95�ye_ 
address@hidden        address@hidden<Y;ӛ�d>�`�
address@hidden&���������-kI6�#IEND�B`�
\ No newline at end of file
+��(����@<��
�1P'f,�98|�2R��P�֙��a�n
address@hidden<�"U+�:����0�nmv��$B6�.�U�L%��+ձ9Z�|O�,����X��O戋(AXx�D�H
      �:�`���&(��}���R��{��+�iBB"I^�(�
�/UwZ5)�-8������X�"-?�?��K.�8U�h)�7�&�������D(��cgT�ۭDP�h�/
+�ܺ���N��E����S�Ԝl��2@>�蛃ʁ��ŧ
p����1FPQS���z�H��Tq�=���
3�c� f 
address@hidden@GL]0�t}L�[��#�����W{V��/Wg[s�Ts�c�����������<^��T���J㔠��K�wB�<X��$�����8
+����H��(fM&address@hidden'�#b��v;address@hidden 
���^�gV�*��,address@hidden>[Y3y����Z?�rU��n���9���;`��.��q6  
��WL��<A�߃}"address@hidden)�g���y������
+��vpj
+���)����e���=�Y[����j�9�(address@hidden&�L#��TPڂE
�N����d"b��icn
+j�y/h����S��4�^�g9T �^.$Pr$�75%z�-�[��     :�I���y�%[ 
a0�uـ��V�%/�ʣj��u��UԌ�0ѫ��\������J�<K� 
__��WY��Q��ڰ:�Ɠs�6�&����9_V��„��ӽ�LF�֤�1~L��X��l���K�B�s�V�ީ���KK� 
   address@hidden/ ���Z�r켷���Q"address@hidden;B
YA
address@hidden,� 
7$}q�i�I z���s^PF㑞Y������Gx �^��OId�4�΀e�\2�R֗�J����
�D�<WR� address@hidden
��2 
9���ߚ����s/address@hidden:$������!��uv��g�l��t;�f̡k9֨�7q�n������hC^65�5�����z6V:�6���8+�+
 
�YΉ�c7�!�+eH�>���''�=-�;]�\�<��n�/½;address@hidden&{��E��1�MMط*n��?g��jg�P:4��T�ք�>address@hidden<��'
+��)
+/�6����0�*�S(��D+�3���M.�mӬ��7�>address@hidden      
��¦��e�LZ���|-T��|K#����mr�g�s(�A#�"%R��<address@hidden,�I;4C�{cf 
�vnX��0A��+�V�"U����?`,��"�>�r�Okʉ�3��yB�s-0�SL)Ⱥև�����a       
�eǨ�C3�+��Ύ�[��hEA`�+�<���
+�R�V�c��{}�̳l`5�9�/?v��٬�6��]���W[� �K�U�C
+pO�=�,�����ެ�7]ׂ�;/sӿu�m�F        
f�.�*�r���S��r��Zmx.�?���C;�om�������{���Jn����(�"�y�k��}0��4�3,#�c��3z0>�C��i5k��=k����Ο{�t��hV���Kw�9�2�H!�������`�&~ʩA�+;��q��^�E�y�7��85����ڃǽ�"�
�8����S~k��N^0�ߺr�^��wD��x����5M��5]��*���'��4�|address@hidden
+�����Ǐ( �O��0鏭�O���?>�-Y��^�IEND�B`�
\ No newline at end of file

Modified: trunk/data/missions/test.feu
===================================================================
--- trunk/data/missions/test.feu        2003-12-06 15:27:52 UTC (rev 303)
+++ trunk/data/missions/test.feu        2003-12-07 18:38:15 UTC (rev 304)
@@ -225,9 +225,9 @@
                (y-pos 31)))
 
  (groundmap 
-  (gridmap       (file "data/missions/foobar.png")))
+  (gridmap       (file "foobar.png")))
 
- (scripts "data/missions/pathdata.scm"
-          "data/missions/test.scm"))
+ (scripts "pathdata.scm"
+          "test.scm"))
 
 ;; EOF ;;
\ No newline at end of file

Modified: trunk/src/projectile.cxx
===================================================================
--- trunk/src/projectile.cxx    2003-12-06 15:27:52 UTC (rev 303)
+++ trunk/src/projectile.cxx    2003-12-07 18:38:15 UTC (rev 304)
@@ -56,7 +56,7 @@
 Projectile::draw (View& view)
 {
   if (lifetime > 0) {
-    view.draw (sur, pos);
+    view.draw (sur, pos, velocity.get_orientation());
   }
 
   //std::cout << "Pos: " << pos.x << " " << pos.y << std::endl;
@@ -67,6 +67,7 @@
 void 
 Projectile::update (float delta)
 {
+  sur.update(delta);
   delta = delta * 50.0f;
 
   if (lifetime >= 0)

Modified: trunk/src/property_set.cxx
===================================================================
--- trunk/src/property_set.cxx  2003-12-06 15:27:52 UTC (rev 303)
+++ trunk/src/property_set.cxx  2003-12-07 18:38:15 UTC (rev 304)
@@ -17,6 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <assert.h>
 #include "property.hxx"
 #include "property_set.hxx"
 

Modified: trunk/src/vehicles/helicopter.cxx
===================================================================
--- trunk/src/vehicles/helicopter.cxx   2003-12-06 15:27:52 UTC (rev 303)
+++ trunk/src/vehicles/helicopter.cxx   2003-12-07 18:38:15 UTC (rev 304)
@@ -25,11 +25,13 @@
 #include "../ai_manager.hxx"
 #include "../rocket.hxx"
 #include "../resource_manager.hxx"
+#include "../math.hxx"
 #include "helicopter.hxx"
 
 Helicopter::Helicopter(const AList& lst)
   : strafe (0.0),
     reloading (0),
+    secondary_reload(0),
     energie (100),
     destroyed (false),
     ai(0)
@@ -159,6 +161,16 @@
     }
 
   strafe_steering = steering = acceleration = 0;
+
+  if (secondary_firing && secondary_reload > .1)
+    {
+      secondary_reload = 0;
+      GameWorld::current()->add (new Projectile (this, get_pos(),
+                                                 FloatVector2d::make_polar(20 
+ Math::frand()*2.0f,
+                                                                           
orientation + 3.1415927f
+                                                                           + 
Math::frand()*0.06f - 0.03f)));
+    }
+  secondary_reload += delta;
  
   delta *= 50;
 
@@ -184,7 +196,6 @@
       reloading = 10;
     }
 
-
   if (reloading)
     --reloading;
 }

Modified: trunk/src/vehicles/helicopter.hxx
===================================================================
--- trunk/src/vehicles/helicopter.hxx   2003-12-06 15:27:52 UTC (rev 303)
+++ trunk/src/vehicles/helicopter.hxx   2003-12-07 18:38:15 UTC (rev 304)
@@ -44,6 +44,7 @@
 
   float strafe;
   int   reloading;
+  float secondary_reload;
   Energie energie;
   bool destroyed;
   VehicleAI* ai;

Modified: trunk/src/vehicles/vehicle.cxx
===================================================================
--- trunk/src/vehicles/vehicle.cxx      2003-12-06 15:27:52 UTC (rev 303)
+++ trunk/src/vehicles/vehicle.cxx      2003-12-07 18:38:15 UTC (rev 304)
@@ -29,6 +29,7 @@
   steering = 0;
   strafe_steering = 0;
   firing = false;
+  secondary_firing = false;
 }
 
 float 
@@ -68,6 +69,7 @@
   steering     = controller.get_axis_state(ORIENTATION_AXIS);
   strafe_steering = controller.get_axis_state(STRAFE_AXIS);
   firing       = controller.get_button_state(PRIMARY_FIRE_BUTTON);
+  secondary_firing       = controller.get_button_state(SECONDARY_FIRE_BUTTON);
 }
 
 /* EOF */

Modified: trunk/src/vehicles/vehicle.hxx
===================================================================
--- trunk/src/vehicles/vehicle.hxx      2003-12-06 15:27:52 UTC (rev 303)
+++ trunk/src/vehicles/vehicle.hxx      2003-12-07 18:38:15 UTC (rev 304)
@@ -39,6 +39,7 @@
   float strafe_steering;
   
   bool firing;
+  bool secondary_firing;
 public:
   Vehicle ();
   virtual ~Vehicle () {}





reply via email to

[Prev in Thread] Current Thread [Next in Thread]