commit 71181267
More text are now created during load
git-svn-id: https://blockattack.svn.sourceforge.net/svnroot/blockattack/trunk@116 9d7177f8-192b-0410-8f35-a16a89829b06
Changed files
diff --git a/Game/fonts/PenguinAttack.ttf b/Game/fonts/PenguinAttack.ttf
new file mode 100644
index 0000000..622ae2d
Binary files /dev/null and b/Game/fonts/PenguinAttack.ttf differ
diff --git a/Game/fonts/penguin_attack_license.txt b/Game/fonts/penguin_attack_license.txt
new file mode 100644
index 0000000..b3e5b5e
--- /dev/null
+++ b/Game/fonts/penguin_attack_license.txt
@@ -0,0 +1,365 @@
+Penguin Attack is Copyright (C) 2002 Dustin Norlander
+Homepage: http://www.cheapskatefonts.com
+email: dustin@dustismo.com
+
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+
+
+-------------------------------------------------------------------------------
+
+
+
+
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+
+
diff --git a/Game/gfx/boardBackBack.png b/Game/gfx/boardBackBack.png
index e2beff4..df77014 100755
Binary files a/Game/gfx/boardBackBack.png and b/Game/gfx/boardBackBack.png differ
diff --git a/source/AUTH b/source/AUTH
index 3a227dd..c719471 100644
--- a/source/AUTH
+++ b/source/AUTH
@@ -9,6 +9,7 @@ Poul Sander's files are multi licensed under "GPL v2 or later" OR "CC-BY-SA any
/fonts/
FreeSerif.ttf Free Software Foundation
+PenguinAttack.ttf Dustin Norlander - GPLv2
/gfx/
14P_Arial_Angle_Red.png Karl Bartel - http://user.cs.tu-berlin.de/~karlb/sfont/fonts.html
diff --git a/source/assets/gfx/backgrounds/boardBack.svg b/source/assets/gfx/backgrounds/boardBack.svg
index 2395cfd..bc7592e 100644
--- a/source/assets/gfx/backgrounds/boardBack.svg
+++ b/source/assets/gfx/backgrounds/boardBack.svg
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@@ -10,12 +11,12 @@
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.46"
+ inkscape:version="0.47 r22583"
width="500"
height="800"
version="1.0"
sodipodi:docname="boardBack.svg"
- inkscape:export-filename="/home/qubodup/sf_games/blockattack-1.3.2/Game/gfx/boardBackBack.png"
+ inkscape:export-filename="/home/poul/programmering/svn/blockattack/blockattack/trunk/Game/gfx/boardBackBack.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
@@ -27,6 +28,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -151,8 +153,8 @@
</pattern>
</defs>
<sodipodi:namedview
- inkscape:window-height="653"
- inkscape:window-width="1272"
+ inkscape:window-height="830"
+ inkscape:window-width="1566"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
guidetolerance="10.0"
@@ -165,10 +167,11 @@
showgrid="false"
inkscape:zoom="1"
inkscape:cx="170.07811"
- inkscape:cy="557.62437"
+ inkscape:cy="555.62437"
inkscape:window-x="0"
inkscape:window-y="320"
- inkscape:current-layer="svg2">
+ inkscape:current-layer="svg2"
+ inkscape:window-maximized="0">
<inkscape:grid
type="xygrid"
id="grid2384"
@@ -190,50 +193,6 @@
d="M 41,22 C 36.568,22 33,25.568 33,30 L 33,689 C 33,693.432 34.568,695 39,695 L 379,695 C 383.432,695 387,691.432 387,687 L 387,356 L 465,356 C 469.432,356 473,352.432 473,348 L 473,151 C 473,146.568 469.432,143 465,143 L 387,143 L 387,30 C 387,25.568 383.432,22 379,22 L 41,22 z M 57,65 L 363,65 L 363,671 L 57,671 L 57,65 z"
id="rect3274"
sodipodi:nodetypes="cccccccccccccccccccc" />
- <text
- xml:space="preserve"
- style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:103.99999619%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:16;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:16, 16;stroke-dashoffset:0;stroke-opacity:1;font-family:Penguin Attack;-inkscape-font-specification:Penguin Attack"
- x="370"
- y="170"
- id="text3162"
- sodipodi:linespacing="104%"><tspan
- sodipodi:role="line"
- id="tspan3164"
- x="370"
- y="170">Score:</tspan></text>
- <text
- sodipodi:linespacing="104%"
- id="text3166"
- y="220"
- x="370"
- style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:103.99999619%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:16;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:16, 16;stroke-dashoffset:0;stroke-opacity:1;font-family:Penguin Attack;-inkscape-font-specification:Penguin Attack"
- xml:space="preserve"><tspan
- y="220"
- x="370"
- id="tspan3168"
- sodipodi:role="line">Time:</tspan></text>
- <text
- xml:space="preserve"
- style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:103.99999619%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:16;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:16, 16;stroke-dashoffset:0;stroke-opacity:1;font-family:Penguin Attack;-inkscape-font-specification:Penguin Attack"
- x="370"
- y="265"
- id="text3170"
- sodipodi:linespacing="104%"><tspan
- sodipodi:role="line"
- id="tspan3172"
- x="370"
- y="265">Chain:</tspan></text>
- <text
- sodipodi:linespacing="104%"
- id="text3174"
- y="315"
- x="370"
- style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:103.99999619%;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:16;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:16, 16;stroke-dashoffset:0;stroke-opacity:1;font-family:Penguin Attack;-inkscape-font-specification:Penguin Attack"
- xml:space="preserve"><tspan
- y="315"
- x="370"
- id="tspan3176"
- sodipodi:role="line">Speed:</tspan></text>
<rect
style="stroke:none;fill:none"
width="20"
diff --git a/source/code/main.cpp b/source/code/main.cpp
index 703fdb2..2a9168c 100644
--- a/source/code/main.cpp
+++ b/source/code/main.cpp
@@ -464,8 +464,6 @@ static int InitImages()
&& (iDraw = IMG_Load2((char*)"gfx/iDraw.png"))
&& (iLoser = IMG_Load2((char*)"gfx/iLoser.png"))
&& (iChainBack = IMG_Load2((char*)"gfx/chainFrame.png"))
- //&& (iBlueFont = IMG_Load2((char*)"gfx/24P_Arial_Blue.png"))
- // && (iSmallFont = IMG_Load2((char*)"gfx/14P_Arial_Angle_Red.png"))
&& (optionsBack = IMG_Load2((char*)"gfx/options.png"))
&& (bOn = IMG_Load2((char*)"gfx/bOn.png"))
&& (bOff = IMG_Load2((char*)"gfx/bOff.png"))
@@ -523,8 +521,6 @@ static int InitImages()
&& (bRetry = IMG_Load2((char*)"gfx/bRetry.png"))
//&& (menuMarked = IMG_Load2((char*)"gfx/menu/marked.png"))
//&& (menuUnmarked = IMG_Load2((char*)"gfx/menu/unmarked.png"))
- //end new in 1.4.0
- //&& (mouse = IMG_Load2((char*)"gfx/mouse.png"))
))
//if there was a problem ie. "File not found"
{
@@ -561,8 +557,6 @@ static int InitImages()
CONVERTA(bSkip);
CONVERTA(bRetry);
CONVERTA(bNext);
- //CONVERTA(menuMarked);
- //CONVERTA(menuUnmarked);
#if NETWORK
CONVERTA(bNetwork);
CONVERTA(bHost);
@@ -622,10 +616,7 @@ static int InitImages()
CONVERTA(iDraw);
CONVERTA(iLoser);
CONVERTA(iChainBack);
- //CONVERTA(iBlueFont);
- //CONVERTA(iSmallFont);
CONVERTA(iGameOver);
-// CONVERTA(mouse);
mouse.OptimizeForBlit(true);
bNewGame.OptimizeForBlit(true);
CONVERTA(stageBobble);
@@ -648,14 +639,6 @@ static int InitImages()
CONVERTA(bTestPuzzle);
#endif
- //Here comes the fonts:
- //fBlueFont = SFont_InitFont(iBlueFont);
- //fSmallFont = SFont_InitFont(iSmallFont);
-
- //And the ttf font:
- /*TTF_Font *ttFont1 = TTF_OpenFont2((char*)"fonts/FreeSerif.ttf", 24);
- TTF_SetFontStyle(ttFont1,TTF_STYLE_BOLD);
- ttfont = TTFont(ttFont1);*/
SDL_Color nf_button_color, nf_standard_blue_color, nf_standard_small_color;
memset(&nf_button_color,0,sizeof(SDL_Color));
nf_button_color.b = 255; nf_button_color.g = 255; nf_button_color.r = 255;
@@ -667,7 +650,14 @@ static int InitImages()
nf_standard_blue_font.setDest(screen);
NFont_OpenFont(&nf_standard_small_font,"fonts/FreeSerif.ttf",16,nf_standard_small_color);
nf_standard_small_font.setDest(screen);
+ NFont_OpenFont(&nf_scoreboard_font,"fonts/PenguinAttack.ttf",20,nf_button_color);
+ nf_scoreboard_font.setDest(boardBackBack);
+ nf_scoreboard_font.draw(370,148,"Score:");
+ nf_scoreboard_font.draw(370,197,"Time:");
+ nf_scoreboard_font.draw(370,246,"Chain:");
+ nf_scoreboard_font.draw(370,295,"Speed:");
+
//Loads the sound if sound present
if (!NoSound)
{
@@ -691,9 +681,6 @@ static int InitImages()
void UnloadImages()
{
cout << "Unloading data..." << endl;
- //Fonts and Sounds needs to be freed
- //SFont_FreeFont(fBlueFont);
- //SFont_FreeFont(fSmallFont);
if (!NoSound) //Only unload then it has been loaded!
{
Mix_HaltMusic();
@@ -758,8 +745,6 @@ void UnloadImages()
SDL_FreeSurface(iDraw);
SDL_FreeSurface(iLoser);
SDL_FreeSurface(iChainBack);
- //SDL_FreeSurface(iBlueFont); //Segfault
- //SDL_FreeSurface(iSmallFont); //Segfault
SDL_FreeSurface(optionsBack);
SDL_FreeSurface(bOn);
SDL_FreeSurface(bOff);
@@ -792,7 +777,6 @@ void UnloadImages()
SDL_FreeSurface(smiley[2]);
SDL_FreeSurface(smiley[3]);
SDL_FreeSurface(transCover);
- //SDL_FreeSurface(mouse);
mouse.MakeNull();
bNewGame.MakeNull();
}
@@ -1532,7 +1516,6 @@ public:
if (puzzleMode&&(!bGameOver)) {
//We need to write nr. of moves left!
strHolder = "Moves left: " + itoa(MovesLeft);
- //NFont_Write(sBoard, 5, 5, strHolder.c_str());
nf_standard_blue_font.draw(5,5,strHolder.c_str());
}
@@ -1549,7 +1532,6 @@ public:
else
{
strHolder = "Last puzzle";
- //NFont_Write(sBoard, 5, 5, strHolder.c_str());
nf_standard_blue_font.draw(5,5,strHolder.c_str());
}
}
@@ -1566,7 +1548,6 @@ public:
else
{
strHolder = "Last stage";
- //NFont_Write(sBoard, 5, 5, strHolder.c_str());
nf_standard_blue_font.draw(5,5,strHolder.c_str());
}
}
@@ -1891,12 +1872,12 @@ bool OpenDialogbox(int x, int y, char *name)
while (!done)
{
DrawIMG(dialogBox,screen,x,y);
- NFont_Write(screen, x+40,y+72,rk.GetString());
+ NFont_Write(screen, x+40,y+76,rk.GetString());
strHolder = rk.GetString();
strHolder.erase((int)rk.CharsBeforeCursor());
if (((SDL_GetTicks()/600)%2)==1)
- NFont_Write(screen, x+40+nf_standard_blue_font.getWidth( strHolder.c_str()),y+69,"|");
+ NFont_Write(screen, x+40+nf_standard_blue_font.getWidth( strHolder.c_str()),y+76,"|");
SDL_Event event;
@@ -2581,13 +2562,13 @@ void DrawEverything(int xsize, int ysize,BlockGameSdl *theGame, BlockGameSdl *th
strHolder = itoa(theGame->GetScore()+theGame->GetHandicap());
NFont_Write(screen, theGame->GetTopX()+310,theGame->GetTopY()+100,strHolder.c_str());
if (theGame->GetAIenabled())
- NFont_Write(screen, theGame->GetTopX()+10,theGame->GetTopY()-40,"CPU");
+ NFont_Write(screen, theGame->GetTopX()+10,theGame->GetTopY()-34,"CPU");
else
if (editorMode)
- NFont_Write(screen, theGame->GetTopX()+10,theGame->GetTopY()-40,"Playing field");
+ NFont_Write(screen, theGame->GetTopX()+10,theGame->GetTopY()-34,"Playing field");
else
if (!singlePuzzle)
- NFont_Write(screen, theGame->GetTopX()+10,theGame->GetTopY()-40,player1name);
+ NFont_Write(screen, theGame->GetTopX()+10,theGame->GetTopY()-34,player1name);
if (theGame->isTimeTrial())
{
int tid = (int)SDL_GetTicks()-theGame->GetGameStartedAt();
@@ -2694,9 +2675,9 @@ void DrawEverything(int xsize, int ysize,BlockGameSdl *theGame, BlockGameSdl *th
strHolder = itoa(theGame2->GetScore()+theGame2->GetHandicap());
NFont_Write(screen, theGame2->GetTopX()+310,theGame2->GetTopY()+100,strHolder.c_str());
if (theGame2->GetAIenabled())
- NFont_Write(screen, theGame2->GetTopX()+10,theGame2->GetTopY()-40,"CPU");
+ NFont_Write(screen, theGame2->GetTopX()+10,theGame2->GetTopY()-34,"CPU");
else
- NFont_Write(screen, theGame2->GetTopX()+10,theGame2->GetTopY()-40,theGame2->name);
+ NFont_Write(screen, theGame2->GetTopX()+10,theGame2->GetTopY()-34,theGame2->name);
if (theGame2->isTimeTrial())
{
int tid = (int)SDL_GetTicks()-theGame2->GetGameStartedAt();
diff --git a/source/code/mainVars.hpp b/source/code/mainVars.hpp
index 284c766..ba28cfa 100644
--- a/source/code/mainVars.hpp
+++ b/source/code/mainVars.hpp
@@ -158,6 +158,7 @@ static SDL_Surface *tmp; //a temporary surface to use DisplayFormat
//static SFont_Font *fSmallFont; //Stores the small font (SFont)
//TTFont ttfont; //Stores the TTF font (TTFSDL)
static NFont nf_button_font; //Font used for buttons!
+static NFont nf_scoreboard_font;
static NFont nf_standard_blue_font; //Font used instead of the old blue SFont
static NFont nf_standard_small_font;