Merge branch 'master' into Mario/turrets

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / turrets / unit / phaser.qc

diff --git a/qcsrc/common/turrets/unit/phaser.qc b/qcsrc/common/turrets/unit/phaser.qc
index a36fa545d3de57c9d572db61fdb685ee1abd193a..60abd16db6b264bacf83fa970d2373d7054ecd90 100644 (file)
--- a/qcsrc/common/turrets/unit/phaser.qc
+++ b/qcsrc/common/turrets/unit/phaser.qc
@@ -9,16 +9,8 @@ REGISTER_TURRET(
 /* netname       */ "phaser",
 /* fullname   */ _("Phaser Cannon")
 );
-
-#define PHASER_SETTINGS(turret) 
-
-
-#ifdef SVQC
-PHASER_SETTINGS(phaser)
-#endif // SVQC
 #else
 #ifdef SVQC
-
 .float fireflag;
 
 float turret_phaser_firecheck()
@@ -67,7 +59,7 @@ void beam_think()
 
 }
 
-void spawnfunc_turret_phaser() { if not(turret_initialize(TUR_PHASER)) remove(self); }
+void spawnfunc_turret_phaser() { if(!turret_initialize(TUR_PHASER)) remove(self); }
 
 float t_phaser(float req)
 {
@@ -153,11 +145,6 @@ float t_phaser(float req)
                        precache_sound ("turrets/phaser.wav");
                        return TRUE;
                }
-               case TR_CONFIG:
-               {
-                       TUR_CONFIG_SETTINGS(PHASER_SETTINGS(phaser))
-                       return TRUE;
-               }
        }
 
        return TRUE;