← Back to branch summary

~nightshade-dev/nightshade/trunk

« back to all changes in this revision

Viewing changes to src/loadingbar.cpp

  • Committer: Trystan Larey-Williams
  • Date: 2011-06-01 23:25:13 UTC
  • mfrom: (128.15.20 trunk)
  • Revision ID: tlareywi@trystan.digitaliseducation-20110601232513-xpimcjm6immeonp0
local merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/loadingbar.cpp
86
86
        glColor3f(0, 0, 0);
87
87
        glBegin(GL_QUAD_STRIP);
88
88
        glTexCoord2i(1, 0);             // Bottom Right
89
 
        glVertex3f(barx + barwidth, bary-20, 0.0f);
 
89
        glVertex3f(splashx + width, bary-70, 0.0f);
90
90
        glTexCoord2i(0, 0);             // Bottom Left
91
 
        glVertex3f(barx, bary-20, 0.0f);
 
91
        glVertex3f(splashx, bary-70, 0.0f);
92
92
        glTexCoord2i(1, 1);             // Top Right
93
 
        glVertex3f(barx + barwidth, bary-5, 0.0f);
 
93
        glVertex3f(splashx + width, bary-5, 0.0f);
94
94
        glTexCoord2i(0, 1);             // Top Left
95
 
        glVertex3f(barx, bary-5, 0.0f);
 
95
        glVertex3f(splashx, bary-5, 0.0f);
96
96
        glEnd();
97
97
        glColor3f(0.8, 0.8, 1);
98
98
        glBegin(GL_QUAD_STRIP);
122
122
        glEnable(GL_BLEND);
123
123
        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // Normal transparency mode
124
124
 
125
 
        if(barfont) barfont->print(barx, bary-15, message);
 
125
        if(barfont) {
 
126
                barfont->print(barx, bary-15, message);
 
127
                // LEGAL NOTICES -- THE DISPLAY OF THESE AT STARTUP MAY NOT BE REMOVED as per GPL section 5
 
128
                barfont->print(barx, bary-40, "<span color='#666699'>Nightshade is free, open source software with a GPLv3 license.</span>");
 
129
                barfont->print(barx, bary-55, "<span color='#666699'>Nightshade is a trademark of Digitalis Education Solutions, Inc.</span>");
 
130
        }
 
131
 
126
132
        if(extraTextFont) {
127
133
                extraTextFont->print(splashx + extraTextPos[0], splashy + extraTextPos[1], extraText);
128
134
                extraTextFont->print(splashx + extraTextPos[0], splashy + extraTextPos[1] - 20, EDITION);