Changeset 10645 in orxonox.OLD for branches/vs-enhencements/src/world_entities/weapons
- Timestamp:
- May 2, 2007, 11:48:16 PM (18 years ago)
- Location:
- branches/vs-enhencements/src/world_entities/weapons
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/vs-enhencements/src/world_entities/weapons/heavy_blaster.cc
r10644 r10645 98 98 // this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN); 99 99 100 this->loadModel("models/guns/frag_cannon .obj", .4);100 this->loadModel("models/guns/frag_cannon2.obj", .4); 101 101 102 102 -
branches/vs-enhencements/src/world_entities/weapons/light_blaster.cc
r10644 r10645 53 53 { 54 54 55 //for (int i = 0; i < this->getBarrels(); i++)56 //{57 ////delete [] this->shootAnim[i];58 //delete [] this->objComp[i];59 //}60 //delete [] this->emissionPoint;61 ////delete [] this->shootAnim;62 //delete [] this->objComp;55 for (int i = 0; i < this->getBarrels(); i++) 56 { 57 //delete [] this->shootAnim[i]; 58 delete [] this->objComp[i]; 59 } 60 delete [] this->emissionPoint; 61 //delete [] this->shootAnim; 62 delete [] this->objComp; 63 63 64 64 } -
branches/vs-enhencements/src/world_entities/weapons/rf_cannon.cc
r10644 r10645 52 52 RFCannon::~RFCannon() 53 53 { 54 //for (int i = 0; i < this->getBarrels(); i++)55 //delete [] this->objComp[i];54 for (int i = 0; i < this->getBarrels(); i++) 55 delete [] this->objComp[i]; 56 56 57 //delete [] this->emissionPoint;58 //delete [] this->objComp;57 delete [] this->emissionPoint; 58 delete [] this->objComp; 59 59 } 60 60 … … 67 67 { 68 68 69 this->loadModel("models/guns/rf_cannon.obj", 0. 3);69 this->loadModel("models/guns/rf_cannon.obj", 0.2); 70 70 71 71 … … 82 82 83 83 this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT); 84 this->setProjectileTypeC(" LBolt");84 this->setProjectileTypeC("PlasmaPulse"); 85 85 this->prepareProjectiles(100); 86 86 … … 122 122 void RFCannon::fire() 123 123 { 124 for (int i = 0; i < this->getBarrels(); i++){124 // for (int i = 0; i < this->getBarrels(); i++){ 125 125 Projectile* pj = this->getProjectile(); 126 126 if (pj == NULL) … … 139 139 140 140 this->activeBarrel = (this->activeBarrel + 1) % this->getBarrels(); 141 }141 // } 142 142 } 143 143 -
branches/vs-enhencements/src/world_entities/weapons/weapon.cc
r10529 r10645 163 163 * needed, if there are more than one barrel or segments 164 164 */ 165 /* 165 166 void Weapon::init2() 166 167 { … … 182 183 this->shootAnim[i] = new Animation3D* [this->segs]; 183 184 } 184 } 185 }*/ 185 186 186 187 /** 187 188 * deconstructor for init2 188 189 */ 190 /* 189 191 void Weapon::deconstr() 190 192 { … … 198 200 delete this->emissionPoint; 199 201 delete this->shootAnim; 200 } 202 }*/ 201 203 202 204 /** -
branches/vs-enhencements/src/world_entities/weapons/weapon.h
r10516 r10645 181 181 inline void setSegs(int segs) { this->segs = segs; }; 182 182 183 inline Animation3D* getShootAnim(int barrel, int seg) { return this->shootAnim[barrel][seg]; };184 inline void setShootAnim(int barrel, int seg, PNode* component) { this->shootAnim[barrel][seg] = this->getAnimation(barrel, seg, component); };185 186 void init2();183 // inline Animation3D* getShootAnim(int barrel, int seg) { return this->shootAnim[barrel][seg]; }; 184 // inline void setShootAnim(int barrel, int seg, PNode* component) { this->shootAnim[barrel][seg] = this->getAnimation(barrel, seg, component); }; 185 186 // void init2(); 187 187 void deconstr(); 188 188
Note: See TracChangeset
for help on using the changeset viewer.