← Back to branch summary

~luke-jr/tr2norigins/tr2norigins-0.4

« back to all changes in this revision

Viewing changes to src/ui/uMenu.cpp

  • Committer: Luke Dashjr
  • Date: 2010-04-20 23:29:32 UTC
  • mfrom: (690.1.4 compile)
  • Revision ID: luke+bzr@dashjr.org-20100420232932-2t5c0gbjsvh9k33f
MERGE: Moviepack mostly finished

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ui/uMenu.cpp
103
103
#endif
104
104
 
105
105
#ifndef DEDICATED
106
 
static REAL titlefac=1.2;
 
106
static REAL titlefac=1.1;
 
107
static REAL menufac=.8;
107
108
#endif
108
109
int menuentries=0;
109
110
 
256
257
 
257
258
        menuBot=-1+spaceBelow;
258
259
 
259
 
        const REAL border=.3;
 
260
        const REAL border=.7; //fade time on menu scroll??
260
261
        const REAL smallborder=.1;
261
262
 
262
263
        menuentries=items.Len();
319
320
 
320
321
            glDisable(GL_TEXTURE_2D);
321
322
            //glDisable(GL_TEXTURE);
322
 
            Color(1,.2,.2,.5);
 
323
            Color(1,.2,.2,.8);
323
324
            if (YPos(0)<menuBot+smallborder && (int(tSysTimeFloat()))%2)
324
 
                arrow(.9,menuBot+.1,-1,.05);
 
325
                arrow(.9,menuBot+.1,-1,.04);
325
326
            if (YPos(menuentries-1)>menuTop && (int(tSysTimeFloat())+1)%2)
326
 
                arrow(.9,menuTop,1,.05);
 
327
                arrow(.9,menuTop-.07,1,.04);
327
328
 
328
329
            if (tSysTimeFloat()-lastkey>timeout){
329
330
                disphelp=true;
334
335
                          .8*(tSysTimeFloat()-lastkey-timeout),
335
336
                          .8*(tSysTimeFloat()-lastkey-timeout));
336
337
 
337
 
                rTextField c(-.95f,menuBot-.04f);
 
338
                rTextField c(-.93f,menuBot-.04f);
338
339
                c.SetWidth(static_cast<int>((1.9f-items[selected]->SpaceRight())/c.GetCWidth()));
339
340
                c << items[selected]->Help();
340
341
            }
554
555
        }
555
556
#endif
556
557
 
557
 
        ::DisplayText(x,y,tw,th,text,center,c,cp, colorMode );
 
558
        ::DisplayText(x,y,tw*menufac,th*menufac,text,center,c,cp, colorMode );
558
559
    }
559
560
#endif
560
561
}