Changeset 10484 in orxonox.OLD for branches

Timestamp:

Jan 29, 2007, 5:07:24 PM (18 years ago)

Author:

nicolasc

Message:

tmp xfer

Location:

branches/playability/src/world_entities

Files:

• WorldEntities.am (modified) (1 diff)
• space_ships/human_scout.cc (added)
• space_ships/human_scout.h (added)
• space_ships/space_ship.cc (modified) (5 diffs)
• weapons/heavy_blaster.cc (modified) (3 diffs)
• weapons/light_blaster.cc (modified) (3 diffs)

branches/playability/src/world_entities/WorldEntities.am

@@ -33 +33 @@
                 \
                 world_entities/questGUI/quest_gui.cc \
-                world_entities/questGUI/quest.cc \
+                world_entities/questGUI/quest.cc \
                 \
                 world_entities/weapons/weapon_slot.cc \

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -172 +172 @@
   Weapon* cannon = new SwarmLauncher();
   cannon->setName( "SwarmLauncher");
-
+/*
   Weapon* spike = new SpikeThrower();
   spike->setName( "SpikeThrower" );
@@ -181 +181 @@
 
   Weapon* acid1 = new AcidLauncher();
-  acid1->setName( "AcidSplasher" );
+  acid1->setName( "AcidSplasher" );*/
 
 
@@ -192 +192 @@
   this->weaponMan.addWeapon( wpLeft3, 2, 4);
   this->weaponMan.addWeapon( wpRight3, 2, 5);
-/*
+
   this->weaponMan.addWeapon( wpLeft1, 3, 0);
   this->weaponMan.addWeapon( wpRight1, 3, 1);
@@ -201 +201 @@
   this->weaponMan.addWeapon( wpLeft3, 3, 4);
   this->weaponMan.addWeapon( wpRight3, 3, 5);
-*/
-
-  this->weaponMan.addWeapon( acid0, 3, 0);
-  this->weaponMan.addWeapon( acid1, 3, 1);
+
+
+//   this->weaponMan.addWeapon( acid0, 3, 0);
+//   this->weaponMan.addWeapon( acid1, 3, 1);
 
 
   this->secWeaponMan.addWeapon( cannon, 0, 2);
-  this->secWeaponMan.addWeapon( spike, 1, 3);
+//   this->secWeaponMan.addWeapon( spike, 1, 3);
 //   this->secWeaponMan.addWeapon( acid0, 2, 2);
 //   this->secWeaponMan.addWeapon( acid1, 2, 3);
 
 
-  this->weaponMan.changeWeaponConfig(3);
-  this->secWeaponMan.changeWeaponConfig(1);
+  this->weaponMan.changeWeaponConfig(0);
+  this->secWeaponMan.changeWeaponConfig(0);
 
   curWeaponPrimary    = 0;
-  curWeaponSecondary  = 1;
+  curWeaponSecondary  = 0;
 
   Playable::weaponConfigChanged();
@@ -244 +244 @@
 
 
-/*  this->loadModel("models/ships/mantawing.obj");*/
+ this->loadModel("models/spaceships/human_spaceship_fighter.obj", .25);
   //this->setVisibiliy(false);
 

branches/playability/src/world_entities/weapons/heavy_blaster.cc

@@ -72 +72 @@
 //  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
 
-  this->loadModel("models/guns/fragcannon.obj", .4);
+  this->loadModel("models/guns/frag_cannon.obj", .4);
 
 
@@ -85 +85 @@
 
   this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
-  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
+//   this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
   this->setActionSound(WA_RELOAD, "sounds/spawn/alien_generator.wav");
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
-  this->setProjectileTypeC("HBolt");   // FIXME temp project type until the blaste class exist
-//   this->setProjectileTypeC("SpikeBall");   // FIXME temp project type until the blaste class exist
+  this->setProjectileTypeC("HBolt");
   this->prepareProjectiles(5);
 
@@ -96 +95 @@
   this->setSegs(2);
   this->activeBarrel = 0;
-//   this->init2();
 
 

branches/playability/src/world_entities/weapons/light_blaster.cc

@@ -43 +43 @@
    delete [] this->shootAnim;
    delete [] this->objComp;
-/*
-    for(int j = 0; j < this->getSegs(); j++)
-    {
-      delete this->shootAnim[i][j];
-      delete this->objComp[i][j];
-    }
-    delete this->shootAnim[i];
-    delete this->objComp[i];
-    delete this->emissionPoint[i];
-  }*/
 
-//  this->deconstr();
-      // model will be deleted from WorldEntity-destructor
 }
 
@@ -66 +54 @@
 {
 
-  this->loadModel("models/guns/gattling.obj", 0.333);
+  this->loadModel("models/guns/gatling.obj", 0.333);
 
 
@@ -79 +67 @@
 
   this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
-  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
+//   this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
   this->setActionSound(WA_RELOAD, "sounds/spawn/alien_generator.wav");
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
-  //this->setProjectileTypeC("RailProjectile");   // FIXME temp project type until the blaste class exist
-  this->setProjectileTypeC("LBolt");   // Working; FIXME: add textures
-//   this->setProjectileTypeC("Spike");   // Working; FIXME: add textures
+  this->setProjectileTypeC("LBolt");
   this->prepareProjectiles(100);