← Back to branch summary

~luke-jr/tr2norigins/tr2norigins-0.4

« back to all changes in this revision

Viewing changes to src/tron/gGame.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/gGame.cpp
1763
1763
    */
1764
1764
 
1765
1765
 
1766
 
    rITexture::LoadAll();
 
1766
    //rITexture::LoadAll();
1767
1767
    // se_ResetGameTimer();
1768
1768
    // se_PauseGameTimer(true);
1769
1769
 
3488
3488
            break;
3489
3489
        case GS_TRANSFER_OBJECTS:
3490
3490
            // con << "Transferring objects...\n";
3491
 
            rITexture::LoadAll();
 
3491
            //rITexture::LoadAll();
3492
3492
            // se_ResetGameTimer();
3493
3493
            // se_PauseGameTimer(true);
3494
3494
 
3542
3542
            break;
3543
3543
        case GS_CAMERA:
3544
3544
            // con << "Setting camera position...\n";
3545
 
            rITexture::LoadAll();
 
3545
            //rITexture::LoadAll();
3546
3546
            // se_ResetGameTimer(-PREPARE_TIME);
3547
3547
            // se_PauseGameTimer(true);
3548
3548
            init_game_camera(grid);
3550
3550
            break;
3551
3551
        case GS_SYNCING:
3552
3552
            // con << "Syncing timer...\n";
3553
 
            rITexture::LoadAll();
 
3553
            //rITexture::LoadAll();
3554
3554
            SetState(GS_PLAY,GS_PLAY);
3555
3555
            if (sn_GetNetState()!=nCLIENT){
3556
3556
                if (rounds<=0){