Changeset 11663 for code/branches/CampaignMap_HS17/src/orxonox
- Timestamp:
- Dec 11, 2017, 5:39:48 PM (7 years ago)
- Location:
- code/branches/CampaignMap_HS17/src/orxonox
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/CampaignMap_HS17/src/orxonox/gametypes/StoryMode.cc
r11507 r11663 31 31 #include "items/Engine.h" 32 32 #include "controllers/ArtificialController.h" 33 #include "controllers/NewHumanController.h" 33 34 34 35 #include "core/CoreIncludes.h" … … 48 49 { 49 50 RegisterObject(StoryMode); 51 orxout() << "kill yourself1"; 50 52 51 53 this->gtinfo_ = new GametypeInfo(context); … … 65 67 void StoryMode::exit() 66 68 { 67 orxout() << "s funktioniert"<< endl;68 69 for (StoryMode* mission : ObjectList<StoryMode>()) 69 70 { //TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions! … … 72 73 //Gametype::end(); 73 74 } 75 74 76 /* 75 77 void Mission::setTeams() -
code/branches/CampaignMap_HS17/src/orxonox/gametypes/StoryMode.h
r11359 r11663 41 41 virtual ~StoryMode() {} 42 42 static void exit(); 43 // virtual void playerEntered(PlayerInfo* player); 43 44 44 45 -
code/branches/CampaignMap_HS17/src/orxonox/worldentities/pawns/StoryModePawn.cc
r11634 r11663 53 53 void StoryModePawn::moveFrontBack(const Vector2& value) 54 54 { 55 //this->getCamera()->setOrientation(Vector3::UNIT_X, Degree(-30)); 55 56 Vector3 newPos = this->getCamera()->getPosition(); 56 newPos. y +=value.x;57 newPos.z -= 5*value.x; 57 58 this->getCamera()->setPosition(newPos); 58 59 } … … 61 62 { 62 63 Vector3 newPos = this->getCamera()->getPosition(); 63 newPos.x += value.x;64 newPos.x += 5*value.x; 64 65 this->getCamera()->setPosition(newPos); 65 66 } -
code/branches/CampaignMap_HS17/src/orxonox/worldentities/pawns/StoryModePawn.h
r11634 r11663 21 21 * 22 22 * Author: 23 * C yrill Burgener23 * Claudio Fanconi & Nikola Bolt 24 24 * 25 25 */
Note: See TracChangeset
for help on using the changeset viewer.