- Timestamp:
- Dec 19, 2005, 11:37:06 PM (19 years ago)
- Location:
- branches/christmas_branche/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/christmas_branche/src/lib/event/event_handler.cc
r6054 r6167 259 259 { 260 260 this->eventsGrabbed = grabEvents; 261 if(!grabEvents)262 SDL_WM_GrabInput(SDL_GRAB_OFF);263 else264 SDL_WM_GrabInput(SDL_GRAB_ON);261 // if(!grabEvents) 262 // SDL_WM_GrabInput(SDL_GRAB_OFF); 263 // else 264 // SDL_WM_GrabInput(SDL_GRAB_ON); 265 265 } 266 266 -
branches/christmas_branche/src/world_entities/creatures/md2_creature.cc
r6166 r6167 36 36 using namespace std; 37 37 38 CREATE_FACTORY(MD2Creature, CL_ SPACE_SHIP);38 CREATE_FACTORY(MD2Creature, CL_MD2_CREATURE); 39 39 40 40 /** … … 141 141 this->registerEvent(KeyMapper::PEV_NEXT_WEAPON); 142 142 this->registerEvent(KeyMapper::PEV_PREVIOUS_WEAPON); 143 this->registerEvent(SDLK_PAGEUP);144 this->registerEvent(SDLK_PAGEDOWN);145 143 this->registerEvent(EV_MOUSE_MOTION); 146 144 -
branches/christmas_branche/src/world_entities/world_entity.cc
r6142 r6167 120 120 } 121 121 122 PRINTF(4)("fetching %s\n", fileName); 123 if (scaling == 1.0) 124 this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN), modelNumber); 125 else 126 this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, &scaling), modelNumber); 127 if (modelNumber == 0) 128 this->buildObbTree(4); 122 if( strchr(fileName, '.obj') != NULL) 123 { 124 PRINTF(4)("fetching OBJ file: %s\n", fileName); 125 if (scaling == 1.0) 126 this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN), modelNumber); 127 else 128 this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, &scaling), modelNumber); 129 130 if( modelNumber == 0) 131 this->buildObbTree(4); 132 } 133 else if( strchr(fileName, '.md2') != NULL) 134 { 135 PRINTF(4)("fetching MD2 file: %s\n", fileName); 136 this->setModel((Model*)ResourceManager::getInstance()->load(fileName, MD2, RP_CAMPAIGN), 0); 137 } 129 138 } 130 139 else
Note: See TracChangeset
for help on using the changeset viewer.