← Back to branch summary

~luke-jr/tr2norigins/tr2norigins-0.4

« back to all changes in this revision

Viewing changes to src/tron/gWall.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/tron/gWall.cpp
90
90
//static rFileTexture gWallRim_c(rTextureGroups::TEX_WALL,"moviepack/rim_wall_c.png",0,0);
91
91
//static rFileTexture gWallRim_d(rTextureGroups::TEX_WALL,"moviepack/rim_wall_d.png",0,0);
92
92
 
 
93
rITexture* gWallRim_mp[4];
 
94
 
93
95
//static rITexture *gWallRim_mp[4]={&gWallRim_a,&gWallRim_b,
94
96
//                                  &gWallRim_c,&gWallRim_d};
95
97
 
164
166
static void gWallRim_helper(eCoord p1,eCoord p2,REAL tBeg,REAL tEnd,REAL h,
165
167
                            REAL Z_SCALE,bool sw){
166
168
 
167
 
static rFileTexture gWallRim_a(rTextureGroups::TEX_WALL,tString(sg_moviepackPathName + sg_moviepackSlot[sg_moviepackIndex] + "/rim_wall_a.png"),0,0);
168
 
static rFileTexture gWallRim_b(rTextureGroups::TEX_WALL,tString(sg_moviepackPathName + sg_moviepackSlot[sg_moviepackIndex] + "/rim_wall_b.png"),0,0);
169
 
static rFileTexture gWallRim_c(rTextureGroups::TEX_WALL,tString(sg_moviepackPathName + sg_moviepackSlot[sg_moviepackIndex] + "/rim_wall_c.png"),0,0);
170
 
static rFileTexture gWallRim_d(rTextureGroups::TEX_WALL,tString(sg_moviepackPathName + sg_moviepackSlot[sg_moviepackIndex] + "/rim_wall_d.png"),0,0);
171
 
 
172
 
 
173
 
static rITexture *gWallRim_mp[4]={&gWallRim_a,&gWallRim_b,
174
 
                                  &gWallRim_c,&gWallRim_d};
175
169
 
176
170
    // draw additional upper line
177
171
    /*
189
183
    */
190
184
 
191
185
    if (sg_MoviePack()){
 
186
            if ( (sg_moviepackUpdated[7] < sg_moviepackUpdated[0])  ) 
 
187
                {
 
188
                gWallRim_mp[0]=tNEW(rFileTexture)(rTextureGroups::TEX_WALL,tString(sg_moviepackPathName + sg_moviepackSlot[sg_moviepackIndex] + "/rim_wall_a.png"),0,0); 
 
189
                gWallRim_mp[1]=tNEW(rFileTexture)(rTextureGroups::TEX_WALL,tString(sg_moviepackPathName + sg_moviepackSlot[sg_moviepackIndex] + "/rim_wall_b.png"),0,0); 
 
190
                gWallRim_mp[2]=tNEW(rFileTexture)(rTextureGroups::TEX_WALL,tString(sg_moviepackPathName + sg_moviepackSlot[sg_moviepackIndex] + "/rim_wall_c.png"),0,0);
 
191
                gWallRim_mp[3]=tNEW(rFileTexture)(rTextureGroups::TEX_WALL,tString(sg_moviepackPathName + sg_moviepackSlot[sg_moviepackIndex] + "/rim_wall_d.png"),0,0);
 
192
                sg_moviepackUpdated[7] = sg_moviepackUpdated[0];
 
193
                        
 
194
                
 
195
                }
 
196
 
192
197
        int t=int(floor((tBeg+tEnd)/2));
193
198
        tBeg-=t;
194
199
        tEnd-=t;