pingus-cvs
[Top][All Lists]
Advanced

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

[Pingus-CVS] r2547 - in trunk: . data/data data/images/core/menu src


From: jave27
Subject: [Pingus-CVS] r2547 - in trunk: . data/data data/images/core/menu src
Date: Thu, 8 Dec 2005 16:35:09 +0100

Author: jave27
Date: 2005-12-08 16:35:00 +0100 (Thu, 08 Dec 2005)
New Revision: 2547

Removed:
   trunk/data/images/core/menu/layer1.jpg
Modified:
   trunk/Pingus.vcproj
   trunk/data/data/core.xml
   trunk/src/pingus_menu.cxx
Log:
A little cleanup, and fixed a bug for the new XML story mode.

Modified: trunk/Pingus.vcproj
===================================================================
--- trunk/Pingus.vcproj 2005-12-08 00:18:36 UTC (rev 2546)
+++ trunk/Pingus.vcproj 2005-12-08 15:35:00 UTC (rev 2547)
@@ -33,7 +33,6 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="iconv.lib"
                                OutputFile="$(OutDir)/Pingus.exe"
                                LinkIncremental="2"
                                IgnoreDefaultLibraryNames="LIBCMT"
@@ -82,7 +81,6 @@
                                Name="VCCustomBuildTool"/>
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="iconv.lib"
                                OutputFile="$(OutDir)/Pingus.exe"
                                LinkIncremental="1"
                                GenerateDebugInformation="TRUE"
@@ -796,6 +794,12 @@
                                <File
                                        
RelativePath=".\src\worldmap\worldmap.hxx">
                                </File>
+                               <File
+                                       
RelativePath=".\src\worldmap\worldmap_story.cxx">
+                               </File>
+                               <File
+                                       
RelativePath=".\src\worldmap\worldmap_story.hxx">
+                               </File>
                        </Filter>
                        <Filter
                                Name="worldobjs"
@@ -1498,12 +1502,6 @@
                                        RelativePath=".\src\state_sprite.hxx">
                                </File>
                                <File
-                                       RelativePath=".\src\story.cxx">
-                               </File>
-                               <File
-                                       RelativePath=".\src\story.hxx">
-                               </File>
-                               <File
                                        RelativePath=".\src\story_screen.cxx">
                                </File>
                                <File

Modified: trunk/data/data/core.xml
===================================================================
--- trunk/data/data/core.xml    2005-12-08 00:18:36 UTC (rev 2546)
+++ trunk/data/data/core.xml    2005-12-08 15:35:00 UTC (rev 2547)
@@ -170,7 +170,7 @@
         <image file="../images/core/menu/multi_on.png"/>
       </sprite>
       <sprite name="layer1">
-        <image file="../images/core/menu/layer1.jpg"/>
+        <image file="../images/core/menu/layer1.png"/>
       </sprite>
       <sprite name="layer2">
         <image file="../images/core/menu/layer2.png"/>

Deleted: trunk/data/images/core/menu/layer1.jpg
===================================================================
--- trunk/data/images/core/menu/layer1.jpg      2005-12-08 00:18:36 UTC (rev 
2546)
+++ trunk/data/images/core/menu/layer1.jpg      2005-12-08 15:35:00 UTC (rev 
2547)
@@ -1,58 +0,0 @@
-����
-
-��
-#$��t<��W���<=�;�<��z^�����#�3^�F��=�R���X��WÔ
-<�;"b����4p�ԠT��Jy�{ZEY;"�
-����t�Ҕ9'�w}����[���5�<��,��̮nCJD:���,�B񄲱�^
-�74W   4yW3%�1�"��Vx���e=W�5�A����n��m
�0
address@hidden'�c2&��=12�     ��^MUS=���NG5�Y�*���hW<��2r��� 
T�P�S,��ѩ�A̔/'k\�a�ܨI�y]��^Y�d��֚�
�aS���%Z��7��-"gJ��S���T����~D-y�f;;&��BV?��yX�7p��
-ՓHыl�;      ���]�
-2�R�L��E�u��8��=�#��%yl{]�NDD�X��iօ\m      OW����dd���~'���w ���x
-�׍Ƨ'q����)��&x�`�H�(|�
&B>�®X>�%]��hO�c�     
����\%Z�F1`R[�`�������z�f���S�\ӲM���x��)�b��K,��r&��-ƀK$�x4-Y�2
-�z8Cɕ���ΝQ3�;��cx*Z�:Zj_6��lZ9s���--��M=!�,#�l�c�V9�Mέ��{,address@hidden(��P�h��l
��Fd��(7���\��I�Bu������N���5�W����!�kBd3��D�"�b���
-���pm0��T�x9R%p/|�oeD�/;QDO�
*�c;�MZ[�����i��za��9�,l'�E�j�H��H3d����'[cO�{OJ�b42 
m2PHM_/LV����{����D�Y��X���S�ˠh�����H�f[b���C�)��|��qHH싶���;!�)P~5n��U����C�T�
-�!"��IA�YiV:`6�>\����+�Tք:address@hidden
-�N��ﲉ�l�&��
-=N�
-Ex]�����ԁ^�mǙ]���Ż(�͢=�y���MxM.�E3B�9w�Pؘ�ؿ��i
-������Og*��������     �7GfM��%�`�r�Hm鑞@;�2r�[�
-�Kओ����#�u��Y����%��{,���#$.h<��+L����հ��'���N
^l<�f+MȒ'QZ=;:�'��g��)I�ʎ3�����l�T=��dn֢���<�ӸE��5?�b���3ʄ`���t�#u\�7��g:
  ���Ǟ�)Kek��k��.v�Ѣfk�%���;address@hidden<�-#X�
-
&�O�S��C.��O��]�Jܛq$��'�UD�C�#*���*,x���=��H�H��%?ZD��d���D����n=�J�@;.mŀ��

-)���-0[k�kr/address@hidden    {B�F�N��>B%,
-�[#�N����V쀘�MZ
-s�n�
-��"R�^��B�K�ulem�CJ�*����+��(9�2�C���Fl�Ҁ��}��H�]����(蜲�W�4���.<address@hidden;�/�M1q�4�����=���k���yUd��v/�УٿfCi���j�>�
-~�`��;Sh���xkKA�,�9��*�Ɖ2f����'�
-Oh_>�½�m[%�Y��(gkd�g~��S$���8ɉ��җK��;�~{�t��xo�F�}Q�5�b�e=���kh��!�Q��]ũ�v��u|@�ۤ?��>7����1��|���Y���aGϭ�Q���'P=%h0p��J
    address@hidden,�s�J�4G�Q����M�g��_��׺�~Rb^�2T�д��Hl�rA�SV08��f  
!?��}\��0��_�~6��{�/�Dŧ���\���x�J�C\/�]�hل`�1
-�*��L�/������I�F�Ӎ5�����:2M�g>i֞����R�ٰ�0�����da��<�[i���X�Ǒ��g{�����
-������$>�QT9g�U��1�vK�tƓ��q��~H\V�U�h�0_
-�]=�����
--��E�m
-M
-�_!�����d6��S�H��&-v)y�*ߦ_
Z�m<address@hidden,���[��vT>Ȗv�~,�>��l5Pq$�����\f��>7�5�Mx�|2��gc��yOo$��/�i���>�����Bn*]�
 nĨũH$ܔ(l�ݫ!�s�`#�"�[�7�7��]M�X���/L�y 
S�4��n���\㼒|�^×��4���f��5k������~�f�<0r���N��?/���у�e|l�R�>yj�����vf�c�t>�v�D��o`"Zb\
h��</������)1Ǝ*�$�VQ�ք�i��o�E�Jlm�xN:�`��RL�
-J�S��d�c��
-:(�B��l�-��Z����H7K3��h#�.Scn���e��
-Y�4���Ygp�ns����oDW�o��;�M��
address@hidden|~�8�{Y�B~��WA��3����;����$1��La,�I����a�nPT�2)/�y.`    t�2�
-YS[yK�.s��ؐrd/��ݕ~�����F&��Y�"o���b\����R�Lo�]K~�V=��6^��]1i�5�5�����;��IEi�l�8�S��������aimh��>�_�����6�fM��H��-*:������@)�4vIY�e��L�(Ң��W.L�!:��Ի(�6���(]$La�x�C+�Ç
 ^\�a6S�y�q48�����F9�
�P�-v�2ӵ]�s�r���
-<��f��y�rC�m(y�:�������FEwA�f����7�O����S�G�6���Q��C0;�,��n�ܩÒI������/�6�g�
-�p<��sܢ[����l�Y
-����� ��(���Z�d�"�-P$8�0�k�V��ƿ_�2,7�]Z��Lr�+D���
�D(?
�`�^���H��4liBL�J���<�CL�4Q)@:�J|���A�3����J���~i6RT�f���h���y!�ܬ�  
k���/��J^L{�7V��OP^ �<��e��K}�O����
;Nֽ=��        
\8*l�#��������*]�ޕ����}V�G]�.�Fz(KZN`�B�#5�r�*Ԥ�)���_��Q��

-Y��rJR�BblZ�e�충J��#4٢�9d�P�p�T���P�^F2d���g�5/���K�H��n�����Z�
-Fjӵ��/���T���#\�u(K��g58\ג����]SniS�&����ٚ�:�Ȝ{k!k$�"4C��P��%���fEGp�e4
�퍒7�*����lb��0h^A�
-�=��t��
-]���z�Or�}/
-�_h�`U&�_wU�:xR��
-ɳ6؊Y��Ѿ�(���9Y�[�ř�A��m&�{��)�C�&��D�I    ��
-\^M�
-?�_-��OАj*���Q��pd:I+z��M��V��U-.�c|�G�a;"qM��z.��sH�O
-q���ú����)!��#�O+']O&���u��'��xc{��t�.��Z}yU�'8�   ��.pG���
-�ͅI�i��6Cz,�� ��1�it�U�u������O*�q��$���'!/v@'address@hidden
-���܀+�>j-ṗ|;8]�g5��_t,�Y
-��(�h  $$��(��CCK�""�~
-�m�G���TNȴ�)��dU�4Y)n�)v9s�S��&Maddress@hidden(1�'dL��
����s�6L��1��&1��)address@hidden(�Poxi��[�K�!    address@hidden 
9���)��Z<9��d�M��
-�l��&8ʪlv�Y���pۤ~N�)�F;GkB���t7MT����w]�]�~��Z��}O�D�
-�E\O"�*��{��&�wX
-�r�6Y��+�C��\��:�\��:Ϛ����\��:Ϛ����\��:Ϛ����\��:Ϛ����\��:Ϛ����.X���Wu(.X���u(.XŝewYU�Xŝez$*����>���T�c�,�
-��*��,�
-����\���5�^��1>�U�^��1>�滯�Ar�'�|ס��V�cx��x^|�,b}^���T,b}^�Υ��W�����w��yU�Xž!]�UK�6����Ar�%Ի�Er�%Ի��Er�%Ի�Er�'�껫�Ar�%�껩Er�,>k�!U.X��)]��J��we�)]��J��m�x�w�U+�Ѷ��
\ No newline at end of file

Modified: trunk/src/pingus_menu.cxx
===================================================================
--- trunk/src/pingus_menu.cxx   2005-12-08 00:18:36 UTC (rev 2546)
+++ trunk/src/pingus_menu.cxx   2005-12-08 15:35:00 UTC (rev 2547)
@@ -161,6 +161,7 @@
 
   if (!story_seen)
     {
+                       
WorldMapNS::WorldMapManager::instance()->load(path_manager.complete("worldmaps/tutorial.xml"));
       ScreenManager::instance()->push_screen(
                                new 
StoryScreen(WorldMapNS::WorldMapManager::instance()->get_worldmap()->get_intro_story()),
 true);
     }





reply via email to

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