diff --git a/data/items.xml b/data/items.xml index df764d7cb..e302f67d7 100644 --- a/data/items.xml +++ b/data/items.xml @@ -1,15 +1,15 @@ - - - - + + + + - - - - + + + + diff --git a/data/powerup.xml b/data/powerup.xml index 2c581f13a..5c92bfe0c 100644 --- a/data/powerup.xml +++ b/data/powerup.xml @@ -2,17 +2,17 @@ + model="anchor.spm" /> + model="parachute.spm" /> diff --git a/src/items/attachment_manager.cpp b/src/items/attachment_manager.cpp index 1238d36d7..b49bf4bb8 100644 --- a/src/items/attachment_manager.cpp +++ b/src/items/attachment_manager.cpp @@ -48,14 +48,14 @@ struct initAttachmentType {Attachment::AttachmentType attachment; static const initAttachmentType iat[]= { - {Attachment::ATTACH_PARACHUTE, "parachute.b3d", "parachute-attach-icon.png" }, - {Attachment::ATTACH_BOMB, "bomb.b3d", "bomb-attach-icon.png" }, - {Attachment::ATTACH_ANVIL, "anchor.b3d", "anchor-attach-icon.png" }, - {Attachment::ATTACH_SWATTER, "swatter.b3d", "swatter-icon.png" }, - {Attachment::ATTACH_NOLOKS_SWATTER, "swatter_nolok.b3d", "swatter-icon.png" }, - {Attachment::ATTACH_TINYTUX, "reset-button.b3d", "reset-attach-icon.png" }, - {Attachment::ATTACH_BUBBLEGUM_SHIELD, "bubblegum_shield.b3d", "shield-icon.png" }, - {Attachment::ATTACH_NOLOK_BUBBLEGUM_SHIELD, "bubblegum_shield_nolok.b3d", "shield-icon.png" }, + {Attachment::ATTACH_PARACHUTE, "parachute.spm", "parachute-attach-icon.png" }, + {Attachment::ATTACH_BOMB, "bomb.spm", "bomb-attach-icon.png" }, + {Attachment::ATTACH_ANVIL, "anchor.spm", "anchor-attach-icon.png" }, + {Attachment::ATTACH_SWATTER, "swatter.spm", "swatter-icon.png" }, + {Attachment::ATTACH_NOLOKS_SWATTER, "swatter_nolok.spm", "swatter-icon.png" }, + {Attachment::ATTACH_TINYTUX, "reset-button.spm", "reset-attach-icon.png" }, + {Attachment::ATTACH_BUBBLEGUM_SHIELD, "bubblegum_shield.spm", "shield-icon.png" }, + {Attachment::ATTACH_NOLOK_BUBBLEGUM_SHIELD, "bubblegum_shield_nolok.spm", "shield-icon.png" }, {Attachment::ATTACH_MAX, "", "" }, }; diff --git a/src/items/swatter.cpp b/src/items/swatter.cpp index 41803c972..4241d6654 100644 --- a/src/items/swatter.cpp +++ b/src/items/swatter.cpp @@ -75,7 +75,7 @@ Swatter::Swatter(AbstractKart *kart, bool was_bomb, if (m_removing_bomb) { m_scene_node->setMesh(irr_driver->getAnimatedMesh( - file_manager->getAsset(FileManager::MODEL,"swatter_anim2.b3d") ) ); + file_manager->getAsset(FileManager::MODEL,"swatter_anim.spm") ) ); m_scene_node->setRotation(core::vector3df(0.0, -180.0, 0.0)); m_scene_node->setAnimationSpeed(0.9f); m_scene_node->setCurrentFrame(0.0f); diff --git a/src/karts/kart_model.cpp b/src/karts/kart_model.cpp index 90b53ba36..f3e2313f8 100644 --- a/src/karts/kart_model.cpp +++ b/src/karts/kart_model.cpp @@ -770,7 +770,7 @@ void KartModel::loadHeadlights(const XMLNode &node) const XMLNode* child = node.getNode(i); if (child->getName() == "object") { - // + // core::vector3df position; child->get("position", &position); diff --git a/src/main.cpp b/src/main.cpp index 05df09787..719da100c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -421,7 +421,7 @@ void handleXmasMode() } // switch m_xmas_mode if(xmas) - kart_properties_manager->setHatMeshName("christmas_hat.b3d"); + kart_properties_manager->setHatMeshName("christmas_hat.spm"); } // handleXmasMode // ============================================================================ /** Determines if Easter Ears should be used @@ -478,7 +478,7 @@ void handleEasterEarMode() int day, month, year; StkTime::getDate(&day, &month, &year); if (isEasterMode(day, month, year, /*before_after_days*/5)) - kart_properties_manager->setHatMeshName("easter_ears.b3d"); + kart_properties_manager->setHatMeshName("easter_ears.spm"); } // handleEasterMode // ============================================================================ diff --git a/src/modes/three_strikes_battle.cpp b/src/modes/three_strikes_battle.cpp index 86f789243..a6231ff35 100644 --- a/src/modes/three_strikes_battle.cpp +++ b/src/modes/three_strikes_battle.cpp @@ -51,7 +51,7 @@ ThreeStrikesBattle::ThreeStrikesBattle() : WorldWithRank() m_insert_tire = 0; m_tire = irr_driver->getMesh(file_manager->getAsset(FileManager::MODEL, - "tire.b3d") ); + "tire.spm") ); irr_driver->grabAllTextures(m_tire); m_total_rescue = 0; @@ -375,7 +375,7 @@ void ThreeStrikesBattle::update(float dt) if(m_insert_tire == 1) { tire_offset = core::vector3df(0.0f, 0.0f, 0.0f); - tire = file_manager->getAsset(FileManager::MODEL,"tire.b3d"); + tire = file_manager->getAsset(FileManager::MODEL,"tire.spm"); scale = 0.5f; radius = 0.5f; body_shape = PhysicalObject::MP_CYLINDER_Y; @@ -387,13 +387,13 @@ void ThreeStrikesBattle::update(float dt) radius = m_tire_radius[m_insert_tire-2]; tire_offset = m_tire_offsets[m_insert_tire-2]; if (m_insert_tire == 2) - tire = m_tire_dir+"/wheel-rear-left.b3d"; + tire = m_tire_dir+"/wheel-rear-left.spm"; else if(m_insert_tire == 3) - tire = m_tire_dir+"/wheel-front-left.b3d"; + tire = m_tire_dir+"/wheel-front-left.spm"; else if(m_insert_tire == 4) - tire = m_tire_dir+"/wheel-front-right.b3d"; + tire = m_tire_dir+"/wheel-front-right.spm"; else if(m_insert_tire == 5) - tire = m_tire_dir+"/wheel-rear-right.b3d"; + tire = m_tire_dir+"/wheel-rear-right.spm"; if(!file_manager->fileExists(tire)) { m_insert_tire--; diff --git a/src/states_screens/feature_unlocked.cpp b/src/states_screens/feature_unlocked.cpp index a0d728ed2..f4d8b4e19 100644 --- a/src/states_screens/feature_unlocked.cpp +++ b/src/states_screens/feature_unlocked.cpp @@ -216,13 +216,13 @@ void FeatureUnlockedCutScene::addTrophy(RaceManager::Difficulty difficulty) switch (difficulty) { case RaceManager::DIFFICULTY_EASY: - model = file_manager->getAsset(FileManager::MODEL,"trophy_bronze.b3d"); + model = file_manager->getAsset(FileManager::MODEL,"trophy_bronze.spm"); break; case RaceManager::DIFFICULTY_MEDIUM: - model = file_manager->getAsset(FileManager::MODEL,"trophy_silver.b3d"); + model = file_manager->getAsset(FileManager::MODEL,"trophy_silver.spm"); break; case RaceManager::DIFFICULTY_HARD: - model = file_manager->getAsset(FileManager::MODEL,"trophy_gold.b3d"); + model = file_manager->getAsset(FileManager::MODEL,"trophy_gold.spm"); break; default: assert(false); diff --git a/src/states_screens/grand_prix_win.cpp b/src/states_screens/grand_prix_win.cpp index d992b6931..30e9bca59 100644 --- a/src/states_screens/grand_prix_win.cpp +++ b/src/states_screens/grand_prix_win.cpp @@ -376,11 +376,11 @@ void GrandPrixWin::setKarts(const std::string idents_arg[3]) TrackObjectPresentationMesh* meshPresentation = currObj->getPresentation(); if (meshPresentation != NULL) { - if (meshPresentation->getModelFile() == "gpwin_podium1.b3d") + if (meshPresentation->getModelFile() == "gpwin_podium1.spm") m_podium_steps[0] = currObj; - else if (meshPresentation->getModelFile() == "gpwin_podium2.b3d") + else if (meshPresentation->getModelFile() == "gpwin_podium2.spm") m_podium_steps[1] = currObj; - else if (meshPresentation->getModelFile() == "gpwin_podium3.b3d") + else if (meshPresentation->getModelFile() == "gpwin_podium3.spm") m_podium_steps[2] = currObj; } } diff --git a/src/states_screens/kart_selection.cpp b/src/states_screens/kart_selection.cpp index db7cc3d76..3afc5663e 100644 --- a/src/states_screens/kart_selection.cpp +++ b/src/states_screens/kart_selection.cpp @@ -844,7 +844,7 @@ void KartSelectionScreen::updateKartWidgetModel(int widget_id, { w3->clearModels(); w3->addModel(irr_driver->getAnimatedMesh( - file_manager->getAsset(FileManager::MODEL, "chest.b3d") )->getMesh(20), + file_manager->getAsset(FileManager::MODEL, "chest.spm") )->getMesh(20), Vec3(0,0,0), Vec3(15.0f, 15.0f, 15.0f) ); w3->update(0);