Changeset 8890 in orxonox.OLD for branches/single_player_map/src/world_entities/weapons

Timestamp:

Jun 28, 2006, 11:47:35 PM (19 years ago)

Author:

patrick

Message:

door and weapon stuff

Location:

branches/single_player_map/src/world_entities/weapons

Files:

• fps_sniper_rifle.cc (modified) (1 diff)
• fps_sniper_rifle.h (modified) (2 diffs)

branches/single_player_map/src/world_entities/weapons/fps_sniper_rifle.cc

@@ -76 +76 @@
 //  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
 
-  this->loadModel("models/guns/test_gun.obj");
+  this->loadModel("models/guns/fps_sniper_rifle.obj");
 
   this->setStateDuration(WS_SHOOTING, .1);

branches/single_player_map/src/world_entities/weapons/fps_sniper_rifle.h

@@ -21 +21 @@
 
 
-#ifndef _TEST_GUN_H
-#define _TEST_GUN_H
+#ifndef _FPS_SNIPER_RIFLE_H
+#define _FPS_SNIPER_RIFLE_H
 
 #include "weapon.h"
@@ -55 +55 @@
 
   };
-#endif /* _TEST_GUN_H */
+#endif /* _FPS_SNIPER_RIFLE_H */