Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6498 in orxonox.OLD for trunk/src/util/state.cc


Ignore:
Timestamp:
Jan 11, 2006, 9:58:22 PM (18 years ago)
Author:
patrick
Message:

trunk: merged the network branche into the trunk

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/util/state.cc

    r6468 r6498  
    2929PNode* State::cameraTarget = NULL;
    3030
    31 Player* State::_localPlayer = NULL;
    32 SkyBox* State::_skyBox = NULL;
     31SkyBox* State::skyBox = NULL;
    3332
    3433ObjectManager* State::objectManager = NULL;
    3534
    36 unsigned int State::_resX = 1;
    37 unsigned int State::_resY = 1;
     35
     36unsigned int State::resX = 1;
     37unsigned int State::resY = 1;
     38
     39StoryEntity* State::storyEntity = NULL;
     40
     41Player* State::player = NULL;
     42
    3843
    3944/**
Note: See TracChangeset for help on using the changeset viewer.