]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Lint
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 5 Aug 2017 07:14:46 +0000 (17:14 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 5 Aug 2017 07:15:25 +0000 (17:15 +1000)
14 files changed:
qcsrc/common/minigames/minigame/bd.qc
qcsrc/common/monsters/_mod.qh
qcsrc/common/monsters/sv_spawn.qc
qcsrc/common/monsters/sv_spawner.qc
qcsrc/common/monsters/sv_spawner.qh [new file with mode: 0644]
qcsrc/common/mutators/mutator/walljump/walljump.qc
qcsrc/common/t_items.qc
qcsrc/common/triggers/target/_mod.qh
qcsrc/common/triggers/target/kill.qc
qcsrc/common/triggers/target/kill.qh [new file with mode: 0644]
qcsrc/common/turrets/sv_turrets.qc
qcsrc/lib/warpzone/server.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/client.qh

index 904b7772eae4cbd4ffc1edb7abc66d0bb19d79bd..cda2e5d261368c5088beac39f9a60d71b4f98e46 100644 (file)
@@ -1020,7 +1020,7 @@ void bd_hud_board(vector pos, vector mySize)
                                minigame_drawpic_centered( tile_pos,
                                                minigame_texture(thepiece),
                                                tile_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL );
-                       }       
+                       }
                }
                else if ( e.classname == "minigame_board_piece" )
                {
@@ -1058,7 +1058,7 @@ void bd_hud_board(vector pos, vector mySize)
                                default:
                                case BD_DIR_DN: theang = M_PI; break;
                                case BD_DIR_LF: theang = M_PI * 3 / 2; break;
-                               case BD_DIR_RT: theang = M_PI / 2; break; 
+                               case BD_DIR_RT: theang = M_PI / 2; break;
                        }
 
                        drawrotpic(tile_pos, theang, minigame_texture("bd/dozer"),
index 55204bd1a770ec46b66e48222b6d0ae3fcbf62e7..7f726d64096402e5183868fcb6fa20a8c61fd122 100644 (file)
@@ -6,5 +6,8 @@
 #ifdef SVQC
     #include <common/monsters/sv_spawn.qh>
 #endif
+#ifdef SVQC
+    #include <common/monsters/sv_spawner.qh>
+#endif
 
 #include <common/monsters/monster/_mod.qh>
index 884fb3dea154828ee26b392be65e1cfb48afdf8e..4bbe2ce3d8f8a94fc336a0165e8009d0c16b0767 100644 (file)
@@ -19,7 +19,7 @@ entity spawnmonster (entity e, string monster, int monster_id, entity spawnedby,
 
        if(monster == "random")
        {
-               RandomSelection_Init(); 
+               RandomSelection_Init();
                FOREACH(Monsters, it != MON_Null && !(it.spawnflags & MONSTER_TYPE_PASSIVE) && !(it.spawnflags & MON_FLAG_HIDDEN),
                {
                        RandomSelection_AddEnt(it, 1, 1);
index 0b34d13e659633a1892e10db93771a761ad4b629..d3f4ee740ab1543d2bf8fae2090e111842f251de 100644 (file)
@@ -1,3 +1,4 @@
+#include "sv_spawner.qh"
 #include "sv_spawn.qh"
 
 void spawner_use(entity this, entity actor, entity trigger)
diff --git a/qcsrc/common/monsters/sv_spawner.qh b/qcsrc/common/monsters/sv_spawner.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
@@ -0,0 +1 @@
+#pragma once
index 95a52185b849fd5c4a475b642c78d0148905a63c..b0d95ea29eb784570f48fb4621724dd930e0e292 100644 (file)
@@ -44,7 +44,7 @@ MUTATOR_HOOKFUNCTION(walljump, PlayerJump)
        if(!IS_DEAD(player))
        {
                vector plane_normal = PlayerTouchWall(player);
-               
+
                if(plane_normal != '0 0 0')
                {
                        float wj_force = PHYS_WALLJUMP_FORCE(player);
index 1e5f8284cb3b2bcdd5c9da1fd841dfc5a86a90f3..e674eff42827fcef768132e9fa4c45693d7d354f 100644 (file)
@@ -1373,7 +1373,7 @@ spawnfunc(item_rockets)
 
 spawnfunc(item_bullets)
 {
-       if(!weaponswapping && autocvar_sv_q3acompat_machineshotgunswap && 
+       if(!weaponswapping && autocvar_sv_q3acompat_machineshotgunswap &&
           (this.classname != "droppedweapon"))
        {
                weaponswapping = true;
index 6b06b75f10ef9c672238ffbd985824be6403a5c9..c59ee797615bfbd03a753f28a37fb119924263ea 100644 (file)
@@ -1,6 +1,7 @@
 // generated file; do not modify
 #include <common/triggers/target/changelevel.qh>
 #include <common/triggers/target/include.qh>
+#include <common/triggers/target/kill.qh>
 #include <common/triggers/target/levelwarp.qh>
 #include <common/triggers/target/location.qh>
 #include <common/triggers/target/music.qh>
index a086bb3c898af0a6701c7b06fc84b770d4d274bd..a821ac1393724ace54a18286c8e22aa6cb8f59ca 100644 (file)
@@ -1,3 +1,4 @@
+#include "kill.qh"
 #include "location.qh"
 #ifdef SVQC
 
diff --git a/qcsrc/common/triggers/target/kill.qh b/qcsrc/common/triggers/target/kill.qh
new file mode 100644 (file)
index 0000000..6f70f09
--- /dev/null
@@ -0,0 +1 @@
+#pragma once
index b9250f0a8853671261b64fb2558c0df2047581aa..cb69bf0ff12ba7f2ec9c312e0af33002af6b9393 100644 (file)
@@ -1254,7 +1254,7 @@ void turret_findtarget(entity this)
                setthink(e, turrets_manager_think);
                e.nextthink = time + 2;
        }
-       
+
        entity targ = find(NULL, targetname, this.target);
        if(targ.classname == "turret_checkpoint")
                return; // turrets don't defend checkpoints?
index 40c317a6910ec9f994614af7e88ef2db16230946..fa247896756ca68e8527c5d4a1290b048665b7c7 100644 (file)
@@ -811,7 +811,7 @@ void WarpZone_StartFrame()
                        WarpZone_StoreProjectileData(it);
                });
        }
-               
+
 
        FOREACH_CLIENT(true,
        {
index cede62366848b6407f7e8924863290c62a905099..24d960284f1e1a6da3cb52e71c01903472c6e8bd 100644 (file)
@@ -363,7 +363,7 @@ void havocbot_bunnyhop(entity this, vector dir)
                                        if(checkdistance)
                                        {
                                                this.aistatus &= ~AI_STATUS_RUNNING;
-                                               // increase stop distance in case the goal is on a slope or a lower platform 
+                                               // increase stop distance in case the goal is on a slope or a lower platform
                                                if(bunnyhopdistance > autocvar_bot_ai_bunnyhop_stopdistance + (this.origin.z - gco.z))
                                                        PHYS_INPUT_BUTTON_JUMP(this) = true;
                                        }
index 8e8c8d71b3a5af1d0e8c17d164bae28f2f858e23..ee00c60ca6f97f4603c1572ec34099a1cb800e46 100644 (file)
@@ -148,7 +148,7 @@ CLASS(Spectator, Client)
 ENDCLASS(Spectator)
 
 CLASS(Player, Client)
-    
+
     // custom
 
     ATTRIB(Player, dual_weapons, vector, this.dual_weapons); // TODO: actually WepSet!