pingus-cvs
[Top][All Lists]
Advanced

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

[Pingus-CVS] r2941 - in branches/pingus_sdl: . data/images/fonts src src


From: grumbel at BerliOS
Subject: [Pingus-CVS] r2941 - in branches/pingus_sdl: . data/images/fonts src src/gui
Date: Wed, 15 Aug 2007 23:53:11 +0200

Author: grumbel
Date: 2007-08-15 23:53:10 +0200 (Wed, 15 Aug 2007)
New Revision: 2941

Removed:
   branches/pingus_sdl/data/images/fonts/pingus_small.png
   branches/pingus_sdl/data/images/fonts/smallfont.png
   branches/pingus_sdl/data/images/fonts/smallfont_h.png
Modified:
   branches/pingus_sdl/NEWS
   branches/pingus_sdl/TODO
   branches/pingus_sdl/src/console.cpp
   branches/pingus_sdl/src/fonts.cpp
   branches/pingus_sdl/src/fonts.hpp
   branches/pingus_sdl/src/gui/checkbox.cpp
   branches/pingus_sdl/src/gui/combobox.cpp
Log:
- removed some old fonts
- updated NEWS and TODO a little bit

Modified: branches/pingus_sdl/NEWS
===================================================================
--- branches/pingus_sdl/NEWS    2007-08-15 21:33:20 UTC (rev 2940)
+++ branches/pingus_sdl/NEWS    2007-08-15 21:53:10 UTC (rev 2941)
@@ -1,11 +1,21 @@
 0.7.0
 =====
+* switch from ClanLib to SDL 
+* anti-aliased fonts
+* better support for resolutions larger then 800x600 (see --geometry
+  WxH option)
+* level editor temporarly removed
+* less fps then the ClanLib version
+* s-expression based file format (converter scripts are available)
+
+
+0.6.? (never released)
+======================
 * ClanLib 0.8 support
-* two new islands
-* basic multiplayer support
 
-0.6.1 (??/Sep/2003)
-===================
+
+0.6.1 (??/Sep/2003, never released)
+===================================
 * scroll wheel support in the editor
 * file ending for level files changed from .xml to .plf
 * level preview render code

Modified: branches/pingus_sdl/TODO
===================================================================
--- branches/pingus_sdl/TODO    2007-08-15 21:33:20 UTC (rev 2940)
+++ branches/pingus_sdl/TODO    2007-08-15 21:53:10 UTC (rev 2941)
@@ -51,7 +51,8 @@
 - paralax handling is different between 0.6 and SDL, see
   data/levels/playable/slidenride1-grumbel.pingus
 
-- grep for all the FIXME's and '#if 0' and find those that might be important
+- grep for all the FIXME's and '#if 0' and find those that might be
+  important, add what you find to this TODO
 
 - update INSTALL.* file
 
@@ -62,9 +63,15 @@
 
 - src/components/pingus_counter.hpp font should be fixed-width/monospace
 
+- lacks background: data/levels/tutorial/snow10-grumbel.pingus
+
 Nice to Have:
 =============
 
+- Sprite class is bonkers, fill() and scale() depend on order
+
+- story graphics have a missing vertical line (due to age old gimp scaling bug)
+
 - worldmap scrolling seems to be broken when using small resolutions (-g 
400x300)
 
 - separate gfx/colmap surfaces aren't used

Deleted: branches/pingus_sdl/data/images/fonts/pingus_small.png
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small.png      2007-08-15 
21:33:20 UTC (rev 2940)
+++ branches/pingus_sdl/data/images/fonts/pingus_small.png      2007-08-15 
21:53:10 UTC (rev 2941)
@@ -1,157 +0,0 @@
-�PNG
-
-
address@hidden@��Ʋ����u3�����2��`�n�1�)�9n)sr;�Y���5��O�<�/���9��>��}N������������)fffffffffffffffff��p�T
�s4�[�H⫢���D)��n��Ju��`=Y�Ja}]IX�3XMQi�������������������̺�:�J��s]�֪�$7Aݥf�����警�;~C�
-W�6��*�>���1�������`1�}����/�B��)�G�5x\�OU =SJ���Cdp������������ �% �^`
-���9.�
E2��FG8g��z
-W�
����v�M��u�
-U����
͂,��p�~I�V�� ��-���>�%�θ��Z
-�R;x&:��D���p�Mf�jVW��Z�V�t���F���|�����5 M2F�b8�       �)�h}� 
g>�`%�\�<>�^� �߬�>⻓F3N�Rޅ�=��'��F�p4zn��Y���'˰�]���9
-(��CEED,X���" �χ(MAJ
-9�\���ߵ2���4�3N�0�Vl%�*ø��xڣB][Xb9/��ŘD,�\N 
��~�'S<N����-�{���R}�G����W,4(���:
-M<(�Ä��-Z��6���SQ��Q��,$�3^������p�>�����=\���.��?%a���U���A:address@hidden(���p��k�ڃ�+\H=M��J�t�s��W�*�1B/�m����pϼ�):�Ou���I-���$���N���
-       �����
J       �=��BW��������Qi]�������}����ү���uάD      
I���)%ΰq&�4�x�������ϕ�\����]od��"O���������b�P҃�VL�ً������TU�I�R�        
=}�il%����D���8�����%π�M���/+�㠟�5~�~�"�!�ě�І\�R�8�弜�sMJ
-hE�l�c']�I���i�~��a:�MvW�������� �v<I�o  wb.��8�p      
A��4ہ[��D���c��
-S�0�������'�>�d��`�p3��`^%��XAȡ��Dάt�*rx� Љˆ�[x� 
���q�F7�����c��V]�ޥͻ=�<*L�;�N��d��~���8z����a�
-i.�c��Su�ۅ#��.4��˼/address@hidden(���        �.��~���Z�
�����icF������^�R.'�c�(������R]���յ��'���M�&bǓ����ѣ�elKޓ�7:���\���y�+OfHu��B׺V,Ҝ(��Dž��<Xn�ӃpTXN5B�!
-�
-�
-
8�#�{6�G��D~#����E��(͛Lw�G��
-a�$�yz���4�/���    address@hidden/address@hidden   �       
��1�pƙ���Ў}�%ˢ�W8aL'��T�
-o��3�z,Mf
�P�#$��B~���f'���ߖ,��W:Q��c8
����Ws�ԧ-0�L'l[n!�V�:address@hidden&�16�/y� 
1�W��3���c]>N�4:����k���C\���ߝ`"E���p��l�t`DQ�U
'�`�;G,���$�aL�8���)��̡-{]8�J
-���������iZ�Nגa���{�ű�h��p���O�^R���    
8���B"���9��%�H�M"�����K��O?s���>�l&D2_x|address@hidden,��I�ڧa'w��H�r����9�
-�2E���0ҝ����^�/^h���Pr����gV�gA��T>���*>V;I[�te�~������=d�k�9������
��e*�
-L���b�x�8nc��
-��$[���0!�S�g��¥d�ZW�1��}���^�L����&�S��$q�R�`�0�b��&��$����Z�`����}�fʐE�cC:F9�{�����(�~J#�,����l�`�t�wgN�b+p��8�Z�N
 7�47����3���Ї ť/t
9�����]&Ax���e���Q�ز�a��v��������>���ƍ��F�ėL��V(����ǴW��S��V%
-F���S���Nc�G2������&'�W
-\�,7�����M1�fc9aQ��2�q���x�,�ߺy�5;C����B�{i�<r�g~b]��N�'
0��sH���!�4��:r�K(J���]�v�R��:?�K�4c�~���<�
d�yg�y��EF�鍽4�1r��ܲ�E�P��V��#��8�m]O���%��&address@hidden�u
�Gh�QՁ'9�����L"��:&�T����0��Ʊ�Gq����9'��'�%����H5.&��!�0���l�6����|vt
�v$&��f]��
-����t޶��v�~B|�zg���I}$��˄5��x�ږ]�E�$�p>�G��]��2�8��(w���#ݢ]}Tf�Z��v=>�����^)N
k�N�o�>BS���X�&�/��"�q$��&address@hidden>�
����KH�(��ἒN��7���1���ҋ\�E(Z|�G���_й��s,_����b�f
�=��h��!�
-c3�S�š�]��=����I���w������$���u^�Y����g��BV�,O� ��>
qx�$��̓��)�҉�d�=!"YL�d#     �A���H�'&�
-)S{F�G�t'��
���_�U����~a��J��q��+�T�>��  ���
-�s(address@hidden(address@hidden
address@hidden)�u�����
-�����]�L��bl��6Lx�$r>#$�     �"�
&���6�'��1Ņ��2MϱQ�a����*��z��j��Y���h�w6��t'�
�L������T��"���� 
U�+�����%h�svC�Y�~j��:address@hidden|oN�Řԙ�j[g��M�$CQ���DS��NdY���j֨���:M~��0��Vխj"��`�{3^��f=��X���)7
-�tn��Aq^�`I5�z}!����p���^sI~�
-��@@���
-������zDV��m��?��w��jrM�����:�%�����1�    tqX�b
�e���%�WF%�:�چ:�����'��R�3�d;��o1�=��+[%H�h�J�+�(0м�`��J=-x 
����;�f��&P��4���X`��zR�h
-��рM&����G��&Dm���֘��q+QL�$eҎz��=�5��t��B��U�f�f��R��
address@hidden
-h��(��^ef��j��q�����QS� �R!*N�ȟ.�
-��c�   ܓ,u��0�>K���;r��&;��VQOӷ^�i=_e�Y��%LE2��Y7�����}��I,SGH      
address@hidden&y���cL���GL޻V�F=m��fMМa��u�pT��F�R~q6X���Mb�s|J)}��0��<�L�N_k����}�`���
address@hidden@Q�~�ΕdjR]4>�у�g�*~8�̣'���x�r:w�Y�E�ج��:kO�G}u���1�M8�I3��u����?P۠��
 ����$��!���RL��-fQ�ڙ��V��O�]��J�O�.ƽܣ;��<&P��.j{       
�(�ˋD0U����4���3�
-�N)^S��n��Uo
-?�>�X��d0mT\ǪTg�9�o��K�
address@hidden@W�$�L���X��PR�^ӱ?�u��j�q�C�YF9>����ī�P^-����F
-pLI/�$���o��)۩����¤�)|��z<YO2#�G?˗����9��Rz'?��;Jq�'�������oؔ�!s���G�hȦ�i�+=����]{G!g���➵�����s��R���)��n
-�tl��`R=flj�T�U�]Y+�ō�:j��
-��
-�j�!����Caddress@hidden
-(�q'Y
-�E����!���0K"v]�(��*�u��M2Cc���8`o�똉���*OҞ�6��<o���q�X��&,��
address@hidden  ��k�~C�\��޼l��cq    
(*č�����������}M;��jӝ�MC�b��A����������.4QF4�t�֩�.Bm)����u���V�9     
*��l�p�����[DZ��"�l����x��(��ڏ��-�8[��4��&��dg�3���wxQD�3��X`�%���
-wy     (�8_��ŧ�nb��
��"�X~�
t�3� � 
�G`�=̴���M܆��&^�.D.W)��a{-�s�:O4f�������1�:���P|@8��I�#03�n�w2G�[�9l�<���c$����5�Ã�ۍ(
        ���)����(\����(��|�:р=�sw�b+�ȝ�fyPd~F��{l���ih
����7� 9s���f+���~(��� 
��%�{VŅ�]�n�1�u/&��`AQg�E;v�$RV�2�r#���q(Ҁ{���.:       
�Ya���t0��>"�6e7���]�O��p&k�_�r)U������#�瞸�ND�z���2b�7��5��4�%��j�7��(��!�蹫�7N��9���Յ]$��/EWv��BD$VG���K2#�Rˈ����o��QG�d�L�;Yl]��
��C0׈��j��Ie6,address@hidden
-��߿�^���ݗG���.��Eu��lj��Îp(address@hidden)Pt�L%X�G4�{���j�Oy><��
-�G�K��[��(�ƔK(jg�I;��      o�����%�uuv;�4���'��o��O��.V�8ʜP
��PG�eP�A�
G�����d(���&j|U�����o߷\�ۄ��Y�H3GC�H�s���'�F���[��׳$���ޑ��~�����������X����Ⱥ�
�o�C�a�A���D�S�G���k8K��0�
-
-P���FbB�t���R80��\�w�,��l�'6}ֵ?
c�qb��q��d�M�"&ɴ<
-�I3�S�M�H��jo�(K��́Fz���\�Q�5�}���8��qt�IR!��"���8�7E�ٌ�
-���۽}���PĻs8�P�j#&���%���-ػ��P��R�V��G�Q�M    (�
-��_h��%�"�gT
-�Z��x�5O%�5���'E�ʐ�iQ���\%?[�(p�:��'���f?U���P�]�X�i��ED�%���P�1��H�z�
-����YtT\
-�5��n>�BA;address@hidden:
-'�M���Z�9��<,O�U�#&H�";tnQ`C0ڦ��$ɥЈ]6�)s*뭃\_���
-?��U��/���,�g֩P�� c�$��|�Q�pO�(C]�3�ūF� 
��b�$u�eZ���~����B^�.lbp.��{Fi2���l,�   � 
t$����G���VX�ExK���"�Ta6[.x�%l*Gc��������zq-Y���{?����F����O�.{r�CU���E�Z"���Sw�҂�����_{&�udQ߿&
-L����7��w��?��%
-����8�c�r��s_p^jx�jь��W�z��2����� 
?�����8&36�*�ֈ���U��q�z���s�����Ռb��r�����������l��ToN&?�1Q���<ה�R��.kB��������ij��H��Ǫ��P�m���"�qa7㭛��!Ek��s]�f��<T�m_
 
�c��[o""�gs���q:n+��p�B,1��b��¸�q��[��\��b�!¨������/S��2��V�j\�Y$�~7��%6��ZqM���
�C      �a-�.�FqQ������;:1�Q�����R�
-�
-��6G��Q�>71/M�Nmsa2�Hg�0��  
D[o!�Ǒ��:�����|�b���e��0�f[��z�y��vmgĊ�,&rB1�s��Fr�cŏ&R��\OT��;��'address@hidden
 �<H�(.1���''P��t�����gXc����
-       
��q��6���������1��=����b�傝\5��Tǵw��>�b�ٲ����۟����jv9r������y|��k����������'+�ι�q�w%(�w|����3���L�D!-�^'�Q�����&"��)�I.A�Y�Z�R,U�i.<"��T�ι����ew��\�F�)>[��r7�
   .����޶Ι�
c��"�P���wUf�3g�w�S�"'�Ȥ���w��~�D�%�&dh�$��0��}y�Ǣ,u^�Gy>7�P<����Μ�>address@hidden
j��e���!����w���p��o"+w�_��!�(L3�p����a|k�ߵ@:]ɔO����l     
���8���MD��-L�S�p���w�]}W)6)<��8$�k����Q�:���7��C�o���:t�ג
address@hidden:p�,�^‘8��m�ODI�k�N��;rJS��:��xi�r֟�r>�{v
�X�o
-᭥u�Mb�s��(uH�(�Q�i��N+.'3(���w�&���99VO��^r,5N���b�����v�km
i_0�М�Q���J��j�#��>c���)�8�C�&5y7����a�3����b�u��Щ,��E:F�ԏ���r<ʝ�|'
-|�����ֈTvXS��� �k��ܭ�oE9�\�!HO>`&Р�u4�z�K��:�
-�ɰ��7!�5#�΍s�K"��Ne�~�sX��<^BZ��w��\�R{��W�U�\�&��f��i$rY��9�0�-������W"q>+FS%����Ov,�[F}
 ���`n���(�9���>ֽ��mI9�"��T*M��fk���*��J 
��P�›V<����+%S+cĢ���.)˟����A¯DW���l��ﺟ�l�P��"�;;�c�}DC�*Q�M���gF�Q˷��O�
-$(F����U��ԺYR���3�R�
%݇���o��g!r�3��:Ei�=�l�${��ߔ��8�í���AuM�BUZq��mڔ.�&�=n"address@hidden>�'�pY5�0�t"address@hidden'^gquC"�~n�1��P�%p^$�Cq�H�
 ����%b��<�������#j���~G�����|�ȫ�P��N�����6����     `�!
-췂R��]�n5��������%�\�q����e��ȏ�P��:2��𭄓 
�x���T=�<�*��Y��-�k]�Ψp�<���Nc���_b�b��dY�����R 
�:\6�{q�:��+��K\D]m�¹��K�K�hZh�������w'�=K0��΢o`����%̱�cR�*f�ʥop�U.p>�b,S����b�Qǹ��%THQ��I5
 ��rM��ٳh�����7�;:�eK�hB�����>R��eq�=���陌�F�"E�Q��ğ�f�p�wU��l��
-���-B�tGl؅�&{+�g�%��};��+l�X��<��I�G���;1솴<|ջ�dM;;����eB0�IxƵ���34�� 
�X��ok�yt�K�s��"_�'OY��'�i���
F���e_L�6A�Ayֽƺ�����so��7�O��(����`��Q�>>{�o7������q�3�m�SK�+<M�
-R�����
-�r��ϣY��J �YX?G.4���W        
Ck��?c��Ҭ�s?C��U�jǹ���y����ѩ~��{�s��+W�~���� �<l��8�X��� ���Ԟ��Y+�>�� 
I�r�t˔ק���`��[6�(�P�`��|SԁK�R���&      
/\��T����K�1�X]a���ؖ����5����z�8;�_�f�w<�:�Q�sOa�Ϫ\1s�;���y�
g(�Y��I��G2l"�aU}#h3�k-�7L��l��!�؀���n��`M{�Ҏܯ��X�k��U�X�^�Y8��M�
-П����j`�������QZ����Ɠ�3f���R�#Ԁ_��hV��P�+9���ZG<3
���h� 7�A{��P�&��[\q]:
8�5[����ϯrOܞc�L[��2^��1
-���[*
� C�0��0���lq�J���9AB��u�      
�?o�L��w���o���ձ�P%$�w>���l��ܟ;�=&l�M\��m�'���k10�
-(�进�'address@hidden|W���)��N|�DUv      �]r\�008�F���_V�i�)��$�xH�$cV
J!���3������H�RWat�oTD�!�w3����x��6�Vu��5��+^8���w�I�}�3np��
$I�o�=U�1>����j�]<�tv�t�7Si�%z��j�� ���X�B(��  ���t3�I�����4d�d�
address@hidden:�H�^�m`�i�q��P������b   fj
��ϗx<K�w�Xj���8:�Ma��Ջ�[A��C���q~�3�tN�FP*��O��o���]���2�h���|��lVl����a    
+%�1)��7?o�j�uY.z�߅ mD��q      (�Z>�?��:address@hidden@=b�nn$
-ܩxs���_��Փ���%���o
-[�;Q��
�wwL_֞L#]�bS
-�L���E�l�"B��De�G�_��t*񻰏
����]�
-�nԁ;~g���`BS/������\~��qg9P,�P&�}�Wkc�V��6�"jLq��] 
address@hidden|�
address@hidden:0�:address@hidden
-�W�0�+������
6���
-�,�[��
-7�)&+Fm���(�ƞ�Y���P�e!���|�k�_��W��l
-�H�]T��"Ђ}1��������t�c
�uaL�W��[��
G�d��L2U؀�q��������/o׹�g��kM���X��k2�І6�5�)�5�Oe�:
_�'��0��k�����gP��6I���T�B����!�_�5r�-
-r�M����lB��_��PM�2>k��%�uql�ӳ��0�(�_JHTP\�,�п����IP$
-�� ��5��D��t#*<5f،����SD��|k��1��=m��:�
-C��؂1y(��   
��/�Ϫ�u쫓Xgb�i�YTg�|����s2�!Δ|CK��_�>��N�ss�L�v��F�4�HY�'�*�~�%���L��G
-��X�ɳ�L��dl\"�kɒ�]�ɵrA���Q&0�     ��֒'�Ny���
-8�{5e>+q�(�!����A\�*��x�Q1�������H.���[� CX
address@hidden@k|֑��$!�$��B�t^q�T�Q��|h߽��:�J,���9�E"Kt��h,q������:�X�8���1a�T��l����-�{#�d
-(@8�H��-ZO`��Y�I�c!RU�n�>��o%�E�wW��6
- ��x  
�6��!{Cv��Nu>address@hidden(0.���IV[ܛ�V����%dh�^B?t���}:address@hidden
-8,�Hfќ�`c0g��?�8�
-(���N�X鿟�#X�։rdI8z04�G1��;��D�Y��if��/�
�����%
-(SL>��h��:�+/>4v�r�`S�
(~T�a��mc���Q���yDI>�ߏ�헣4�̓������o��/�8�$R�v"�����9(�{��K��d�
_9���H��P)�MS
-r���(���g4e��P�2s�����b�  
�&0߈�/�R׿��/^E?"@RY)r����T��W�o��6����O񓉆��9^AW��h0$��-��ޏDž��KnG��
-�Bǹ��T঩��2 ���4c ��;��Dʲ9y�9?�WC  
(address@hidden@"YM��g�D:��4�KCO���&k���Z+i��$���X��N�޼h�q��E2���o/�Ys�:address@hidden
 ��P5Ŧ�lv
-�4B]�?��,GNٔL�4���Y�~
-��"q̓B 
:2Έ����d&qXA+�L�����ce�.�a�p�:2u��j�0�⏪���{���1�)�r8��l�0�~&���ຮp       
�Kуu�Һ�P�b2È�3��"H�9Er���y����G}*2�
-�k�b9�VcО?^���$"ۮ<���=}�%L����g������^h�\C{It]�?Ft��zɯkM�/\�&�d���X���SS���
     a��H��ih��g*����ߤ����*Xc��,����F(M[3��
-X�/�&�(��`�R}�Q�1�W�jĿ_ɳ&�{��Q����[�����^���
탪�F��3���5�����=Y��Xԁ���L��        ̸��8H�  
�D�Y$)���A�1\�JtR�&�H��sq.�2l�����&�Xm��1.�k��rC偍٧�Zđ��&�_���A��t�e9߽��r&���:%oK����z��E4�
 �g:8i&zk�~ 
�?�F
�"���MD$�Y�������f�}IdhM�O0���8��{���w/���},�3��L\V�40�akԤ��S%�*x��0����-��
`&����k*0�0��f�j<NwM�m���h��dd���*Љ]�A��zQ����"��柈�g��Ӱ)̴w9���־
-��oF��u�ةs��|!��e�ۈ`�]�$�����`ƕ�g��[5��Lp=14&ѝ��7��0Dž+�f�
2�R�X��Ή�7y�r�4�<address@hidden&=��z?p)��z��c�� ^6���i
$����B�H֦�<�|����!϶��#x
-!�����       �K�P(address@hidden    
�eX(>���@&pIHE:pPB�`o�9�NN�K��iR�h��2f�娡��U����c�aG�k0-(H���/Ҩϲ`��*OQé�6�W�ߵ'JUɵ*�&�����!bkgk�mY�><ܷ�����
- <�S�Q2��&u��
address@hidden  NHladdress@hidden:;�҉M��'�
-0��9%���ff��}�kLi& u-O��fWw�5�
-)X,address@hidden@݋�v�G��1V)��7��(��L
-��K�kV�F���~k"�0
-���2Lju���
�l�����#'��@'Ɖ8�'��c�
-u�ޭ\gS3�s��

�������b�      ��,d���|1�_���:&I��e�`Xͽ�T$����뜄��s��
-��u���!�a�dĝg����J;a.�,�=|�D�>��0�
���!�?�n�ğQ8'jF6֧՚�����ZxWWM�1���G�Q~�B�V9��n��,�2����s��l��gLXv�������B���v=O󤭗ox���_f����{|a��{܂�;
c��f�,�j2.w���M��<�ݕ���7X"!�
-����H%��q��I$��M      �
��<����i���W0�|��ס�Ԥ�#��,address@hidden&<���#�-��;�7��V��'\4�t#����������,��!f��bZHs��Yi���`у������ոP��:�m��L�!����1�f%�~]�B�S>r兩2��d}��&���~#������"r�$Z=����1���8�4"������P-��:�+3,,�w$��'hj������.T'�u�T�d:����Z�������ā���6;��6"��yy"i���K��ݗκ]8�4�D;]�Km*p0ʰ��lv�'1�\l�-��Nn�±\��<h��n����>WO5��E�wi�n
 ����C�U`�[����M�x,�&�b����I{ǿ�a�lVY�W����+�_�!�Wv��vR8�]�gҚ>�یC�Z�{�� 
     
1��?�'E�v�i�7Ӕ:���:���'����{D���jk�뎬c��ԣ)Ie�w2?�2������p��w�؜����Q^�r��S������6�h�H���a��)Op��V�9�m��:��Lr�]a�w;8'address@hidden
-Ku߿>�0QG�b02_T�ؐM�ǔ��Ao�_�KkA:{e�v8�;address@hidden/�5��)�     
OXl&�W��C>address@hidden@q+�Z��$ЖDB(&address@hidden
-�g�)>�?�36����>��ʧ6�:���ɬ5g(������(����k���(���%��?N/ը�>�R�
�9i�"address@hidden
-���rTh���*I�
-=�2�������j����s�A=8��
-���y�(N
>-|��B_>������w���q��O�r�)jn4���̊�;%Ie������o�囝
���d}ȷFy=�:gJҜ����W��ͨ�S�R��!8�(e  �%������Ѽ!�Dx�]T}"rA��p�r��c�;j� 
"���Вz�7�d����%CJ
address@hidden/�J��2s�Ov��+A��*5�.��T/�S��,address@hidden|�w?�C
-R��F/��IV�T��ԣ��
-"address@hidden"�
A�6�q_��D1�\�H�mm��H�*q6bK
-H�`��$R<address@hidden/�R�w�t153n�U#�>,F�^��2�"b��(Ei���aw
�!�2�5\+9/ڽ���+i_*�)��o{�\ �%~�&���I+�ύ
-)��<�|b(Sd�F5�����j��&��,D��2�Bk�,�~���A�+������ "��Xvl�!?��+�r��;���
d��[�����yL�����q|�(address@hidden&��߀Ӭ������’.�7��=PO���$�c���־��t#2���H��b�l2�&��1Hק���3Tx�$�s��`���n���˓"����`MMP5�K������7�����50�,�WK���ߋ&\�!�:�Ǎ&\`�#�����'���>P^
 
������մޖ�'*q��.�2���\�EqL!�@)~b�p�+��>�`*Q��j�����\��F��w�سH�u֊�X�C�RZaj�����+�`}�
`���Gg�5&��r���a�l��v�ʅ�'0K�J��G񑹷����X������{��$�0�� 
m�����nl1�&�u"hn=�&�� �x6���*K)�G{�,3��sD������HC�
-�fiD������5�y�qM��g�����1�f9'
�I��;��j�A�Ē��a6Uu-��7t&J*����y��p�O�h��"�iƕ���
-m���_�w�AjcX�8������P�(p���,��V8Ͱ)����&�I�R�\÷�w�����f=�Ӄ:?�jD
��4�q҅�]���2V���5\m=��N�@       N�[%*a��\�>R�5�S�gC&����a�}8�kw/��  
�$%C�+K���<n���g�܄����4~n�dko��w��`00ȝo5g��N���n��`^H�����������N     
�?Z�    o"��<�i�<z�d���s2��#��)Ϭ�)�7c�1�UIT��y$
-C}�j�X=�f\sĹ��U�>1��9Z����߄M��q��H��2�$��߶5n�#�λ&"�
-�Q�����4'���^��Ϲ_��ՠ+(address@hidden&�z�~�F`+c�{�!�X�|'`
address@hidden/�=������1y%�8P��=��8��S�ڡ��MME�y�������
l������4{7��(�z���� �Z�        
�5��BO�n���1��!���t$�7щ�)r�:����O����k�*���d��P��c��SV����������0=4��5�ȳ>S:�Cp�'�R3I�?�����"�W�^��f=[�?0�⍚
 G/C������YY!�m�E���5{C����0�1���a=�tLO1�"/address@hidden
-'j��;�t��6���)h
�p���]D��)��y*(����BL���Խ��%|\��"��ۉ�Kן�G|~�kt"�Xy�w�N�Չ]E�;��R��x���n�N+ouh��<��W2�Y�}�DXb�J��T�o(�9�y�dA��"R�8��Z;���>��mP��Guڰ�,v
address@hidden'݂��Kq�ө�z��T��
-tz�hHg��L>p+
-      ��s~.P���$�tnr#7w�lw��)�,>���
-��N�ϲ\�u�[�"��������H���g����:Mr��/address@hidden"u���T�;s�Ju^�wzHrA"�b���C���ђm*"v��:���}K\�����OTA����̃{2ɚw�
-ݻ/���H��v9�4b�
-�3���q��em�뉬�o:address@hidden/�z{:�m  
���k�&���&1�ϋ�o7�>^�GkND������"address@hidden,W����Q��"address@hidden|�X�>,�Y#��w6�dJ�є��
     ��^��O����<I�x����
-Ԁs���$M�ҹD���c8�n�$۟�񌐶�
-<h��-��\��96������;c�b���0ب�b�ꍛLdY�E�}JϘ�fx���+�����|����c�|Ë��R{�t����p*>�k����y����"�<�w��w�?��>��ہ�^֚+P�����~8����i�߉H,83DC|address@hidden
=�W���G       ��      
address@hidden@��EDTo~�o4b������1��G^xb���E���rX͓����\�܄����t`t8O2�Y/��]q���2ޜѯw�*_�!���lX���.���ˉhR^�3�M��U�_�2�h$������a�S�cU���
-M�{���Wy���E_ �m�V�����*E����z(��%3ؕß,<QϘ�w��
d;�0   
s���xHN��\��������w<(ѩ,u�m�e����:�A�:���AԦ����7����b��r�Oc(����N�bf���[��������~<g�yGϦ�R2n��|Ʈ��UQS6O�.��bk���5}�;����������x���߂�!kͺT#��~���K�(��>t�Zr��f��]3�$����}�s
 d�<address@hidden|��d�u��_�/r��*u���E��38�iƩ���<�
T�=�Ss3�:��!{�C
+�È�o��s*ћ�U�j�����s��|3��.t�{�0Y qS��D~��'8��
-?����]x���Ǧ�������|�9?��y4��Q�˥.~�0�s��1��2r�ĸa,?�;�kߝeF\Q�9AEj�U�9��+7�.^<J�f���ٖ9T
 �ڀ����VCy��3Vx�9D�O��Q~� 
;8�9G"��,w�w����>..^��uY�\��¸3�r��>,�w��+��|&�h�!���!��]O*1�#�OpN���7G|�n��
.\*�Y{��q��U%��Q7:Ť
i˞B�o��vH,�2��{ws#��a=�).��T���d��Qԡ��|%�4n>J>
-ﻸ��ٵ�����ud�`i4���5��qy���z�&ͬ��J-���mYƭD�
-�DZ�5#D� E&���iVl�*������e+�,����3=L�Hx��Y���ї(     ,�y@ ?
-H&?�p���v����n#�F���t�K'���K�Wj4e0�]��b��
-w��ƺ���8 ���A�a4y���XM>J;��֪�;[C��i��S]�Li�yF&address@hidden/�J
-��9�\��s��m�:NyTE~rN�
-��oQmޞ`L�5�Z��њ,�m�~�����8DW��B�����~��F��,ʐ�R��\�sɼ��D
���&address@hidden>9p�{HrNʛF#�Z�'g�g�Huct�Y*���R�-3҃�N�zۖ���}3��bA\�>
3R�\�{�<��]��~��4��
-��GޛL/�������+6��?'.M�� ������һ����hO`#+� 
��c3P�?���OD�&�}%�N�Ƙ�s��"��
�Ⱦ>��M���0������w��o��lb���2rJ��D).f�V�u��pb��$3���{��pQ�      
address@hidden
-���zy/K�1&���9S:��^+������#����Eta%�$]Mg6Q�8�ԭ�w�
-�8�f3p��D���"��q�HG68��e��{�dy�AE��1mX�${�Ӝoh��"�u8��4a�#�.Au�іuGq��J6I�2_
-�ݓn�����}"?I��e Q���|����W��Y��JO����x�=��address@hidden 
����:3�Ri2Yƃ�G���d���)�#��>ԇ|�$t倳���u��ܕ�?�7P�)�uLu����萈�;��n<�       
��>�^ڞ�l�x���Jl�j�D���N      �J�!�} 
0Q���2��,��^��.D�鶝ɓ3=���)��Ja'�C���q$��ACC�p�~��`�Yt9f�!���$�Y�����G���T.�="x&�����:��5�9ȯ�O
WR�m܈]oʰ0�X   `4M��m��j�F��ygoaP06.��
address@hiddenp������y
p��y�4c��gf�b���G   �8��)� 
�=���G�`}��0mD�0��soȿ�~9��]��+�V�H����ҹ�q��W�ᬀ���sm:�����/%2~R�q�p��m��;|���}�~Ou�]�k�t�k��BM�jG�%������?U�O<�f������;ج�3���k/���"
 J�Zq�\*r�g)�C����
10�D�"^��qxeA��i�q:�,��x�QTb�1ܜӉJ{���s�5)��|�����
-������^��������Sn�3yY~�R>Ɔ���y��u�ʫ�G�����X���'�x�\��j�
��G��)�iw���b-����L���^��^�� ��C�s   
�D1_ӕ���������`�|qshT"uN���;�D���h�/4Z�;���rMP�����|A����=����3���Z<|����
Z�
-��%�e����4I���p̣��Y����Xr:o�\�.c���N���������zjh�f� u�Չ���J�`�?u�b���sh�E
UL�0���%P(ae��]5��a۞��_I��_-�%�r����
-xH�Q�k7��AMpYl��j?S���c��c,:�9$��i�>O�NC����n�����g6��3�q|H�˛ͷ��* 
b>�]��
mh֪na�� �U$�HC0�-����vҋGB\�O6���ō���4�F;���$�v��<�1
address@hidden(�rRlQ]����D      )h�� �I���Z���lpTs��$�<�1X�_\�����⹎        
address@hidden  0�?1�#L�!��9�q��濌���O�T&j4nj�J9��������
��|���L��^k��Ç8�ki��u����T�B���Oݸ;��n��x3P�YL8�U_D\�����kgp=���s`#˜�z-�Z�
�����V*��9��Jb���Ѝ$wʉ�
-�V�������x:b���Ɏ6�[�����m'��� 
��Ռ!�2��Z��j�\�PE�Xu�՞�:R���F,�X��;address@hidden&�u|���h��zb�����y$xة���������3^*z�4:<��~��J<address@hidden>�$mK
1^�ꙃN���C��bNY�yd�����l}Oȶ���§`'address@hidden(J9[k�"�
-}
-�c{��Ŕ�2�ht#�m�3*�7�엪u�h�H  v����e1s9�x�
-$+p'�X��a<�*�0�0�0�0�8N�t
�
-���J�  L���0�0�0���1�0
\ No newline at end of file

Deleted: branches/pingus_sdl/data/images/fonts/smallfont.png
===================================================================
--- branches/pingus_sdl/data/images/fonts/smallfont.png 2007-08-15 21:33:20 UTC 
(rev 2940)
+++ branches/pingus_sdl/data/images/fonts/smallfont.png 2007-08-15 21:53:10 UTC 
(rev 2941)
@@ -1,7 +0,0 @@
-�PNG
-
-
-uCa���)�(VK23+;��`�6"����`I
-k)���Pk���L��x�Gk�G$�����jH8'��Rg�L�e#>ؾ�)=)���ȟ���B���X�:��I�52�
���p����&�=��f�Z����4!��q�#˵�G�Apn���u�?ı�,��2vX��Ɩ�^�o��t���_�+9��,1�~����03�_��m���ah,�
-�)��3ٕ�����n'd�oY�s����S�?ls7��i��'�ӡ�V���@@bWo
�6�k�Ĕ?Q���`����u��>�?�w�&���i04�>��R����NJ^�UK]y�}��H�ߏ��t��߀���������9�o�
�z3on�O!��w�|��;����7���gn�
�<D?
-�w,�"��C�S��_��BmԞe��mh�<T�h�<address@hidden)��z?.�?�*��_������y������?����'D|�e
\ No newline at end of file

Deleted: branches/pingus_sdl/data/images/fonts/smallfont_h.png
===================================================================
--- branches/pingus_sdl/data/images/fonts/smallfont_h.png       2007-08-15 
21:33:20 UTC (rev 2940)
+++ branches/pingus_sdl/data/images/fonts/smallfont_h.png       2007-08-15 
21:53:10 UTC (rev 2941)
@@ -1,3 +0,0 @@
-�PNG
-
-
\ No newline at end of file

Modified: branches/pingus_sdl/src/console.cpp
===================================================================
--- branches/pingus_sdl/src/console.cpp 2007-08-15 21:33:20 UTC (rev 2940)
+++ branches/pingus_sdl/src/console.cpp 2007-08-15 21:53:10 UTC (rev 2941)
@@ -138,7 +138,7 @@
 Console::init()
 {
   // std::cout << "Console: Init..." << std::endl;
-  font = Fonts::xterm;
+  font = Fonts::courier_small;
 
   //  (*this) << "Pingus Output Console (hide/show it with F1)\n"
   //     << "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n";

Modified: branches/pingus_sdl/src/fonts.cpp
===================================================================
--- branches/pingus_sdl/src/fonts.cpp   2007-08-15 21:33:20 UTC (rev 2940)
+++ branches/pingus_sdl/src/fonts.cpp   2007-08-15 21:53:10 UTC (rev 2941)
@@ -33,11 +33,8 @@
 Font pingus_small_fix_num;
 Font pingus_large;
 
-Font smallfont;
-Font smallfont_h;
-
 Font courier_small;
-Font xterm;
+
 Font lcd;
 
 void
@@ -52,9 +49,6 @@
   pingus_large = Resource::load_font("fonts/pingus" + std::string("-") + 
encoding);
 
   courier_small = Resource::load_font("fonts/courier_small" + std::string("-") 
+ encoding);
-  xterm        = Resource::load_font("fonts/courier_small" + std::string("-") 
+ encoding);
-  smallfont    = Resource::load_font("fonts/pingus_small" + std::string("-") + 
encoding); //PingusResource::load_font("Fonts/smallfont","fonts");
-  smallfont_h  = Resource::load_font("fonts/courier_small" + std::string("-") 
+ encoding); // PingusResource::load_font("Fonts/smallfont_h","fonts");
 
   lcd          = Resource::load_font("fonts/number_fnt");
 }
@@ -68,9 +62,6 @@
   pingus_small_fix_num = Font();
   pingus_large = Font();
   courier_small = Font();
-  xterm = Font();
-  smallfont = Font();
-  smallfont_h = Font();
   lcd = Font();
 }
 

Modified: branches/pingus_sdl/src/fonts.hpp
===================================================================
--- branches/pingus_sdl/src/fonts.hpp   2007-08-15 21:33:20 UTC (rev 2940)
+++ branches/pingus_sdl/src/fonts.hpp   2007-08-15 21:53:10 UTC (rev 2941)
@@ -37,9 +37,6 @@
 extern Font pingus_small_fix_num;
 extern Font pingus_large;
 
-extern Font smallfont;
-extern Font smallfont_h;
-extern Font xterm;
 extern Font lcd;
 
 /** Load all fonts */

Modified: branches/pingus_sdl/src/gui/checkbox.cpp
===================================================================
--- branches/pingus_sdl/src/gui/checkbox.cpp    2007-08-15 21:33:20 UTC (rev 
2940)
+++ branches/pingus_sdl/src/gui/checkbox.cpp    2007-08-15 21:53:10 UTC (rev 
2941)
@@ -46,7 +46,7 @@
        if (is_checked)
                gc.draw(checkmark, pos);
        
-       gc.print_right(Fonts::smallfont, pos.x, pos.y, label);
+       gc.print_right(Fonts::pingus_small, pos.x, pos.y, label);
 }
 
 bool

Modified: branches/pingus_sdl/src/gui/combobox.cpp
===================================================================
--- branches/pingus_sdl/src/gui/combobox.cpp    2007-08-15 21:33:20 UTC (rev 
2940)
+++ branches/pingus_sdl/src/gui/combobox.cpp    2007-08-15 21:53:10 UTC (rev 
2941)
@@ -36,8 +36,8 @@
        listener(listener_)
 {
        // Default to 20 characters wide.
-       width = Fonts::smallfont.get_width('O') * 20.0f;
-       height = (float)Fonts::smallfont.get_height();
+       width = Fonts::pingus_small.get_width('O') * 20.0f;
+       height = (float)Fonts::pingus_small.get_height();
 }
 
 // Destructor
@@ -140,7 +140,7 @@
                return;
        
        // Draw the label
-       gc.print_right(Fonts::smallfont, pos.x, pos.y, label);
+       gc.print_right(Fonts::pingus_small, pos.x, pos.y, label);
 
        // Draw the rectangle
        gc.draw_fillrect(pos.x, pos.y, pos.x + get_width(), pos.y + 
get_height(),
@@ -160,7 +160,7 @@
                // Draw all of the items
                for (unsigned i = 0; i < item_list.size(); i++)
                {
-                       gc.print_left(Fonts::smallfont, pos.x + 5.0f, pos.y + 
((i + 1) * height), 
+                       gc.print_left(Fonts::pingus_small, pos.x + 5.0f, pos.y 
+ ((i + 1) * height), 
                                item_list[i]->get_displayed_string());
                }
        }
@@ -168,7 +168,7 @@
        if (current_item)
        {
                // Print the currently selected item
-               gc.print_left(Fonts::smallfont, pos.x + 3.0f, pos.y, 
current_item->get_displayed_string());
+               gc.print_left(Fonts::pingus_small, pos.x + 3.0f, pos.y, 
current_item->get_displayed_string());
        }
 }
 





reply via email to

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