package: tuxmath
severity: wishlist
version: 0.0.20050103
Hello, i would like see the speed parameter in option screen, not only
in command line parameter.
This path do that, please include it. It's done from svn version of
tuxmath.
Thanks,
--
yves
Index: trunk/src/options.h
===================================================================
--- trunk/src/options.h (révision 3)
+++ trunk/src/options.h (copie de travail)
@@ -25,6 +25,7 @@
OPT_OP_MUL,
OPT_OP_DIV,
OPT_A_MAX,
+ OPT_A_SPEED,
OPT_Q_RANGE,
NUM_OPTS
};
Index: trunk/src/setup.c
===================================================================
--- trunk/src/setup.c (révision 3)
+++ trunk/src/setup.c (copie de travail)
@@ -52,6 +52,7 @@
DATA_PREFIX "/images/status/opt_multiplication.png",
DATA_PREFIX "/images/status/opt_division.png",
DATA_PREFIX "/images/status/opt_max_answer.png",
+ DATA_PREFIX "/images/status/opt_speed.png",
DATA_PREFIX "/images/status/opt_q_range.png",
DATA_PREFIX "/images/status/opt_rng_1_5.png",
DATA_PREFIX "/images/status/opt_rng_1_5_on.png",
Index: trunk/src/images.h
===================================================================
--- trunk/src/images.h (révision 3)
+++ trunk/src/images.h (copie de travail)
@@ -36,6 +36,7 @@
IMG_OPT_MULTIPLICATION,
IMG_OPT_DIVISION,
IMG_OPT_MAX_ANSWER,
+ IMG_OPT_SPEED,
IMG_OPT_Q_RANGE,
IMG_OPT_RNG_1_5,
IMG_OPT_RNG_1_5_ON,
Index: trunk/src/options.c
===================================================================
--- trunk/src/options.c (révision 3)
+++ trunk/src/options.c (copie de travail)
@@ -80,6 +80,18 @@
/* Using "* 2" instead of "* 4" (even though string is 4 digits long)
because "draw_nums()" actually centers around x; not left-justifies */
}
+ else if (i == OPT_A_SPEED)
+ {
+ /* Maximum answer: */
+
+ snprintf(tmp_str, sizeof(tmp_str), "%.1f", speed);
+ draw_nums(tmp_str,
+ screen->w - ((images[IMG_NUMS]->w / 14) * 2) - 16,
+ y + images[IMG_OPT_SPEED]->h);
+
+ /* Using "* 2" instead of "* 4" (even though string is 4 digits long)
+ because "draw_nums()" actually centers around x; not left-justifies */
+ }
else if (i == OPT_Q_RANGE)
{
x = 32 + images[IMG_TUX_HELMET1]->w + 4 + 64;
@@ -213,6 +225,32 @@
images[IMG_TUX_HELMET1]->h)) +
images[IMG_OPT_MAX_ANSWER]->h);
}
+ else if (opt == OPT_A_SPEED)
+ {
+ speed = speed - 0.1;
+
+ if (speed < 0.1)
+ speed = 5;
+
+ dest.x = screen->w - ((images[IMG_NUMS]->w / 14) * 4) - 16;
+ dest.y = (images[IMG_OPTIONS]->h + 8 +
+ ((opt - OPT_OP_ADD) *
+ images[IMG_TUX_HELMET1]->h));
+
+ dest.w = ((images[IMG_NUMS]->w / 14) * 4);
+ dest.h = images[IMG_OPT_SPEED]->h;
+
+ SDL_FillRect(screen, &dest,
+ SDL_MapRGB(screen->format, 0, 0, 0));
+
+ snprintf(tmp_str, sizeof(tmp_str), "%.1f", speed);
+ draw_nums(tmp_str,
+ screen->w - ((images[IMG_NUMS]->w / 14) * 2) - 16,
+ (images[IMG_OPTIONS]->h + 8 +
+ ((opt - OPT_OP_ADD) *
+ images[IMG_TUX_HELMET1]->h)) +
+ images[IMG_OPT_SPEED]->h);
+ }
else if (opt == OPT_Q_RANGE)
{
/* Change which ranges are available: */
Index: trunk/data/images/status/opt_speed.png
===================================================================
--- trunk/data/images/status/opt_speed.png (révision 0)
+++ trunk/data/images/status/opt_speed.png (révision 0)
@@ -0,0 +1,16 @@
+�PNG
+
+
IHDR p 2 �{ pHYs �� tIME� 0�gt hIDATx��ZYlW��g<�g��ǻǎ�8�1YHi �R����<Q��J�T^xh+�RiշJ��Z�*�.�KD+�T�&B��4�m C�$d!��8�g<3�Õ,+!B�����s����r�7�����*����*����*���?�PA��2��0�9�c��i�ey��?a
+A��.�H����� ��Tj4���z�T����"��D&��d�B��Fggg��O(A(�nٲe�֭G��F��L(� MMM8�G�ѧ�~�����j��r9A�---%��\.��_�'<�!H&�utt���V��� � ��v�,k���~������Ǐ��T*���$I���tvv~���6�-�J�'�O%I,S�Tkz�Z_�$��R�ܵkק�~j��Q������<ϣ(�T*�^�ZWW711AA��<p��Z�jkkggg�9r�ر������t:]��S�T ��|:�.�HpW-���P(T*� [EMAIL PROTECTED]�(J�RA���c�X&�Y�P��0��$I*
+���d2�X�X,>pc(�*
+�F#�JE"Q�PH&��d�/�HH�$IA����x2�|�� �a�t:�L&#Irnn��g�D8��\.�3�L0T*������˂ a�ٔJe$�|�2˲k��J�r��%�I�D�P(d2A0���OLL�e�f���tf�Y��e2+�JY��D"k-j0\.W4�y^�R���Q,GFF��l�PAx��0�n�[,����Gr{dz�lOOOkk�ѣG{{{�Z��f�8�b�444H$�l6��/�=z4�L�ޘ�b���_ZZz���v{�X�����p�0�ž������ծ� ���A���W_}U&�1#�J��j����`�ȑ#>�o��� �f���楥��R��� �p:�$INNN�8q"�Hl0��<_(P�j�������$A���������Ѿ�>��w���b�(��^{�5��-�HfffN�:�N�+�k�Z�����|p������k4�Z,�������Ri6�=w�Mӕ�655�J���������EQ�E"�R�lnn>[EMAIL PROTECTED]`v��Y� ��5ݘa��������������b� � ����A���6�������GGG''''&&����K�.544�\�p8�J���`yo����G"�Ç��g����[�nMOO߽{���9s�d2���MMM���p8\6F���F����z�;���&&&&&&fff&''������M�6566������L&S��mmm333���7�|�q\.���|w�}���"�Ȟ={���%��?�,���[9�#�P(�8�����xL&SOO�R�T*�f��f���j�HT,�{��vww_�vmxxX��\�r�P(�U*���x6�%I��r
�,[vR��V(���744���k�B�˲�9�5
� ����?�$�I�0������_��ѣ555###�T
+x ��R)�������D"���� 8�ZM���͛y��y�f&����*�J�,�vttd�ٟ~�� �G&T$E"��7o�d�x<��xkk�����������z��f����tzE�� ���x�"I��n���r��챸��s�Α��D)�'[EMAIL PROTECTED]'��x|||�쀕��d�@ �m۶+W�d2�1G$ٷo����d��|+�[�XT*��D�f��9sfBz
+�077����{�^�ݮP(t:���v��}}}E"�@ ��_
���(�...�L���D�P�h4NMM�l�l6� ˲��h�Ͷe˖_����T*�4=99I�d�P� H��o��t:/_��N��b�e2�{����t:�V���$�W��i�\�ǁ%��J8�t��SO=�~]BXar�ܕ+W|>EQ�attT��mڴ���z�N�l�����ԥ|>_(�[�h�� h||\��2#�HX��0�P(X�����;v,//�,r7��E�B��ŔJ%˲��R�R�EQ�?������0W���P(��<MӠ^�0� �^�gYV�T�b��V�D"�a���
+�@ `FQ��ŋgϞ}��w�y晦�&�B�t:'&&V,P<[EMAIL PROTECTED]"Q�F�;��2�lxxX&��0�8��tqcǎ;w����,�oV�"��d*�R(�o�j5�ku=��b��X���(�D�я?�8��L�X,6==]��8N"���
+�(8�
[EMAIL PROTECTED]&�J+��<`0?�0Ô#��'�|"�J9�[�Jec�����T
+|(�T*EQD�Z�r�q���:n�������Z�F��ih��[)[EMAIL PROTECTED]@EQccc� �:�r��X,b��(:66�~�D}��R����A���R�����7N(8�\.722�P(X�]�555����0�Z]���|>o0&''1c�"�ˣ��֭[�^�J����V"�J�t:[EMAIL PROTECTED] ��E�V� �Z�^}3� �$�X,� ����V�T*�r�H$�z�b��g��B�a�}/��p�n�߹s�aP�X�e�{���&��b�<�1�DB�P������ZM�ÇZ4eYE���N���:[EMAIL PROTECTED] r8�P��p����8��f�q\SSSmm���q\����z��X�0������t:�˽���W�0�I�������������z�7���p8L�����N'(V+�?�H8�Z�>��\�����<f��A��n�BAD{{��ӧ �XXX N
+���]��VkKK�0ccc<��V��������z�ӧO��ꩩ��<����z�R�w�^�ӹ�� TN�������p��������t�l6766��d2����v8�R�t8uuu [EMAIL PROTECTED] h``�f��������X,[�l���/��R]]��ݔ ����h4�����j�z��j�Z,���ں�:�ɔJ�\.��/�|��1��r�Ν�:𦤷��ܹsǽ��+���0�F�����7�~? zaa�2 #�������g]F��0��h2����0�L�8p�$I��Wֿ,���q�$;::6m����^:�L&���p8�v;EQE:thff&��T"��(��tvwwo߾EQ�Je2�=O�V������N�zdB���dr�\��������$I����͛w��],���k��0??_�)�<h�`�����ҢV�q�z��>��_�5<<l6�o��s7==���)�BQ�������t:�Je4���;;;oܸ�����ʆ�z 6�����$ɚ�������n��988H�t��s
+��R�����6���([EMAIL PROTECTED]'
+�Z��'�
+Ekk�F�A"��w,[EMAIL PROTECTED]"QY��V�=|��G}����`OO�F�)�J����������e����j��(ٶm� �`��|&�YZZ�F�*�� �X,v�����A������F �PeY6�H,..
+�F#�Hfgg�9��9�����xR�T�X\^^^\\�ONN�ݻ�l6?~�j�}{#?t G�T*�Z�T*E4���b2��F��$U�JB)��q�AE�t:�T*�A�'��<�w�h4����J�l6�F3���e9�az�^�Ra;�0�T*�����T*A [EMAIL PROTECTED](��<�0(�h�2,��}�.� �x<'N� Ei�����ol���z4a�Ho���g鍍��(XTſ����
�v�P�}{����(��ջ{�!�/&e���`0H�t2�\����� EQ�{�*UTQEUTQ����f"����2 IEND�B`�
\ No newline at end of file
Modification de propriétés sur trunk/data/images/status/opt_speed.png
___________________________________________________________________
Nom : svn:mime-type
+ application/octet-stream