djcev.com

diff --git a/qc-server/ai.qc b/qc-server/ai.qc
deleted file mode 100644
index 0d8f18a..0000000
--- a/qc-server/ai.qc
+++ /dev/null
@@ -1,858 +0,0 @@
-void() movetarget_f;
-void() t_movetarget;
-void() knight_walk1;
-void() knight_bow6;
-void() knight_bow1;
-void(entity etemp, entity stemp, entity stemp, float dmg) T_Damage;
-float NO_SIGHT_SOUND = 32;
-float PASSIVE_UNTIL_ATTACKED = 64;
-float PASSIVE_ALWAYS = 128;
-/*
-
-.enemy
-Will be world if not currently angry at anyone.
-
-.movetarget
-The next path spot to walk toward.  If .enemy, ignore .movetarget.
-When an enemy is killed, the monster will try to return to it's path.
-
-.huntt_ime
-Set to time + something when the player is in sight, but movement straight for
-him is blocked.  This causes the monster to use wall following code for
-movement direction instead of sighting on the player.
-
-.ideal_yaw
-A yaw angle of the intended direction, which will be turned towards at up
-to 45 deg / state.  If the enemy is in view and hunt_time is not active,
-this will be the exact line towards the enemy.
-
-.pausetime
-A monster will leave it's stand state and head towards it's .movetarget when
-time > .pausetime.
-
-walkmove(angle, speed) primitive is all or nothing
-*/
-
-
-//
-// globals
-//
-
-//
-// when a monster becomes angry at a player, that monster will be used
-// as the sight target the next frame so that monsters near that one
-// will wake up even if they wouldn't have noticed the player
-//
-entity sight_entity;
-float  sight_entity_time;
-
-float(float v) anglemod =
-{
-       while (v >= 360)
-               v = v - 360;
-       while (v < 0)
-               v = v + 360;
-       return v;
-};
-
-/*
-==============================================================================
-
-MOVETARGET CODE
-
-The angle of the movetarget effects standing and bowing direction, but has no effect on movement, which always heads to the next target.
-
-targetname
-must be present.  The name of this movetarget.
-
-target
-the next spot to move to.  If not present, stop here for good.
-
-pausetime
-The number of seconds to spend standing or bowing for path_stand or path_bow
-
-==============================================================================
-*/
-
-
-void() movetarget_f =
-{
-       if (!self.targetname)
-               objerror ("monster_movetarget: no targetname");
-
-       self.solid = SOLID_TRIGGER;
-       self.touch = t_movetarget;
-       setsize (self, '-8 -8 -8', '8 8 8');
-
-};
-
-/*QUAKED path_corner (0.5 0.3 0) (-8 -8 -8) (8 8 8)
-Monsters will continue walking towards the next target corner.
-*/
-void() path_corner =
-{
-       if (SUB_Inhibit ())  // new spawnflags for all entities -- iw
-               return;
-
-       if (self.noise) precache_sound(self.noise);
-       if (self.noise2) precache_sound(self.noise2);
-
-       movetarget_f ();
-};
-
-
-/*
-=============
-t_movetarget
-
-Something has bumped into a movetarget.  If it is a monster
-moving towards it, change the next destination and continue.
-==============
-*/
-void() t_movetarget =
-{
-local entity   temp;
-
-       if (other.movetarget != self)
-               return;
-
-       if (other.enemy)
-               return;         // fighting, not following a path
-
-       temp = self;
-       self = other;
-       other = temp;
-
-       if (self.classname == "monster_ogre")
-               sound_misc (self, CHAN_VOICE, "ogre/ogdrag.wav", 1, ATTN_IDLE);// play chainsaw drag sound -- sound_custom -- dumptruck_ds
-
-//dprint ("t_movetarget\n");
-       self.goalentity = self.movetarget = find (world, targetname, other.target);
-       self.ideal_yaw = vectoyaw(self.goalentity.origin - self.origin);
-       if (!self.movetarget)
-       {
-               self.pausetime = time + 999999;
-               self.th_stand ();
-               return;
-       }
-};
-
-
-
-//============================================================================
-
-/*
-=============
-range
-
-returns the range catagorization of an entity reletive to self
-0      melee range, will become hostile even if back is turned
-1      visibility and infront, or visibility and show hostile
-2      infront and show hostile
-3      only triggered by damage
-=============
-*/
-float(entity targ) range =
-{
-local vector   spot1, spot2;
-local float            r;
-       spot1 = self.origin + self.view_ofs;
-       spot2 = targ.origin + targ.view_ofs;
-
-       r = vlen (spot1 - spot2);
-       if (r < 120)
-               return RANGE_MELEE;
-       if (r < 500)
-               return RANGE_NEAR;
-       if (r < 1000)
-               return RANGE_MID;
-       return RANGE_FAR;
-};
-
-/*
-=============
-visible
-
-returns 1 if the entity is visible to self, even if not infront ()
-=============
-*/
-float (entity targ) visible =
-{
-       local vector    spot1, spot2;
-
-       spot1 = self.origin + self.view_ofs;
-       spot2 = targ.origin + targ.view_ofs;
-       traceline (spot1, spot2, TRUE, self);   // see through other monsters
-
-       if (trace_inopen && trace_inwater)
-               return FALSE;                   // sight line crossed contents
-
-       if (trace_fraction == 1)
-               return TRUE;
-       return FALSE;
-};
-
-
-/*
-=============
-infront
-
-returns 1 if the entity is in front (in sight) of self
-=============
-*/
-float(entity targ) infront =
-{
-       local vector    vec;
-       local float             dot;
-
-       makevectors (self.angles);
-       vec = normalize (targ.origin - self.origin);
-       dot = vec * v_forward;
-
-       if ( dot > 0.3)
-       {
-               return TRUE;
-       }
-       return FALSE;
-};
-
-
-//============================================================================
-
-/*
-===========
-ChangeYaw
-
-Turns towards self.ideal_yaw at self.yaw_speed
-Sets the global variable current_yaw
-Called every 0.1 sec by monsters
-============
-*/
-/*
-
-void() ChangeYaw =
-{
-       local float             ideal, move;
-
-//current_yaw = self.ideal_yaw;
-// mod down the current angle
-       current_yaw = anglemod( self.angles_y );
-       ideal = self.ideal_yaw;
-
-       if (current_yaw == ideal)
-               return;
-
-       move = ideal - current_yaw;
-       if (ideal > current_yaw)
-       {
-               if (move > 180)
-                       move = move - 360;
-       }
-       else
-       {
-               if (move < -180)
-                       move = move + 360;
-       }
-
-       if (move > 0)
-       {
-               if (move > self.yaw_speed)
-                       move = self.yaw_speed;
-       }
-       else
-       {
-               if (move < 0-self.yaw_speed )
-                       move = 0-self.yaw_speed;
-       }
-
-       current_yaw = anglemod (current_yaw + move);
-
-       self.angles_y = current_yaw;
-};
-
-*/
-
-
-//============================================================================
-
-void() HuntTarget =
-{
-       self.goalentity = self.enemy;
-       self.think = self.th_run;
-       self.ideal_yaw = vectoyaw(self.enemy.origin - self.origin);
-       self.nextthink = time + 0.1;
-       SUB_AttackFinished (1); // wait a while before first attack
-};
-
-void() SightSound =
-{
-       if !(self.spawnflags & PASSIVE_ALWAYS)
-
-       local float     rsnd;
-
-       if (self.classname == "monster_ogre")
-               sound_sight (self, CHAN_VOICE, "ogre/ogwake.wav", 1, ATTN_NORM);
-       else if (self.classname == "monster_ogre_marksman")
-               sound_sight (self, CHAN_VOICE, "ogre/ogwake.wav", 1, ATTN_NORM);
-       else if (self.classname == "monster_knight")
-               sound_sight (self, CHAN_VOICE, "knight/ksight.wav", 1, ATTN_NORM);
-       else if (self.classname == "monster_shambler")
-               sound_sight (self, CHAN_VOICE, "shambler/ssight.wav", 1, ATTN_NORM);
-       else if (self.classname == "monster_demon1")
-               sound_sight (self, CHAN_VOICE, "demon/sight2.wav", 1, ATTN_NORM);
-       else if (self.classname == "monster_wizard")
-               sound_sight (self, CHAN_VOICE, "wizard/wsight.wav", 1, ATTN_NORM);
-       else if (self.classname == "monster_zombie")
-               sound_sight (self, CHAN_VOICE, "zombie/z_idle.wav", 1, ATTN_NORM);
-       else if (self.classname == "monster_dog")
-       sound_sight (self, CHAN_VOICE, "dog/dsight.wav", 1, ATTN_NORM); //dumptruck_ds
-       else if (self.classname == "monster_hell_knight")
-               sound_sight (self, CHAN_VOICE, "hknight/sight1.wav", 1, ATTN_NORM);
-       else if (self.classname == "monster_enforcer")
-       {
-               rsnd = rint(random() * 3);
-               if (rsnd == 1)
-                       sound_sight (self, CHAN_VOICE, "enforcer/sight1.wav", 1, ATTN_NORM); //dumptruck_ds
-               else if (rsnd == 2)
-                       sound_misc (self, CHAN_VOICE, "enforcer/sight2.wav", 1, ATTN_NORM);
-               else if (rsnd == 0)
-                       sound_misc1 (self, CHAN_VOICE, "enforcer/sight3.wav", 1, ATTN_NORM);
-               else
-                       sound_misc2 (self, CHAN_VOICE, "enforcer/sight4.wav", 1, ATTN_NORM);
-       }
-       else if (self.classname == "monster_army")
-               sound_sight (self, CHAN_VOICE, "soldier/sight1.wav", 1, ATTN_NORM);
-       else if (self.classname == "monster_shalrath")
-               sound_sight (self, CHAN_VOICE, "shalrath/sight.wav", 1, ATTN_NORM);
-       else if (self.classname == "monster_oldone2")  //dumptruck_ds added Shub sighting SFX
-               sound_sight (self, CHAN_VOICE, "boss2/sight.wav", 1, ATTN_NONE);
-};
-
-void() FoundTarget =
-{
-       if (self.enemy.classname == "player")
-       {       // let other monsters see this monster for a while
-               sight_entity = self;
-               sight_entity_time = time;
-       }
-
-       self.show_hostile = time + 1;           // wake up other monsters
-
-       if !(self.spawnflags & NO_SIGHT_SOUND || self.spawnflags & PASSIVE_ALWAYS || self.spawnflags & PASSIVE_UNTIL_ATTACKED)
-       {
-               SightSound ();
-       }
-       HuntTarget ();
-
-       if (self.sight_trigger == 1) //thanks RennyC -- dumptruck_ds
-       {
-               activator = self.enemy;
-               SUB_UseAndForgetTargets ();
-       }
-};
-
-/*
-===========
-FindTarget
-
-Self is currently not attacking anything, so try to find a target
-
-Returns TRUE if an enemy was sighted
-
-When a player fires a missile, the point of impact becomes a fakeplayer so
-that monsters that see the impact will respond as if they had seen the
-player.
-
-To avoid spending too much time, only a single client (or fakeclient) is
-checked each frame.  This means multi player games will have slightly
-slower noticing monsters.
-============
-*/
-float() FindTarget =
-{
-       local entity    client;
-       local float             r;
-
-// if the first spawnflag bit is set, the monster will only wake up on
-// really seeing the player, not another monster getting angry
-
-// spawnflags & 3 is a big hack, because zombie crucified used the first
-// spawn flag prior to the ambush flag, and I forgot about it, so the second
-// spawn flag works as well
-       if (sight_entity_time >= time - 0.1 && !(self.spawnflags & 3) )
-       {
-               client = sight_entity;
-               if (client.enemy == self.enemy)
-                       return TRUE;
-       }
-       else
-       {
-               client = checkclient ();
-               if (!client)
-                       return FALSE;   // current check entity isn't in PVS
-       }
-
-       if ((self.spawnflags & PASSIVE_UNTIL_ATTACKED) || (self.spawnflags & PASSIVE_ALWAYS))
-               return FALSE;
-
-       if (client.flags & FL_NOTARGET || client.movetype == MOVETYPE_NOCLIP) // from Copper -- dumptruck_ds
-               return FALSE;
-
-       if (client.health <= 0)
-               return FALSE;
-
-       if (client.classname != "player")
-               if (client.enemy.health <= 0)
-                       return FALSE;
-
-       if (client == self.enemy)
-               return FALSE;
-
-       if (client.flags & FL_NOTARGET)
-               return FALSE;
-       if (client.items & IT_INVISIBILITY)
-               return FALSE;
-
-       r = range (client);
-       if (r == RANGE_FAR)
-               return FALSE;
-
-       if (!visible (client))
-               return FALSE;
-
-       if (r == RANGE_NEAR)
-       {
-               if (client.show_hostile < time && !infront (client))
-                       return FALSE;
-       }
-       else if (r == RANGE_MID)
-       {
-               if ( /* client.show_hostile < time || */ !infront (client))
-                       return FALSE;
-       }
-
-//
-// got one
-//
-       self.enemy = client;
-       if (self.enemy.classname != "player")
-       {
-               self.enemy = self.enemy.enemy;
-               if (self.enemy.classname != "player")
-               {
-                       self.enemy = world;
-                       return FALSE;
-               }
-       }
-
-       FoundTarget ();
-
-       return TRUE;
-};
-
-
-//=============================================================================
-
-void(float dist) ai_forward =
-{
-       // dprint("ai_forward\n");
-       walkmove (self.angles_y, dist);
-};
-
-void(float dist) ai_back =
-{
-       // dprint("ai_back\n");
-       walkmove ( (self.angles_y+180), dist);
-};
-
-
-/*
-=============
-ai_pain
-
-stagger back a bit
-=============
-*/
-void(float dist) ai_pain =
-{
-
-       ai_back (dist);
-/*
-       local float     away;
-
-       away = anglemod (vectoyaw (self.origin - self.enemy.origin)
-       + 180*(random()- 0.5) );
-
-       walkmove (away, dist);
-*/
-};
-
-/*
-=============
-ai_painforward
-
-stagger back a bit
-=============
-*/
-void(float dist) ai_painforward =
-{
-       // dprint("ai_painforward\n");
-       walkmove (self.ideal_yaw, dist);
-};
-
-/*
-=============
-ai_walk
-
-The monster is walking it's beat
-=============
-*/
-void(float dist) ai_walk =
-{
-
-       movedist = dist;
-
-       if (self.classname == "monster_dragon")
-       {
-               movetogoal (dist);
-               return;
-       }
-       // check for noticing a player
-       if (FindTarget ())
-               return;
-
-       movetogoal (dist);
-};
-
-
-/*
-=============
-ai_stand
-
-The monster is staying in one place for a while, with slight angle turns
-=============
-*/
-void() ai_stand =
-{
-       if (FindTarget ())
-               return;
-
-       if (time > self.pausetime)
-       {
-               self.th_walk ();
-               return;
-       }
-
-// change angle slightly
-
-};
-
-/*
-=============
-ai_turn
-
-don't move, but turn towards ideal_yaw
-=============
-*/
-void() ai_turn =
-{
-       if (FindTarget ())
-               return;
-
-       ChangeYaw ();
-};
-
-//=============================================================================
-
-/*
-=============
-ChooseTurn
-=============
-*/
-void(vector dest3) ChooseTurn =
-{
-       local vector    dir, newdir;
-
-       dir = self.origin - dest3;
-
-       newdir_x = trace_plane_normal_y;
-       newdir_y = 0 - trace_plane_normal_x;
-       newdir_z = 0;
-
-       if (dir * newdir > 0)
-       {
-               dir_x = 0 - trace_plane_normal_y;
-               dir_y = trace_plane_normal_x;
-       }
-       else
-       {
-               dir_x = trace_plane_normal_y;
-               dir_y = 0 - trace_plane_normal_x;
-       }
-
-       dir_z = 0;
-       self.ideal_yaw = vectoyaw(dir);
-};
-
-/*
-============
-FacingIdeal
-
-============
-*/
-float() FacingIdeal =
-{
-       local   float   delta;
-
-       delta = anglemod(self.angles_y - self.ideal_yaw);
-       if (delta > 45 && delta < 315)
-               return FALSE;
-       return TRUE;
-};
-
-
-//=============================================================================
-
-float()        WizardCheckAttack;
-float()        DogCheckAttack;
-
-float() CheckAnyAttack =
-{
-       if (cutscene)  // Drake devkit -- dumptruck_ds
-                       if (self.enemy.classname == "camera")
-                                       return FALSE;   // Don't attack the camera (player)!
-
-       if (!enemy_vis)
-               return FALSE;
-       if (self.classname == "monster_army")
-               return SoldierCheckAttack ();
-       if ((self.classname == "monster_ogre") || (self.classname == "monster_ogre_marksman"))
-               return OgreCheckAttack ();
-       if (self.classname == "monster_shambler")
-               return ShamCheckAttack ();
-       if (self.classname == "monster_demon1")
-               return DemonCheckAttack ();
-       if (self.classname == "monster_dog")
-               return DogCheckAttack ();
-       if (self.classname == "monster_wizard")
-               return WizardCheckAttack ();
-       return CheckAttack ();
-};
-
-
-/*
-=============
-ai_run_melee
-
-Turn and close until within an angle to launch a melee attack
-=============
-*/
-void() ai_run_melee =
-{
-       self.ideal_yaw = enemy_yaw;
-       ChangeYaw ();
-
-       if (FacingIdeal())
-       {
-               self.th_melee ();
-               self.attack_state = AS_STRAIGHT;
-       }
-};
-
-
-/*
-=============
-ai_run_missile
-
-Turn in place until within an angle to launch a missile attack
-=============
-*/
-void() ai_run_missile =
-{
-       self.ideal_yaw = enemy_yaw;
-       // dprint("ai_run_missile GO\n");
-       ChangeYaw ();
-       if (FacingIdeal())
-       {
-               if (self.spawnflags & I_AM_TURRET)
-                       {
-                               self.th_turret();
-                               // dprint("th_turret...\n");
-                       }
-               else
-                       {
-                               self.th_missile ();
-                               // dprint("th_missile\n");
-                       }
-                       self.attack_state = AS_STRAIGHT;
-       }
-};
-
-
-/*
-=============
-ai_run_slide
-
-Strafe sideways, but stay at aproximately the same range
-=============
-*/
-void() ai_run_slide =
-{
-       local float     ofs;
-
-       self.ideal_yaw = enemy_yaw;
-       ChangeYaw ();
-       if (self.lefty)
-               ofs = 90;
-       else
-               ofs = -90;
-
-       if (walkmove (self.ideal_yaw + ofs, movedist))
-               return;
-
-       self.lefty = 1 - self.lefty;
-
-       walkmove (self.ideal_yaw - ofs, movedist);
-};
-
-
-/*
-=============
-ai_run
-
-The monster has an enemy it is trying to kill
-=============
-*/
-void(float dist) ai_run =
-{
-       // dprint("ai_run\n");
-       movedist = dist;
-// see if the enemy is dead
-       if ((self.enemy.health <= 0) || (self.spawnflags & PASSIVE_ALWAYS))
-       {
-               self.enemy = world;
-       // FIXME: look all around for other targets
-               if (self.oldenemy.health > 0)
-               {
-                       self.enemy = self.oldenemy;
-                       HuntTarget ();
-               }
-               else
-               {
-                       if (self.spawnflags & I_AM_TURRET)
-                               {
-                                       self.th_stand ();
-                               }
-                       else if (self.movetarget)
-                               self.th_walk ();
-                       else
-                               self.th_stand ();
-                       return;
-               }
-       }
-
-       self.show_hostile = time + 1;           // wake up other monsters
-
-// check knowledge of enemy
-       enemy_vis = visible(self.enemy);
-       if (enemy_vis)
-               self.search_time = time + 5;
-
-// look for other coop players
-       if (coop && self.search_time < time)
-       {
-               if (FindTarget ())
-                       return;
-       }
-
-       enemy_infront = infront(self.enemy);
-       enemy_range = range(self.enemy);
-       enemy_yaw = vectoyaw(self.enemy.origin - self.origin);
-
-       if (self.spawnflags & I_AM_TURRET)
-               {
-                       ai_face ();
-               }
-
-       // if ((self.attack_state == AS_MISSILE) || !(self.spawnflags & I_AM_TURRET))
-       if (self.attack_state == AS_MISSILE)
-       {
-               // dprint ("ai_run_missile... from ai_run\n");
-               ai_run_missile ();
-               return;
-       }
-       // if ((self.attack_state == AS_MELEE) || !(self.spawnflags & I_AM_TURRET))
-       if (self.attack_state == AS_MELEE)
-       {
-//dprint ("ai_run_melee\n");
-               ai_run_melee ();
-               return;
-       }
-
-       if (CheckAnyAttack ())
-               return;                                 // beginning an attack
-
-       // if ((self.attack_state == AS_SLIDING) || !(self.spawnflags & I_AM_TURRET))
-       if (self.attack_state == AS_SLIDING)
-       {
-               ai_run_slide ();
-               return;
-       }
-       // part of monster face from TheSolipsist
-       // urged to change positions
-  if (time < self.t_length) // if orientation is forced
-  {
-    ChangeYaw();
-
-    if (walkmove(self.ideal_yaw, dist))
-      return;
-
-    self.ideal_yaw += 30; // dodge left
-    ChangeYaw();
-
-    if (walkmove(self.ideal_yaw, dist))
-      return;
-
-    self.ideal_yaw -= 60; // dodge right
-    ChangeYaw();
-    ChangeYaw();
-
-    if (walkmove(self.ideal_yaw, dist))
-      return;
-
-    self.ideal_yaw += 30; // give up
-    ChangeYaw();
-    self.touch_time = self.touch_time - 0.1; // lose patience
-
-    return;
-  }
-
-if !(self.spawnflags & I_AM_TURRET) // keeps monster from moving to player - dumptruck_ds
-// head straight in
-       movetogoal (dist);              // done in C code...
-};
-/*
-=============
-visibleToOther
-
-returns 1 if the entity is visible to other, even if not infront ()
-=============
-*/
-float (entity targ) visibleToOther =
-{
-  local vector spot1, spot2;
-
-  spot1 = other.origin + other.view_ofs;
-  spot2 = targ.origin + targ.view_ofs;
-  traceline(spot1, spot2, TRUE, other); // see through other monsters
-
-  if (trace_inopen && trace_inwater)
-    return FALSE; // sight line crossed contents
-
-  if (trace_fraction == 1)
-    return TRUE;
-
-  return FALSE;
-};
-
-//----------------------------------------------------------------------------

diff --git a/qc-server/buttons.qc b/qc-server/buttons.qc
deleted file mode 100644
index bc34e53..0000000
--- a/qc-server/buttons.qc
+++ /dev/null
@@ -1,205 +0,0 @@
-// button and multiple button
-
-void() button_wait;
-void() button_return;
-
-void() button_wait =
-{
-       self.state = STATE_TOP;
-       self.nextthink = self.ltime + self.wait;
-       self.think = button_return;
-       activator = self.enemy;
-       self.frame = 1;                 // use alternate textures
-
-       if (self.estate != STATE_ACTIVE)
-               return;
-       
-       SUB_UseTargets();
-       
-};
-
-void() button_done =
-{
-       self.state = STATE_BOTTOM;
-};
-
-void() button_return =
-{
-       if (self.estate != STATE_ACTIVE) return;
-
-       self.state = STATE_DOWN;
-       SUB_CalcMove (self.pos1, self.speed, button_done);
-       self.frame = 0;                 // use normal textures
-       if (self.health)
-               self.takedamage = DAMAGE_YES;   // can be shot again
-};
-
-
-void() button_blocked =
-{      // do nothing, just don't ome all the way back out
-};
-
-
-void() button_fire =
-{
-       if (self.estate != STATE_ACTIVE) return;
-
-       if (self.state == STATE_UP || self.state == STATE_TOP)
-               return;
-
-       sound (self, CHAN_VOICE, self.noise, 1, ATTN_NORM);
-
-       self.state = STATE_UP;
-       SUB_CalcMove (self.pos2, self.speed, button_wait);
-};
-
-
-void() button_use =
-{
-       self.enemy = activator;
-       button_fire ();
-};
-
-void() button_touch =
-{
-       if (other.classname != "player")
-               return;
-       self.enemy = other;
-       button_fire ();
-};
-
-void() button_killed =
-{
-       if (self.estate != STATE_ACTIVE) return;
-
-       self.enemy = damage_attacker;
-       self.health = self.max_health;
-       self.takedamage = DAMAGE_NO;    // wil be reset upon return
-       button_fire ();
-};
-
-
-
-// adapted from Copper, thanks Lunaran
-void(entity b) button_lock =
-{
-       entity oself;
-
-       if (b.estate == STATE_INACTIVE)
-               return;
-
-       oself = self;
-       self = b;
-
-       if (self.state == STATE_UP || self.state == STATE_TOP)
-               self.prevstate = STATE_TOP;
-       else 
-               self.prevstate = STATE_BOTTOM;
-
-       if (self.max_health)
-               self.takedamage = DAMAGE_NO;
-       self.state = STATE_UP;
-       SUB_CalcMove (self.pos2, self.speed, button_wait);
-       self.estate = STATE_INACTIVE;
-
-       self = oself;
-}
-
-void(entity b, float dontresetstate) button_unlock =
-{
-       entity oself;
-
-       if (b.estate == STATE_ACTIVE)
-               return;
-
-       oself = self;
-       self = b;
-
-       if (!dontresetstate || self.wait != -1 || self.prevstate == STATE_BOTTOM) {
-               if (self.max_health)
-               {
-                       self.takedamage = DAMAGE_YES;
-                       self.health = self.max_health;
-               }
-               self.frame = 0;                 // use normal textures
-               self.state = STATE_DOWN;
-               SUB_CalcMove (self.pos1, self.speed, button_done);
-       }
-
-       self.estate = STATE_ACTIVE;
-
-       self = oself;
-}
-
-
-/*QUAKED func_button (0 .5 .8) ? X X X X X X X X NOT_ON_EASY NOT_ON_NORMAL NOT_ON_HARD_OR_NIGHTMARE NOT_IN_DEATHMATCH NOT_IN_COOP NOT_IN_SINGLEPLAYER X NOT_ON_HARD_ONLY NOT_ON_NIGHTMARE_ONLY
-When a button is touched, it moves some distance in the direction of it's angle, triggers all of it's targets, waits some time, then returns to it's original position where it can be triggered again.
-
-"angle"        determines the opening direction
-"target"       all entities with a matching targetname will be used
-"speed"        override the default 40 speed
-"wait" override the default 1 second wait (-1 = never return)
-"lip"  override the default 4 pixel lip remaining at end of move
-"health"       if set, the button must be killed instead of touched
-"sounds"
-0) steam metal
-1) wooden clunk
-2) metallic click
-3) in-out
-*/
-void() func_button =
-{
-       if (SUB_Inhibit ())  // new spawnflags for all entities -- iw
-               return;
-
-       if (self.sounds == 0)
-       {
-               precache_sound ("buttons/airbut1.wav");
-               self.noise = "buttons/airbut1.wav";
-       }
-       if (self.sounds == 1)
-       {
-               precache_sound ("buttons/switch21.wav");
-               self.noise = "buttons/switch21.wav";
-       }
-       if (self.sounds == 2)
-       {
-               precache_sound ("buttons/switch02.wav");
-               self.noise = "buttons/switch02.wav";
-       }
-       if (self.sounds == 3)
-       {
-               precache_sound ("buttons/switch04.wav");
-               self.noise = "buttons/switch04.wav";
-       }
-
-       SetMovedir ();
-
-       self.movetype = MOVETYPE_PUSH;
-       self.solid = SOLID_BSP;
-       setmodel (self, self.model);
-
-       self.blocked = button_blocked;
-       self.use = button_use;
-
-       if (self.health)
-       {
-               self.max_health = self.health;
-               self.th_die = button_killed;
-               self.takedamage = DAMAGE_YES;
-       }
-       else
-               self.touch = button_touch;
-
-       if (!self.speed)
-               self.speed = 40;
-       if (!self.wait)
-               self.wait = 1;
-       if (!self.lip)
-               self.lip = 4;
-
-       self.state = STATE_BOTTOM;
-
-       self.pos1 = self.origin;
-       self.pos2 = self.pos1 + self.movedir*(fabs(self.movedir*self.size) - self.lip);
-};

diff --git a/qc-server/client.qc b/qc-server/client.qc
deleted file mode 100644
index cb97b95..0000000
--- a/qc-server/client.qc
+++ /dev/null
@@ -1,1447 +0,0 @@
-
-// prototypes
-void () W_WeaponFrame;
-void() W_SetCurrentAmmo;
-void(entity attacker, float damage) player_pain;
-void() player_stand1;
-//void (vector org) spawn_tfog; //moved to items.qc -- dumptruck_ds
-void (vector org, entity death_owner) spawn_tdeath;
-
-
-float  modelindex_eyes, modelindex_player;
-void() SUB_CheckWaiting; // in triggers.qc
-
-
-
-
-
-void() SetChangeParms =
-{
-       if (self.health <= 0)
-       {
-               SetNewParms ();
-               return;
-       }
-
-// remove items
-       self.items = self.items - (self.items &
-       (IT_KEY1 | IT_KEY2 | IT_INVISIBILITY | IT_INVULNERABILITY | IT_SUIT | IT_QUAD) );
-
-// cap super health
-       if (self.health > 100)
-               self.health = 100;
-       if (self.health < 50)
-               self.health = 50;
-       parm1 = self.items;
-       parm2 = self.health;
-       parm3 = self.armorvalue;
-       if (self.ammo_shells < 25)
-               parm4 = 25;
-       else
-               parm4 = self.ammo_shells;
-       parm5 = self.ammo_nails;
-       parm6 = self.ammo_rockets;
-       parm7 = self.ammo_cells;
-       parm8 = self.weapon;
-       parm9 = self.armortype * 100;
-};
-
-void() SetNewParms =
-{
-       parm2 = 100;  // self.health
-       parm3 = 0;    // self.armorvalue
-       parm5 = 0;    // self.ammo_nails
-       parm6 = 0;    // self.ammo_rockets
-       parm7 = 0;    // self.ammo_cells
-       parm9 = 0;    // self.armortype * 100
-
-// "reset_items 2" makes the player start with only the axe -- iw
-       if (world.reset_items == 2)
-       {
-               parm1 = IT_AXE;  // self.items
-               parm4 = 0;       // self.ammo_shells
-               parm8 = IT_AXE;  // self.weapon
-       }
-       else
-       {
-               parm1 = IT_AXE | IT_SHOTGUN;  // self.items
-               parm4 = 25;                   // self.ammo_shells
-               parm8 = IT_SHOTGUN;           // self.weapon
-       }
-};
-
-void() DecodeLevelParms =
-{
-// Reset the player's inventory if they returned to the start map with
-// a rune, or if the mapper set the "reset_items" field of worldspawn to
-// a non-zero value.  (The old "reset_items" check, which this replaces,
-// had a comment from dumptruck_ds thanking Spike.)  -- iw
-//
-       if ((serverflags != 0 && world.model == "maps/start.bsp") ||
-                       world.reset_items != 0)
-       {
-               SetNewParms ();
-       }
-
-       self.items = parm1;
-       self.health = parm2;
-       self.armorvalue = parm3;
-       self.ammo_shells = parm4;
-       self.ammo_nails = parm5;
-       self.ammo_rockets = parm6;
-       self.ammo_cells = parm7;
-       self.weapon = parm8;
-       self.armortype = parm9 * 0.01;
-};
-
-void(entity client, string savename) autosave =
-{
-       //autosavename = savename;
-       stuffcmd(client, "echo Autosaving...; wait; save ");
-       stuffcmd(client, savename);
-       stuffcmd(client, "\n");
-}
-
-/*
-=============================================================================
-
-                               PLAYER GAME EDGE FUNCTIONS
-
-=============================================================================
-*/
-
-void() set_suicide_frame;
-
-// called by ClientKill and DeadThink
-void() respawn =
-{
-       if (coop)
-       {
-               // make a copy of the dead body for appearances sake
-               CopyToBodyQue (self);
-               // get the spawn parms as they were at level start
-               setspawnparms (self);
-               // respawn
-               PutClientInServer ();
-       }
-       else if (deathmatch)
-       {
-               // make a copy of the dead body for appearances sake
-               CopyToBodyQue (self);
-               // set default spawn parms
-               SetNewParms ();
-               // respawn
-               PutClientInServer ();
-       }
-       else
-       {       // restart the entire server
-               localcmd ("restart\n");
-       }
-};
-
-
-/*
-============
-ClientKill
-
-Player entered the suicide command
-============
-*/
-void() ClientKill =
-
-{
-       // 1998-07-27 Suicide during intermission fix by Zhenga  start
-       if ((intermission_running)&&((coop)||(deathmatch)))  // not allowed during intermission
-               return;
-// 1998-07-27 Suicide during intermission fix by Zhenga  end
-       bprint (self.netname);
-       bprint (" suicides\n");
-       set_suicide_frame ();
-       self.modelindex = modelindex_player;
-       self.frags = self.frags - 2;    // extra penalty
-       respawn ();
-};
-
-float(vector v) CheckSpawnPoint =
-{
-       return FALSE;
-};
-
-/*
-============
-SelectSpawnPoint
-
-Returns the entity to spawn at
-============
-*/
-entity() SelectSpawnPoint =
-{
-       local   entity spot;
-       local   entity thing;
-       local   float  pcount;
-
-// testinfo_player_start is only found in regioned levels
-       spot = find (world, classname, "testplayerstart");
-       if (spot)
-               return spot;
-
-// choose a info_player_deathmatch point
-       if (coop)
-       {
-               lastspawn = find(lastspawn, classname, "info_player_coop");
-               if (lastspawn == world)
-                       lastspawn = find (lastspawn, classname, "info_player_start");
-               if (lastspawn != world)
-                       return lastspawn;
-       }
-       else if (deathmatch)
-       {
-               spot = lastspawn;
-               while (1)
-               {
-                       spot = find(spot, classname, "info_player_deathmatch");
-                       if (spot != world)
-                       {
-                               if (spot == lastspawn)
-                                       return lastspawn;
-                               pcount = 0;
-                               thing = findradius(spot.origin, 32);
-                               while(thing)
-                               {
-                                       if (thing.classname == "player")
-                                               pcount = pcount + 1;
-                                       thing = thing.chain;
-                               }
-                               if (pcount == 0)
-                               {
-                                       lastspawn = spot;
-                                       return spot;
-                               }
-                       }
-               }
-       }
-
-       if (serverflags)
-       {       // return with a rune to start
-               spot = find (world, classname, "info_player_start2");
-               if (spot)
-                       return spot;
-       }
-
-       spot = find (world, classname, "info_player_start");
-       if (!spot)
-               error ("PutClientInServer: no info_player_start on level");
-
-       return spot;
-};
-
-/*
-===========
-PutClientInServer
-
-called each time a player is spawned
-============
-*/
-void() DecodeLevelParms;
-void() PlayerDie;
-void() monster_touch;          // 1998-09-16 Sliding/not-jumping on monsters/boxes/players fix by Maddes/Kryten
-
-void() PutClientInServer =
-{
-       local   entity spot;
-
-       spot = SelectSpawnPoint ();
-
-       self.classname = "player";
-       self.health = 100;
-       self.takedamage = DAMAGE_AIM;
-       self.solid = SOLID_SLIDEBOX;
-       self.movetype = MOVETYPE_WALK;
-       self.show_hostile = 0;
-       self.max_health = 100;
-       self.flags = FL_CLIENT;
-       self.air_finished = time + 12;
-       self.dmg = 2;                   // initial water damage
-       self.super_damage_finished = 0;
-       self.radsuit_finished = 0;
-       self.invisible_finished = 0;
-       self.invincible_finished = 0;
-       self.effects = 0;
-       self.invincible_time = 0;
-       self.deathtype = "";
-       self.gravity = 0;
-       self.wantedgravity = 0;
-       self.onladder = 0;
-       self.customkeys = 0;  // support for item_key_custom -- iw
-
-       // Setup cutscene stuff.  Legacy code from Zerstorer. --dumptruck_ds
-           self.script_count = 2;
-           self.script_delay = 1;
-           self.script_time  = 0;
-
-
-       DecodeLevelParms ();
-
-       W_SetCurrentAmmo ();
-
-       self.attack_finished = time;
-       self.th_pain = player_pain;
-       self.th_die = PlayerDie;
-       self.touch = monster_touch;     // 1998-09-16 Sliding/not-jumping on monsters/boxes/players fix by Maddes/Kryten
-       self.deadflag = DEAD_NO;
-// paustime is set by teleporters to keep the player from moving a while
-       self.pausetime = 0;
-
-//     spot = SelectSpawnPoint ();
-
-       self.origin = spot.origin + '0 0 1';
-       self.angles = spot.angles;
-       self.fixangle = TRUE;           // turn this way immediately
-
-       // fog control.
-       // Looks if there's any fog values set at the current spawn point. If not, looks for those in worldspawn instead
-       if (spot.fog_density)
-               fog_save(self, spot.fog_density, spot.fog_color);
-       else if (world.fog_density)
-               fog_save(self, world.fog_density, world.fog_color);
-
-       if (spot.skyfog_density)
-               skyfog_save(self, spot.skyfog_density);
-       else if (world.skyfog_density)
-               skyfog_save(self, world.skyfog_density);
-
-       cleanUpClientStuff = 2; // decreased on subsequent frames, used to startup some fog-related stuff
-
-// oh, this is a hack!
-       setmodel (self, "progs/eyes.mdl");
-       modelindex_eyes = self.modelindex;
-
-       setmodel (self, "progs/s_null.spr");     // Drake -- dumptruck_ds
-       // setmodel (self, "progs/null_256.spr");     // Drake -- dumptruck_ds
-       mindex_inviso = self.modelindex;
-
-       setmodel (self, "progs/player.mdl");
-       modelindex_player = self.modelindex;
-
-       setsize (self, VEC_HULL_MIN, VEC_HULL_MAX);
-
-       self.view_ofs = '0 0 22';
-// Mod - Xian (May.20.97)
-// Bug where player would have velocity from their last kill
-       self.velocity = '0 0 0';        // 1998-07-21 Player moves after respawn fix by Xian
-
-       player_stand1 ();
-
-       if (deathmatch || coop)
-       {
-               makevectors(self.angles);
-               spawn_tfog (self.origin + v_forward*20);
-       }
-
-       spawn_tdeath (self.origin, self);
-};
-
-
-/*
-=============================================================================
-
-                               QUAKED FUNCTIONS
-
-=============================================================================
-*/
-
-
-/*QUAKED info_player_start (1 0 0) (-16 -16 -24) (16 16 24) X X X X X X X X NOT_ON_EASY NOT_ON_NORMAL NOT_ON_HARD_OR_NIGHTMARE NOT_IN_DEATHMATCH NOT_IN_COOP NOT_IN_SINGLEPLAYER X NOT_ON_HARD_ONLY NOT_ON_NIGHTMARE_ONLY
-{
-model ("progs/player.mdl");
-}
-The normal starting point for a level.
-*/
-void() info_player_start =
-{
-       if (SUB_Inhibit ())  // new spawnflags for all entities -- iw
-               return;
-};
-
-
-/*QUAKED info_player_start2 (1 0 0) (-16 -16 -24) (16 16 24) X X X X X X X X NOT_ON_EASY NOT_ON_NORMAL NOT_ON_HARD_OR_NIGHTMARE NOT_IN_DEATHMATCH NOT_IN_COOP NOT_IN_SINGLEPLAYER X NOT_ON_HARD_ONLY NOT_ON_NIGHTMARE_ONLY
-{
-model ("progs/player.mdl");
-}
-Only used on start map for the return point from an episode.
-*/
-void() info_player_start2 =
-{
-       if (SUB_Inhibit ())  // new spawnflags for all entities -- iw
-               return;
-};
-
-
-/*
-saved out by quaked in region mode
-*/
-void() testplayerstart =
-{
-};
-
-/*QUAKED info_player_deathmatch (1 0 1) (-16 -16 -24) (16 16 24) X X X X X X X X NOT_ON_EASY NOT_ON_NORMAL NOT_ON_HARD_OR_NIGHTMARE NOT_IN_DEATHMATCH NOT_IN_COOP NOT_IN_SINGLEPLAYER X NOT_ON_HARD_ONLY NOT_ON_NIGHTMARE_ONLY
-{
-model ("progs/player.mdl");
-}
-potential spawning position for deathmatch games
-*/
-void() info_player_deathmatch =
-{
-       if (SUB_Inhibit ())  // new spawnflags for all entities -- iw
-               return;
-};
-
-/*QUAKED info_player_coop (1 0 1) (-16 -16 -24) (16 16 24) X X X X X X X X NOT_ON_EASY NOT_ON_NORMAL NOT_ON_HARD_OR_NIGHTMARE NOT_IN_DEATHMATCH NOT_IN_COOP NOT_IN_SINGLEPLAYER X NOT_ON_HARD_ONLY NOT_ON_NIGHTMARE_ONLY
-{
-model ("progs/player.mdl");
-}
-potential spawning position for coop games
-*/
-void() info_player_coop =
-{
-       if (SUB_Inhibit ())  // new spawnflags for all entities -- iw
-               return;
-};
-
-/*QUAKED info_monster_spawnpoint (1 0 1) (-16 -16 -24) (16 16 24) X X X X X X X X NOT_ON_EASY NOT_ON_NORMAL NOT_ON_HARD_OR_NIGHTMARE NOT_IN_DEATHMATCH NOT_IN_COOP NOT_IN_SINGLEPLAYER X NOT_ON_HARD_ONLY NOT_ON_NIGHTMARE_ONLY
-{
-model ("progs/teleport.mdl");
-}
- spawning position for func_monster_spawner
-*/
-void() info_monster_spawnpoint =
-{
-       if (SUB_Inhibit ())  // new spawnflags for all entities -- iw
-               return;
-};
-
-/*
-===============================================================================
-
-RULES
-
-===============================================================================
-*/
-
-/*
-go to the next level for deathmatch
-only called if a time or frag limit has expired
-*/
-void() NextLevel =
-{
-       local entity o;
-
-       if (mapname == "start")
-       {
-               if (!cvar("registered"))
-               {
-                       mapname = "e1m1";
-               }
-               else if (!(serverflags & 1))
-               {
-                       mapname = "e1m1";
-                       serverflags = serverflags | 1;
-               }
-               else if (!(serverflags & 2))
-               {
-                       mapname = "e2m1";
-                       serverflags = serverflags | 2;
-               }
-               else if (!(serverflags & 4))
-               {
-                       mapname = "e3m1";
-                       serverflags = serverflags | 4;
-               }
-               else if (!(serverflags & 8))
-               {
-                       mapname = "e4m1";
-                       serverflags = serverflags - 7;
-               }
-
-               o = spawn();
-               o.map = mapname;
-       }
-       else
-       {
-               // find a trigger changelevel
-               o = find(world, classname, "trigger_changelevel");
-
-               // go back to start if no trigger_changelevel
-               if (!o)
-               {
-                       mapname = "start";
-                       o = spawn();
-                       o.map = mapname;
-               }
-       }
-
-       nextmap = o.map;
-       gameover = TRUE;
-
-       if (o.nextthink < time)
-       {
-               o.think = execute_changelevel;
-               o.nextthink = time + 0.1;
-       }
-};
-
-/*
-============
-CheckRules
-
-Exit deathmatch games upon conditions
-============
-*/
-void() CheckRules =
-{
-       local   float           timelimit;
-       local   float           fraglimit;
-
-       if (gameover)   // someone else quit the game already
-               return;
-
-       timelimit = cvar("timelimit") * 60;
-       fraglimit = cvar("fraglimit");
-
-if (deathmatch && timelimit && time >= timelimit)      // 1998-07-27 Timelimit/Fraglimit fix by Maddes
-       {
-               NextLevel ();
-               return;
-       }
-
-if (deathmatch && fraglimit && self.frags >= fraglimit)        // 1998-07-27 Timelimit/Fraglimit fix by Maddes
-       {
-               NextLevel ();
-               return;
-       }
-};
-
-//============================================================================
-
-void() PlayerDeathThink =
-{
-       local float     forward;
-
-       if ((self.flags & FL_ONGROUND))
-       {
-               forward = vlen (self.velocity);
-               forward = forward - 20;
-               if (forward <= 0)
-                       self.velocity = '0 0 0';
-               else
-                       self.velocity = forward * normalize(self.velocity);
-       }
-
-// wait for all buttons released
-       if (self.deadflag == DEAD_DEAD)
-       {
-               if (self.button2 || self.button1 || self.button0)
-                       return;
-               self.deadflag = DEAD_RESPAWNABLE;
-               return;
-       }
-
-// wait for any button down
-       if (!self.button2 && !self.button1 && !self.button0)
-               return;
-
-       self.button0 = 0;
-       self.button1 = 0;
-       self.button2 = 0;
-       respawn();
-};
-
-/*
-===========
-PlayerClimb
-============
-*/
-void() PlayerClimb = //johnfitz
-{
-       self.velocity = '0 0 160';
-}
-
-
-void() PlayerJump =
-{
-
-       if (self.flags & FL_WATERJUMP)
-               return;
-
-       if (self.waterlevel >= 2)
-       {
-               if (self.watertype == CONTENT_WATER)
-                       self.velocity_z = 100;
-               else if (self.watertype == CONTENT_SLIME)
-                       self.velocity_z = 80;
-               else
-                       self.velocity_z = 50;
-
-// play swiming sound
-               if (self.swim_flag < time)
-               {
-                       self.swim_flag = time + 1;
-                       if (random() < 0.5)
-                               sound (self, CHAN_BODY, "misc/water1.wav", 1, ATTN_NORM);
-                       else
-                               sound (self, CHAN_BODY, "misc/water2.wav", 1, ATTN_NORM);
-               }
-
-               return;
-       }
-
-       // refactoring from Copper -- dumptruck_ds
-       if (self.movetype != MOVETYPE_NOCLIP)
-       {
-               if (!(self.flags & FL_ONGROUND)) return;
-               if ( !(self.flags & FL_JUMPRELEASED) ) return;          // don't pogo stick
-               // player jumping sound
-               sound (self, CHAN_BODY, "player/plyrjmp8.wav", 1, ATTN_NORM);   // h00rt
-       }
-
-       // if (!(self.flags & FL_ONGROUND))
-       //      return;
-       //
-       // if ( !(self.flags & FL_JUMPRELEASED) )
-       //      return;         // don't pogo stick
-       // refactoring from Copper -- dumptruck_ds
-       // self.flags = not(self.flags, FL_JUMPRELEASED | FL_ONGROUND); // don't stairwalk
-
-       self.flags = self.flags - (self.flags & FL_JUMPRELEASED);
-
-       self.flags = self.flags - FL_ONGROUND;  // don't stairwalk
-
-       self.button2 = 0;
-       // sound (self, CHAN_AUTO, "player/plyrjmp8.wav", 1, ATTN_NORM);
-       self.velocity_z = self.velocity_z + 270;
-};
-
-
-/*
-===========
-WaterMove
-
-============
-*/
-.float dmgtime;
-
-void() WaterMove =
-{
-//dprint (ftos(self.waterlevel));
-       // if (self.movetype == MOVETYPE_NOCLIP)
-       //      return;
-       //from Copper -- dumptruck_ds
-       if (self.movetype == MOVETYPE_NOCLIP)
-       {
-               self.air_finished = time + 120;
-               return;
-       }
-
-       if (self.health < 0)
-               return;
-
-       if (self.waterlevel != 3)
-       {
-               if (self.air_finished < time)
-                       sound (self, CHAN_VOICE, "player/gasp2.wav", 1, ATTN_NORM);
-               else if (self.air_finished < time + 9)
-                       sound (self, CHAN_VOICE, "player/gasp1.wav", 1, ATTN_NORM);
-               self.air_finished = time + 12;
-               self.dmg = 2;
-       }
-       else if (self.air_finished < time)
-       {       // drown!
-               if (self.pain_finished < time)
-               {
-                       self.dmg = self.dmg + 2;
-                       if (self.dmg > 15)
-                               self.dmg = 10;
-                       self.deathtype = "drowning";
-                       T_Damage (self, world, world, self.dmg);
-                       self.deathtype = "";
-                       self.pain_finished = time + 1;
-               }
-       }
-
-       if (!self.waterlevel)
-       {
-               if (self.flags & FL_INWATER)
-               {
-                       // play leave water sound
-                       sound (self, CHAN_BODY, "misc/outwater.wav", 1, ATTN_NORM);
-                       self.flags = self.flags - FL_INWATER;
-               }
-               return;
-       }
-
-       if (self.watertype == CONTENT_LAVA)
-       {       // do damage
-               if (self.dmgtime < time)
-               {
-                       if (self.radsuit_finished > time)
-                               self.dmgtime = time + 1;
-                       else
-                               self.dmgtime = time + 0.2;
-
-                       self.deathtype = "lava";
-                       T_Damage (self, world, world, 10*self.waterlevel);
-                       self.deathtype = "";
-               }
-       }
-       else if (self.watertype == CONTENT_SLIME)
-       {       // do damage
-               if (self.dmgtime < time && self.radsuit_finished < time)
-               {
-                       self.dmgtime = time + 1;
-                       self.deathtype = "slime";
-                       T_Damage (self, world, world, 4*self.waterlevel);
-                       self.deathtype = "";
-               }
-       }
-
-       if ( !(self.flags & FL_INWATER) )
-       {
-
-// player enter water sound
-
-               if (self.watertype == CONTENT_LAVA)
-                       sound (self, CHAN_BODY, "player/inlava.wav", 1, ATTN_NORM);
-               if (self.watertype == CONTENT_WATER)
-                       sound (self, CHAN_BODY, "player/inh2o.wav", 1, ATTN_NORM);
-               if (self.watertype == CONTENT_SLIME)
-                       sound (self, CHAN_BODY, "player/slimbrn2.wav", 1, ATTN_NORM);
-
-               self.flags = self.flags + FL_INWATER;
-               self.dmgtime = 0;
-       }
-
-       if (! (self.flags & FL_WATERJUMP) )
-               self.velocity = self.velocity - 0.8*self.waterlevel*frametime*self.velocity;
-};
-
-void() CheckWaterJump =
-{
-       if (self.movetype == MOVETYPE_NOCLIP) // from Copper -- dumptruck_ds
-               return;
-
-       local vector start, end;
-
-// check for a jump-out-of-water
-       makevectors (self.angles);
-       start = self.origin;
-       start_z = start_z + 8;
-       v_forward_z = 0;
-       normalize(v_forward);
-       end = start + v_forward*24;
-       traceline (start, end, TRUE, self);
-       if (trace_fraction < 1)
-       {       // solid at waist
-               start_z = start_z + self.maxs_z - 8;
-               end = start + v_forward*24;
-               self.movedir = trace_plane_normal * -50;
-               traceline (start, end, TRUE, self);
-               if (trace_fraction == 1)
-               {       // open at eye level
-                       self.flags = self.flags | FL_WATERJUMP;
-                       self.velocity_z = 225;
-                       self.flags = self.flags - (self.flags & FL_JUMPRELEASED);
-                       self.teleport_time = time + 2;  // safety net
-                       return;
-               }
-       }
-};
-
-
-/*
-================
-PlayerPreThink
-
-Called every frame before physics are run
-================
-*/
-void() PlayerPreThink =
-{
-       local float do_ladder_physics;
-
-       if (intermission_running)
-       {
-               IntermissionThink ();   // otherwise a button could be missed between
-               return;                                 // the think tics
-       }
-
-       if (self.view_ofs == '0 0 0')
-               {
-                       Cutscene_Think ();      // Check for cutscene stuff.
-                       return;        // intermission or finale
-       }
-
-       // note that this code block is here, before the tests which check
-       // whether the player is dead, so that the player's gravity will be
-       // correctly updated even if they e.g. fell off a ladder because
-       // they died -- iw
-       if (self.onladder)
-       {
-               do_ladder_physics = TRUE;
-               self.gravity = 0.0000001;       // not zero, because zero means "default"
-               self.onladder = 0;
-       }
-       else
-       {
-               do_ladder_physics = FALSE;
-               self.gravity = self.wantedgravity;
-       }
-
-       // If just spawned in, try to recover previous fog values from own client entity, if any
-       if (cleanUpClientStuff)
-               fog_setFromEnt(self, self);
-
-       makevectors (self.v_angle);             // is this still used
-
-       CheckRules ();
-       WaterMove ();
-
-       if (self.waterlevel == 2)
-               CheckWaterJump ();
-
-       if (self.deadflag >= DEAD_DEAD)
-       {
-               PlayerDeathThink ();
-               return;
-       }
-
-       if (self.deadflag == DEAD_DYING)
-               return; // dying, so do nothing
-
-//johnfitz ladder conditions //added from Rubicon2 client.qc -- dumptruck_ds
-if (do_ladder_physics)
-{
-       if (self.button2)
-       {
-               PlayerClimb ();
-
-               /* no ladder footsteps for now
-               if (time > self.ladder_step_finished) {
-                       r = random();
-                       if (r > 0.66)
-                               sound (self, CHAN_BODY, "ladder/metal1.wav", 0.5, ATTN_NORM);
-                       else if (r > 0.33)
-                               sound (self, CHAN_BODY, "ladder/metal2.wav", 0.5, ATTN_NORM);
-                       else
-                               sound (self, CHAN_BODY, "ladder/metal3.wav", 0.5, ATTN_NORM);
-                       self.ladder_step_finished = time + 0.3;
-               }
-               */
-       }
-       else
-       {
-               self.flags = self.flags | FL_JUMPRELEASED;
-               self.velocity = 0.9 * self.velocity;
-               self.velocity_z = 0;
-       }
-}
-else
-{
-       if (self.button2)
-               PlayerJump ();
-       else
-               self.flags = self.flags | FL_JUMPRELEASED;
-} //johnfitz
-
-// teleporters can force a non-moving pause time
-       if (time < self.pausetime)
-               self.velocity = '0 0 0';
-
-       if(time > self.attack_finished && self.currentammo == 0 && self.weapon != IT_AXE)
-       {
-               self.weapon = W_BestWeapon ();
-               W_SetCurrentAmmo ();
-       }
-       // from copper -- dumptruck_ds
-       if (self.movetype == MOVETYPE_NOCLIP)
-       {
-               self.flags = self.flags | FL_FLY;
-       }
-};
-
-/*
-================
-CheckPowerups
-
-Check for turning off powerups
-================
-*/
-void() CheckPowerups =
-{
-       if (self.health <= 0)
-               return;
-
-// invisibility
-       if (self.invisible_finished)
-       {
-// sound and screen flash when items starts to run out
-               if (self.invisible_sound < time)
-               {
-                       sound (self, CHAN_AUTO, "items/inv3.wav", 0.5, ATTN_IDLE);
-                       self.invisible_sound = time + ((random() * 3) + 1);
-               }
-
-
-               if (self.invisible_finished < time + 3)
-               {
-                       if (self.invisible_time == 1)
-                       {
-                               sprint (self, "Ring of Shadows magic is fading\n");
-                               stuffcmd (self, "bf\n");
-                               sound (self, CHAN_AUTO, "items/inv2.wav", 1, ATTN_NORM);
-                               self.invisible_time = time + 1;
-                       }
-
-                       if (self.invisible_time < time)
-                       {
-                               self.invisible_time = time + 1;
-                               stuffcmd (self, "bf\n");
-                       }
-               }
-
-               if (self.invisible_finished < time)
-               {       // just stopped
-                       self.items = self.items - IT_INVISIBILITY;
-                       self.invisible_finished = 0;
-                       self.invisible_time = 0;
-               }
-
-       // use the eyes
-               self.frame = 0;
-               self.modelindex = modelindex_eyes;
-       }
-       else
-               self.modelindex = modelindex_player;    // don't use eyes
-
-// invincibility
-       if (self.invincible_finished)
-       {
-// sound and screen flash when items starts to run out
-               if (self.invincible_finished < time + 3)
-               {
-                       if (self.invincible_time == 1)
-                       {
-                               sprint (self, "Protection is almost burned out\n");
-                               stuffcmd (self, "bf\n");
-                               sound (self, CHAN_AUTO, "items/protect2.wav", 1, ATTN_NORM);
-                               self.invincible_time = time + 1;
-                       }
-
-                       if (self.invincible_time < time)
-                       {
-                               self.invincible_time = time + 1;
-                               stuffcmd (self, "bf\n");
-                       }
-               }
-
-               if (self.invincible_finished < time)
-               {       // just stopped
-                       self.items = self.items - IT_INVULNERABILITY;
-                       self.invincible_time = 0;
-                       self.invincible_finished = 0;
-               }
-               if (self.invincible_finished > time)
-                       self.effects = self.effects | EF_DIMLIGHT;
-               else
-                       self.effects = self.effects - (self.effects & EF_DIMLIGHT);
-       }
-
-// super damage
-       if (self.super_damage_finished)
-       {
-
-// sound and screen flash when items starts to run out
-
-               if (self.super_damage_finished < time + 3)
-               {
-                       if (self.super_time == 1)
-                       {
-                               sprint (self, "Quad Damage is wearing off\n");
-                               stuffcmd (self, "bf\n");
-                               sound (self, CHAN_AUTO, "items/damage2.wav", 1, ATTN_NORM);
-                               self.super_time = time + 1;
-                       }
-
-                       if (self.super_time < time)
-                       {
-                               self.super_time = time + 1;
-                               stuffcmd (self, "bf\n");
-                       }
-               }
-
-               if (self.super_damage_finished < time)
-               {       // just stopped
-                       self.items = self.items - IT_QUAD;
-                       self.super_damage_finished = 0;
-                       self.super_time = 0;
-               }
-               if (self.super_damage_finished > time)
-                       self.effects = self.effects | EF_DIMLIGHT;
-               else
-                       self.effects = self.effects - (self.effects & EF_DIMLIGHT);
-       }
-
-// suit
-       if (self.radsuit_finished)
-       {
-               self.air_finished = time + 12;          // don't drown
-
-// sound and screen flash when items starts to run out
-               if (self.radsuit_finished < time + 3)
-               {
-                       if (self.rad_time == 1)
-                       {
-                               sprint (self, "Air supply in Biosuit expiring\n");
-                               stuffcmd (self, "bf\n");
-                               sound (self, CHAN_AUTO, "items/suit2.wav", 1, ATTN_NORM);
-                               self.rad_time = time + 1;
-                       }
-
-                       if (self.rad_time < time)
-                       {
-                               self.rad_time = time + 1;
-                               stuffcmd (self, "bf\n");
-                       }
-               }
-
-               if (self.radsuit_finished < time)
-               {       // just stopped
-                       self.items = self.items - IT_SUIT;
-                       self.rad_time = 0;
-                       self.radsuit_finished = 0;
-               }
-       }
-};
-
-/*
-================
-PlayerPostThink
-
-Called every frame after physics are run
-================
-*/
-void() PlayerPostThink =
-{
-
-       if (self.view_ofs == '0 0 0')
-               return;         // intermission or finale
-       if (self.deadflag)
-               return;
-
-// do weapon stuff
-
-       W_WeaponFrame ();
-
-// check to see if player landed and play landing sound
-       if ((self.jump_flag < -300) && (self.flags & FL_ONGROUND) && (self.health > 0))
-       {
-               if (self.watertype == CONTENT_WATER)
-                       sound (self, CHAN_BODY, "player/h2ojump.wav", 1, ATTN_NORM);
-               else if (self.jump_flag < -650)
-               {
-                       self.deathtype = "falling";
-                       T_Damage (self, world, world, 5);
-                       self.deathtype = "";
-                       sound (self, CHAN_VOICE, "player/land2.wav", 1, ATTN_NORM);
-               }
-               else
-                       sound (self, CHAN_VOICE, "player/land.wav", 1, ATTN_NORM);
-
-               self.jump_flag = 0;
-       }
-
-       if (!(self.flags & FL_ONGROUND))
-               self.jump_flag = self.velocity_z;
-
-       if (self.health > self.max_health) //dumptruck_ds --  this replaces item_megahealth_rot in items.qc
-
-       {
-               if (self.megahealth_rottime < time)
-                       {
-                                       self.megahealth_rottime = time + 1;
-                                       self.health = self.health - 1;
-                       }
-
-               else if (self.health <= 100)   //thanks ydrol!!!
-               self.items = self.items - (self.items & IT_SUPERHEALTH);
-}
-
-CheckPowerups ();
-// from Copper -- dumptruck_ds
-if (self.movetype != MOVETYPE_NOCLIP)
-{
-       self.flags = not(self.flags, FL_FLY);
-}
-
-};
-
-
-/*
-===========
-ClientConnect
-
-called when a player connects to a server
-============
-*/
-void() ClientConnect =
-{
-       bprint (self.netname);
-       bprint (" entered the game\n");
-
-// a client connecting during an intermission can cause problems
-       if (intermission_running)
-               ExitIntermission ();
-};
-
-
-/*
-===========
-ClientDisconnect
-
-called when a player disconnects from a server
-============
-*/
-void() ClientDisconnect =
-{
-       if (gameover)
-               return;
-       // if the level end trigger has been activated, just return
-       // since they aren't *really* leaving
-
-       // let everyone else know
-       bprint (self.netname);
-       bprint (" left the game with ");
-       bprint (ftos(self.frags));
-       bprint (" frags\n");
-       sound (self, CHAN_BODY, "player/tornoff2.wav", 1, ATTN_NONE);
-       set_suicide_frame ();
-};
-
-/*
-===========
-ClientObituary
-
-called when a player dies
-============
-*/
-void(entity targ, entity inflictor, entity attacker) ClientObituary =
-{
-       local   float rnum;
-       local   string deathstring, deathstring2;
-       rnum = random();
-
-       if (targ.classname == "player")
-       {
-               if (attacker.classname == "teledeath")
-               {
-                       bprint (targ.netname);
-                       bprint (" was telefragged by ");
-                       bprint (attacker.owner.netname);
-                       bprint ("\n");
-
-                       attacker.owner.frags = attacker.owner.frags + 1;
-                       return;
-               }
-
-               if (attacker.classname == "teledeath2")
-               {
-                       bprint ("Satan's power deflects ");
-                       bprint (targ.netname);
-                       bprint ("'s telefrag\n");
-
-                       targ.frags = targ.frags - 1;
-                       return;
-               }
-// 1998-07-26 Pentagram telefrag fix by Zoid/Maddes  start
-               // double 666 telefrag
-               // (can happen often in deathmatch 4 and levels with more than one pentagram)
-               if (attacker.classname == "teledeath3")
-               {
-                       bprint (targ.netname);
-                       bprint (" was telefragged by ");
-                       bprint (attacker.owner.netname);
-                       bprint ("'s Satan's power\n");
-// 1998-07-26 only telefrag player on spot by Maddes  start
-//                     targ.frags = targ.frags - 1;
-                       attacker.owner.frags = attacker.owner.frags + 1;
-// 1998-07-26 only telefrag player on spot by Maddes  end
-                       return;
-               }
-// 1998-07-26 Pentagram telefrag fix by Zoid/Maddes  end
-               if (attacker.classname == "player")
-               {
-                       if (targ == attacker)
-                       {
-                               // killed self
-                               attacker.frags = attacker.frags - 1;
-                               bprint (targ.netname);
-
-                               if (targ.weapon == 64 && targ.waterlevel > 1)
-                               {
-                                       bprint (" discharges into the water.\n");
-                                       return;
-                               }
-                               if (targ.weapon == IT_GRENADE_LAUNCHER)
-                                       bprint (" tries to put the pin back in\n");
-                               else
-                                       bprint (" becomes bored with life\n");
-                               return;
-                       }
-                       else if ( (teamplay == 2) && (targ.team > 0)&&(targ.team == attacker.team) )
-                       {
-                               if (rnum < 0.25)
-                                       deathstring = " mows down a teammate\n";
-                               else if (rnum < 0.50)
-                                       deathstring = " checks his glasses\n";
-                               else if (rnum < 0.75)
-                                       deathstring = " gets a frag for the other team\n";
-                               else
-                                       deathstring = " loses another friend\n";
-                               bprint (attacker.netname);
-                               bprint (deathstring);
-                               attacker.frags = attacker.frags - 1;
-                               return;
-                       }
-                       else
-                       {
-                               attacker.frags = attacker.frags + 1;
-
-                               rnum = attacker.weapon;
-                               if (rnum == IT_AXE)
-                               {
-                                       deathstring = " was ax-murdered by ";
-                                       deathstring2 = "\n";
-                               }
-                               if (rnum == IT_SHOTGUN)
-                               {
-                                       deathstring = " chewed on ";
-                                       deathstring2 = "'s boomstick\n";
-                               }
-                               if (rnum == IT_SUPER_SHOTGUN)
-                               {
-                                       deathstring = " ate 2 loads of ";
-                                       deathstring2 = "'s buckshot\n";
-                               }
-                               if (rnum == IT_NAILGUN)
-                               {
-                                       deathstring = " was nailed by ";
-                                       deathstring2 = "\n";
-                               }
-                               if (rnum == IT_SUPER_NAILGUN)
-                               {
-                                       deathstring = " was punctured by ";
-                                       deathstring2 = "\n";
-                               }
-                               if (rnum == IT_GRENADE_LAUNCHER)
-                               {
-                                       deathstring = " eats ";
-                                       deathstring2 = "'s pineapple\n";
-                                       if (targ.health < -40)
-                                       {
-                                               deathstring = " was gibbed by ";
-                                               deathstring2 = "'s grenade\n";
-                                       }
-                               }
-                               if (rnum == IT_ROCKET_LAUNCHER)
-                               {
-                                       deathstring = " rides ";
-                                       deathstring2 = "'s rocket\n";
-                                       if (targ.health < -40)
-                                       {
-                                               deathstring = " was gibbed by ";
-                                               deathstring2 = "'s rocket\n" ;
-                                       }
-                               }
-                               if (rnum == IT_LIGHTNING)
-                               {
-                                       deathstring = " accepts ";
-                                       if (attacker.waterlevel > 1)
-                                               deathstring2 = "'s discharge\n";
-                                       else
-                                               deathstring2 = "'s shaft\n";
-                               }
-                               bprint (targ.netname);
-                               bprint (deathstring);
-                               bprint (attacker.netname);
-                               bprint (deathstring2);
-                       }
-                       return;
-               }
-               else
-               {
-                       targ.frags = targ.frags - 1;
-                       bprint (targ.netname);
-
-                       // custom obituary messages
-                       if (inflictor.deathtype != "")
-                       {
-                               bprint (" ");
-                               bprint (inflictor.deathtype);
-                               bprint ("\n");
-                               return;
-                       }
-                       if (attacker.deathtype != "")
-                       {
-                               bprint (" ");
-                               bprint (attacker.deathtype);
-                               bprint ("\n");
-                               return;
-                       }
-
-                       // killed by a montser?
-                       // if (attacker.flags & FL_MONSTER)
-                       if ((attacker.flags & FL_MONSTER) && (attacker.obit_name == ""))
-                       {
-                               if (attacker.classname == "monster_army")
-                                       bprint (" was shot by a Grunt\n");
-                               if (attacker.classname == "monster_demon1")
-                                       bprint (" was eviscerated by a Fiend\n");
-                               if (attacker.classname == "monster_dog")
-                                       bprint (" was mauled by a Rottweiler\n");
-                               if (attacker.classname == "monster_dragon")
-                                       bprint (" was fried by a Dragon\n");
-                               if (attacker.classname == "monster_enforcer")
-                                       bprint (" was blasted by an Enforcer\n");
-                               if (attacker.classname == "monster_fish")
-                                       bprint (" was fed to the Rotfish\n");
-                               if (attacker.classname == "monster_hell_knight")
-                                       bprint (" was slain by a Death Knight\n");
-                               if (attacker.classname == "monster_knight")
-                                       bprint (" was slashed by a Knight\n");
-                               if (attacker.classname == "monster_ogre")
-                                       bprint (" was destroyed by an Ogre\n");
-                               if (attacker.classname == "monster_ogre_marksman")
-                                       bprint (" was felled by a Marksman\n"); // dumptruck_ds
-                               if (attacker.classname == "monster_oldone")
-                                       bprint (" became one with Shub-Niggurath\n");
-                               if (attacker.classname == "monster_oldone2")// dumptruck_ds
-                                       bprint (" became one with Shub-Niggurath\n");
-                               if (attacker.classname == "monster_boss2")// dumptruck_ds
-                                       bprint (" was exploded by Chthon\n");
-                               if (attacker.classname == "monster_boss")// dumptruck_ds
-                                       bprint (" was exploded by Chthon\n");
-                               if (attacker.classname == "monster_shalrath")
-                                       bprint (" was exploded by a Vore\n");
-                               if (attacker.classname == "monster_shambler")
-                                       bprint (" was smashed by a Shambler\n");
-                               if (attacker.classname == "monster_vomit")
-                                       bprint (" was vomited on by a Vomitus\n");
-                               if (attacker.classname == "monster_wizard")
-                                       bprint (" was scragged by a Scrag\n");
-                               if (attacker.classname == "monster_zombie")
-                                       bprint (" joins the Zombies\n");
-
-                               return;
-                       }
-                       // obits for custom monsters -- progs_dump -- dumptruck_ds
-                       if (attacker.obit_name != "")
-                       {
-                               bprint (" was ");
-                               if !(attacker.obit_method)
-                               bprint ("killed");
-                               else
-                               bprint (attacker.obit_method); // e.g. ripped apart
-                               bprint (" by ");
-                               bprint (attacker.obit_name); // a bad monster
-                               bprint ("\n");
-                               return;
-                       }
-
-                       // tricks and traps
-                       if (attacker.classname == "explo_box" ||
-                                       attacker.classname == "play_explosion")
-                       {
-                               bprint (" blew up\n");
-                               return;
-                       }
-                       if (attacker.classname == "func_laser")
-                       {
-                               bprint (" discovered that lasers are hot\n");
-                               return;
-                       }
-                       if ((attacker.solid == SOLID_BSP &&
-                                       attacker != world &&
-                                       attacker.classname != "togglewall") ||
-                                       (inflictor.classname == "func_movewall" &&
-                                       !(inflictor.spawnflags & MOVEWALL_TOUCH)))
-                       {
-                               bprint (" was squished\n");
-                               return;
-                       }
-                       if (attacker.classname == "trap_shooter" ||
-                                       attacker.classname == "trap_spikeshooter" ||
-                                       attacker.classname == "trap_switched_shooter")
-                       {
-                               // bprint (" was spiked\n");
-                               bprint (" was unlucky\n"); //changed for custom shooters --dumptruck_ds
-                               return;
-                       }
-                       if (attacker.classname == "ltrail_start" ||
-                                       attacker.classname == "ltrail_relay")
-                       {
-                               bprint (" had an electrifying experience\n");
-                               return;
-                       }
-                       if (attacker.classname == "fireball")
-                       {
-                               bprint (" ate a lavaball\n");
-                               return;
-                       }
-                       if (attacker.classname == "trigger_changelevel")
-                       {
-                               bprint (" tried to leave\n");
-                               return;
-                       }
-
-                       // in-liquid deaths
-                       if (targ.deathtype == "drowning")
-                       {
-                               if (random() < 0.5)
-                                       bprint (" sleeps with the fishes\n");
-                               else
-                                       bprint (" sucks it down\n");
-                               return;
-                       }
-                       if (targ.deathtype == "slime")
-                       {
-                               if (random() < 0.5)
-                                       bprint (" gulped a load of slime\n");
-                               else
-                                       bprint (" can't exist on slime alone\n");
-                               return;
-                       }
-                       if (targ.deathtype == "lava")
-                       {
-                               if (targ.health < -15)
-                               {
-                                       bprint (" burst into flames\n");
-                                       return;
-                               }
-                               if (random() < 0.5)
-                                       bprint (" turned into hot slag\n");
-                               else
-                                       bprint (" visits the Volcano God\n");
-                               return;
-                       }
-
-                       // fell to their death?
-                       if (targ.deathtype == "falling")
-                       {
-                               bprint (" fell to his death\n");
-                               return;
-                       }
-
-                       // hell if I know; he's just dead!!!
-                       bprint (" died\n");
-               }
-       }
-};

diff --git a/qc-server/combat.qc b/qc-server/combat.qc
deleted file mode 100644
index 83ca79a..0000000
--- a/qc-server/combat.qc
+++ /dev/null
@@ -1,366 +0,0 @@
-
-void() T_MissileTouch;
-void() info_player_start;
-void(entity targ, entity inflictor, entity attacker) ClientObituary;
-
-void() monster_death_use;
-
-//============================================================================
-
-/*
-============
-CanDamage
-
-Returns true if the inflictor can directly damage the target.  Used for
-explosions and melee attacks.
-============
-*/
-float(entity targ, entity inflictor) CanDamage =
-{
-// bmodels need special checking because their origin is 0,0,0
-       if (targ.movetype == MOVETYPE_PUSH)
-       {
-               traceline(inflictor.origin, 0.5 * (targ.absmin + targ.absmax), TRUE, self);
-               if (trace_fraction == 1)
-                       return TRUE;
-               if (trace_ent == targ)
-                       return TRUE;
-               return FALSE;
-       }
-
-       traceline(inflictor.origin, targ.origin, TRUE, self);
-       if (trace_fraction == 1)
-               return TRUE;
-       traceline(inflictor.origin, targ.origin + '15 15 0', TRUE, self);
-       if (trace_fraction == 1)
-               return TRUE;
-       traceline(inflictor.origin, targ.origin + '-15 -15 0', TRUE, self);
-       if (trace_fraction == 1)
-               return TRUE;
-       traceline(inflictor.origin, targ.origin + '-15 15 0', TRUE, self);
-       if (trace_fraction == 1)
-               return TRUE;
-       traceline(inflictor.origin, targ.origin + '15 -15 0', TRUE, self);
-       if (trace_fraction == 1)
-               return TRUE;
-
-       return FALSE;
-};
-
-
-/*
-============
-Killed
-============
-*/
-void(entity targ, entity inflictor, entity attacker) Killed =
-{
-       local entity oself;
-
-       oself = self;
-       self = targ;
-
-       if (self.health < -99)
-               self.health = -99;              // don't let sbar look bad if a player
-
-       if (self.movetype == MOVETYPE_PUSH || self.movetype == MOVETYPE_NONE)
-       {       // doors, triggers, etc
-               self.th_die ();
-               self = oself;
-               return;
-       }
-
-       self.enemy = attacker;
-
-// bump the monster counter
-       if (self.flags & FL_MONSTER)
-       {
-               killed_monsters = killed_monsters + 1;
-               WriteByte (MSG_ALL, SVC_KILLEDMONSTER);
-       }
-
-       ClientObituary (self, inflictor, attacker);
-
-       self.takedamage = DAMAGE_NO;
-       self.touch = SUB_Null;
-
-       monster_death_use();
-       self.th_die ();
-
-       self = oself;
-};
-
-
-/*
-============
-T_Damage
-
-The damage is coming from inflictor, but get mad at attacker
-This should be the only function that ever reduces health.
-============
-*/
-void(entity targ, entity inflictor, entity attacker, float damage) T_Damage=
-{
-       local   vector  dir;
-       local   entity  oldself;
-       local   float   save;
-       local   float   take;
-       local   float   ignore_armor; //johnfitz
-       local   string  death_type; //johnfitz
-
-       // don't try to damage the world. Not healthy - bmFbr
-       if (!targ)
-               return;
-
-       //johnfitz -- make sure targ.deathtype doesn't keep stale info after this function is done
-       death_type = targ.deathtype;
-       targ.deathtype = "";
-       //johnfitz
-
-       if (!targ.takedamage)
-               return;
-
-       //johnfitz -- some func_breakables ignore monster damage //added from Rubicon2 combat.qc dumptruck_ds
-       if (targ.classname == "func_breakable")
-       {
-               if (targ.spawnflags & BREAKABLE_NO_MONSTERS && attacker.flags & FL_MONSTER)
-                       return;
-       }
-       //johnfitz
-
-// used by buttons and triggers to set activator for target firing
-       damage_attacker = attacker;
-
-// check for quad damage powerup on the attacker
-       if (attacker.super_damage_finished > time)
-               damage = damage * 4;
-
-       // damage mod for monsters -- dumptruck_ds
-       if (attacker.damage_mod)
-       damage = damage * attacker.damage_mod;
-
-       //don't deplete armor if drowning/burning, or protected by biosuit/pentagram/godmode (note: in ID1 pentagram/godmode doesn't actually protect your armor)
-       if (death_type == "burning" || death_type == "drowning" || targ.invincible_finished >= time || targ.flags & FL_GODMODE)
-               ignore_armor = TRUE;
-       else
-               ignore_armor = FALSE;
-//johnfitz
-// save damage based on the target's armor level
-       if (ignore_armor)  //johnfitz -- some damage doesn't deplete armor
-       {
-               save = 0;
-       }
-       else
-       {
-       save = ceil(targ.armortype*damage);
-       if (save >= targ.armorvalue)
-       {
-               save = targ.armorvalue;
-               targ.armortype = 0;     // lost all armor
-               targ.items = targ.items - (targ.items & (IT_ARMOR1 | IT_ARMOR2 | IT_ARMOR3));
-       }
-}
-// // 1998-08-12 Drowning doesn't hurt armor by Maddes/Athos  start
-//     }
-//     else
-//             save = 0;
-//     // 1998-08-12 Drowning doesn't hurt armor by Maddes/Athos  end
-       targ.armorvalue = targ.armorvalue - save;
-       take = ceil(damage-save);
-
-// add to the damage total for clients, which will be sent as a single
-// message at the end of the frame
-// FIXME: remove after combining shotgun blasts?
-       if (targ.flags & FL_CLIENT)
-       {
-               targ.dmg_take = targ.dmg_take + take;
-               targ.dmg_save = targ.dmg_save + save;
-               targ.dmg_inflictor = inflictor;
-       }
-
-// figure momentum add
-       if ( (inflictor != world) && (targ.movetype == MOVETYPE_WALK) )
-       {
-               dir = targ.origin - (inflictor.absmin + inflictor.absmax) * 0.5;
-               dir = normalize(dir);
-               targ.velocity = targ.velocity + dir*damage*8;
-       }
-
-// check for godmode or invincibility
-       if (targ.flags & FL_GODMODE)
-               return;
-       if (targ.invincible_finished >= time)
-       {
-               if (self.invincible_sound < time)
-               {
-                       sound (targ, CHAN_ITEM, "items/protect3.wav", 1, ATTN_NORM);
-                       self.invincible_sound = time + 2;
-               }
-               return;
-       }
-
-// team play damage avoidance
-// 1998-07-29 Teamplay 1 fix by Maddes  start
-       if ( (teamplay == 1) && (targ.team > 0) && (targ.team == attacker.team)
-       && (targ != attacker)
-       && (attacker.classname == "player")
-       && (inflictor.classname != "door") )    // because squishing a teammate is still possible
-// 1998-07-29 Teamplay 1 fix by Maddes  end
-                                               return;
-
-// do the damage
-       targ.health = targ.health - take;
-
-// fire pain_target if appropriate
-       if ((targ.flags & FL_MONSTER) &&
-                       targ.pain_target != "" &&
-                       targ.health <= targ.pain_threshold)
-       {
-               oldself = self;
-               self = targ;
-               monster_pain_use ();
-               self = oldself;
-       }
-
-       if (targ.health <= 0)
-       {
-               Killed (targ, inflictor, attacker);
-               return;
-       }
-
-// react to the damage
-       oldself = self;
-       self = targ;
-
-       if ( (self.flags & FL_MONSTER) && attacker != world)
-       {
-       // get mad unless of the same class (except for soldiers)
-               if (self != attacker && attacker != self.enemy)
-               {
-                       local float mode;
-                       mode = 0;
-                       // take highest mode so infighting happens consistently
-                       if (self.infight_mode == -1 || self.infight_mode > mode)
-                       {
-                               mode = self.infight_mode;
-                       }
-                       if (mode != -1 && attacker.infight_mode > mode)
-                       {
-                               mode = attacker.infight_mode;
-                       }
-                       //soldiers of the same style will infight -- dumptruck_ds - thanks for c0burn and Shamblernaut for your help!
-                       if (mode == -1)
-                       {
-                               if (attacker.classname == "player")
-                               {
-                                       if (self.enemy.classname == "player")
-                                               self.oldenemy = self.enemy;
-                                       self.enemy = attacker;
-                                       FoundTarget ();
-                               }
-                       }
-                       else if (
-                               (self.classname != attacker.classname) ||
-                         ((self.classname == "monster_army") && (self.style == attacker.style)) ||
-                               (mode > 0 && self.mdl_body != attacker.mdl_body) || // infight if different models
-                               (mode > 1 && self.skin != attacker.skin) || // infight if different skin
-                               (mode > 2) // always infight
-                       )
-                       {
-                               if (self.enemy.classname == "player")
-                                       self.oldenemy = self.enemy;
-                               self.enemy = attacker;
-                               FoundTarget ();
-                       }
-               }
-       }
-
-       if (self.th_pain)
-       {
-               self.th_pain (attacker, take);
-       // nightmare mode monsters don't go into pain frames often
-               if (skill == 3)
-                       self.pain_finished = time + 5;
-       }
-
-       self = oldself;
-};
-
-/*
-============
-T_RadiusDamage
-============
-*/
-void(entity inflictor, entity attacker, float damage, entity ignore) T_RadiusDamage =
-{
-       local   float   points;
-       local   entity  head;
-       local   vector  org;
-
-       head = findradius(inflictor.origin, damage+40);
-
-       while (head)
-       {
-               if (head != ignore)
-               {
-                       if (head.takedamage)
-                       {
-                               org = head.origin + (head.mins + head.maxs)*0.5;
-                               points = 0.5*vlen (inflictor.origin - org);
-                               if (points < 0)
-                                       points = 0;
-                               points = damage - points;
-                               if (head == attacker)
-                                       points = points * 0.5;
-                               if (points > 0)
-                               {
-                                       if (CanDamage (head, inflictor))
-                                       {       // shambler takes half damage from all explosions
-                                               if (head.classname == "monster_shambler")
-                                                       T_Damage (head, inflictor, attacker, points*0.5);
-                                               else
-                                                       T_Damage (head, inflictor, attacker, points);
-                                       }
-                               }
-                       }
-               }
-               head = head.chain;
-       }
-};
-
-/*
-============
-T_BeamDamage
-============
-*/
-void(entity attacker, float damage) T_BeamDamage =
-{
-       local   float   points;
-       local   entity  head;
-
-       head = findradius(attacker.origin, damage+40);
-
-       while (head)
-       {
-               if (head.takedamage)
-               {
-                       points = 0.5*vlen (attacker.origin - head.origin);
-                       if (points < 0)
-                               points = 0;
-                       points = damage - points;
-                       if (head == attacker)
-                               points = points * 0.5;
-                       if (points > 0)
-                       {
-                               if (CanDamage (head, attacker))
-                               {
-                                       if (head.classname == "monster_shambler")
-                                               T_Damage (head, attacker, attacker, points*0.5);
-                                       else
-                                               T_Damage (head, attacker, attacker, points);
-                               }
-                       }
-               }
-               head = head.chain;
-       }
-};

diff --git a/qc-server/cshift.qc b/qc-server/cshift.qc
deleted file mode 100644
index f7410a7..0000000
--- a/qc-server/cshift.qc
+++ /dev/null
@@ -1,75 +0,0 @@
-
-inline void(entity client, float density, vector color) csf_save = {
-       client.csf_color = color;
-       client.csf_density = density;
-}
-
-inline void(entity client) csf_apply = {
-       stuffcmd(client, "\nv_cshift ");
-       stuffcmd(client, ftos(client.csf_color_x));
-       stuffcmd(client, " ");
-       stuffcmd(client, ftos(client.csf_color_y));
-       stuffcmd(client, " ");
-       stuffcmd(client, ftos(client.csf_color_z));
-       stuffcmd(client, " ");
-       stuffcmd(client, ftos(client.csf_density));
-       stuffcmd(client, "\n");
-}
-
-void(entity client, float density, vector color) csf_set = {
-       csf_save(client, density, color);
-       csf_apply(client);
-}
-
-void() csfcontroller_think = {
-       
-       entity e = self.owner;
-
-       if (self.pain_finished > time && e.csf_density != self.csf_density) {
-               
-               float density;
-               vector color;
-               
-               float fraction = 1 - (self.pain_finished - time) / self.speed; //wat
-
-               density = lerpHermite(e.csf_density, self.csf_density, fraction);
-               color = lerpVectorHermite(e.csf_color, self.csf_color, fraction);
-
-               csf_set(e, density, color);
-
-               self.nextthink = time + 0.04;
-       }
-       else {
-               csf_set(e, self.csf_density, self.csf_color);
-       }
-
-}
-
-
-void(entity client) csfcontroller_start = {
-       if (client.csfcontroller.classname == "csfcontroller" && client.csfcontroller.owner == client)
-               return;
-
-       entity e = spawn();
-       client.csfcontroller = e;
-       e.owner = client;
-       e.classname = "csfcontroller";
-       e.think = csfcontroller_think;
-}
-
-
-void(entity client, float density, vector color, float spd) csf_fade = {
-       csfcontroller_start(client);
-
-       entity ct = client.csfcontroller;
-
-       ct.speed = spd;
-       ct.pain_finished = time + spd;
-       ct.csf_color = color;
-       ct.csf_density = density;
-       ct.nextthink = time + 0.04;
-}
-
-
-
-

diff --git a/qc-server/csqc/csqc_defs.qc b/qc-server/csqc/csqc_defs.qc
deleted file mode 100644
index 7172e91..0000000
--- a/qc-server/csqc/csqc_defs.qc
+++ /dev/null
@@ -1,398 +0,0 @@
-//======================================================================
-// Author : Simon "Sock" OCallaghan
-// Website: www.simonoc.com
-//
-// This is a special defs file with all the relevant CSQC references
-// Should be included into progs and csprogs to reduce duplicates
-//
-//----------------------------------------------------------------------
-// The CSQC files are setup to be self contained and easy to port
-// to other MODS, but some stuff needs to exist in other QC files
-// In world.qc the extra variables for AD are located there
-//
-//----------------------------------------------------------------------
-// Special Variables used by CSQC (Client Side Quake C)
-// The engine will keep these insync between server and client
-// Defined with the addstat/clientstat command DP/FTE
-//----------------------------------------------------------------------
-
-const float CLIENT_HEALTH = 0;                 // Player's health
-const float CLIENT_WEAPONMODELI = 2;           // Modelidx of current viewmodel
-const float CLIENT_AMMO = 3;                   // player.currentammo
-const float CLIENT_ARMOR = 4;
-const float CLIENT_WEAPONFRAME = 5;
-const float CLIENT_SHELLS = 6;
-const float CLIENT_NAILS = 7;
-const float CLIENT_ROCKETS = 8;
-const float CLIENT_CELLS = 9;
-const float CLIENT_ACTIVEWEAPON = 10;          // player.weapon
-const float CLIENT_TOTALSECRETS = 11;
-const float CLIENT_TOTALMONSTERS = 12;
-const float CLIENT_FOUNDSECRETS = 13;
-const float CLIENT_KILLEDMONSTERS = 14;
-// getstatbits(CLIENT_ITEMS,0,23) to read self.items
-// getstatbits(CLIENT_ITEMS,23,11) to read self.items2
-// or getstatbits(CLIENT_ITEMS,28,4) to read the visible part of serverflags
-const float CLIENT_ITEMS = 15;                 // self.items | (self.items2<<23)
-const float CLIENT_VIEWHEIGHT = 16;            // player.view_ofs_z
-const float CLIENT_VIEW2 = 20;                 // Entity Qty in server's .view2 field
-const float CLIENT_VIEWZOOM = 21;              // Scales fov and sensitiity
-const float CLIENT_IDEALPITCH = 25;
-const float CLIENT_PUNCHANGLE_X = 26;
-const float CLIENT_PUNCHANGLE_Y = 27;
-const float CLIENT_PUNCHANGLE_Z = 28;
-// 32-127 is custom variables (defined here and linked in world.qc)
-const float CLIENT_MODITEMS = 40;              // self.moditems (AD extra stuff)
-const float CLIENT_CKEYNAME1 = 50;             // self.ckeyname1
-const float CLIENT_CKEYNAME2 = 51;             // self.ckeyname2
-const float CLIENT_CKEYNAME3 = 52;             // self.ckeyname3
-const float CLIENT_CKEYNAME4 = 53;             // self.ckeyname4
-const float CLIENT_CKEYSKIN1 = 55;             // self.ckeyskin1
-const float CLIENT_CKEYSKIN2 = 56;             // self.ckeyskin2
-const float CLIENT_CKEYSKIN3 = 57;             // self.ckeyskin3
-const float CLIENT_CKEYSKIN4 = 58;             // self.ckeyskin4
-// CEV
-const float CLIENT_VELOCITY_X = 64;
-const float CLIENT_VELOCITY_Y = 65;
-
-//----------------------------------------------------------------------
-// Duplicate of IT_ references in defs.qc
-//----------------------------------------------------------------------
-const float CSQC_SHOTGUN = 1<<0;               // 1
-const float CSQC_SUPER_SHOTGUN = 1<<1;         // 2
-const float CSQC_NAILGUN = 1<<2;               // 4
-const float CSQC_SUPER_NAILGUN = 1<<3;         // 8
-const float CSQC_GRENADE_LAUNCHER = 1<<4;      // 16
-const float CSQC_ROCKET_LAUNCHER = 1<<5;       // 32
-const float CSQC_LIGHTNING = 1<<6;             // 64
-// const float CSQC_EXTRA_WEAPON = 1<<7;       // 128
-
-const float CSQC_SHELLS = 1<<8;                        // 256
-const float CSQC_NAILS = 1<<9;                 // 512
-const float CSQC_ROCKETS = 1<<10;              // 1024
-const float CSQC_CELLS = 1<<11;                        // 2048
-const float CSQC_AXE = 1<<12;                  // 4096
-
-const float CSQC_ARMOR1 = 1<<13;               // 8192
-const float CSQC_ARMOR2 = 1<<14;               // 16384
-const float CSQC_ARMOR3 = 1<<15;               // 32768
-// const float CSQC_SUPERHEALTH = 1<<16;       // 65536
-
-const float CSQC_KEY1 = 1<<17;                 // 131072
-const float CSQC_KEY2 = 1<<18;                 // 262144
-
-const float CSQC_INVISIBILITY = 1<<19;         // 524288
-const float CSQC_INVULNERABILITY = 1<<20;      // 1048576
-const float CSQC_SUIT = 1<<21;                 // 2097152
-const float CSQC_QUAD = 1<<22;                 // 4194304
-
-// Runes in Serverflags
-const float CSQC_RUNE1 = 1<<5;                 // 32
-const float CSQC_RUNE2 = 1<<6;                 // 64
-const float CSQC_RUNE3 = 1<<7;                 // 128
-const float CSQC_RUNE4 = 1<<8;                 // 256
-
-// Variable types
-const float EV_VOID = 0;
-const float EV_STRING = 1;
-const float EV_FLOAT = 2;
-const float EV_VECTOR = 3;
-const float EV_ENTITY = 4;
-const float EV_FIELD = 5;
-const float EV_FUNCTION = 6;
-const float EV_POINTER = 7;
-const float EV_INTEGER = 8;
-
-// ======================================================================
-// This is a merge of three (DP/FTE/QSS) engine def files
-// dpextensions+csprogsdefs from SVN ICCULUS site (DP trunk)
-// fteexentions from triptohell website
-// qsextensions from QSS devkit on triptohell website
-// 
-// CSQC range #300-#399
-// ======================================================================
-
-// ----------------------------------------------------------------------
-// DP/FTE extensions ONLY
-// ----------------------------------------------------------------------
-// Forgets all rentities, polygons, and temporary dlights. 
-// Resets all view properties to their default values.
-void() clearscene = #300;
-void(float mask) addentities = #301;
-// Copies the entity fields into a new rentity for
-// later rendering via addscene
-void(entity ent) addentity = #302;
-// Allows you to override default view properties like
-// viewport, fov, and whether the engine hud will be drawn.
-// Different VF_ values have slightly different arguments,
-// some are vectors, some floats.
-float(float property, ...) setproperty = #303;
-// Draws all entities, polygons, and particles on the rentity list
-// (which were added via addentities or addentity), using the various
-// view properties set via setproperty. There is no ordering dependancy.
-// The scene must generally be cleared again before more entities
-// are added, as entities will persist even over to the next frame.
-// You may call this builtin multiple times per frame, but should
-// only be called from CSQC_UpdateView.
-void() renderscene = #304;
-// Adds a temporary dlight, ready to be drawn via addscene.
-// Cubemap orientation will be read from v_forward/v_right/v_up.
-void(vector org, float radius, vector lightcolours) adddynamiclight = #305;
-void(vector org, float radius, vector lightcolours, float style, string cubemapname, float pflags) adddynamiclight2 = #305;
-// Specifies the shader to use for the following polygons, along
-// with optional flags.
-// If is2d, the polygon will be drawn as soon as the EndPolygon
-// call is made, rather than waiting for renderscene. This allows
-// complex 2d effects.
-// FTE = void(string texturename, optional float flags, optional float is2d) R_BeginPolygon = #306;
-void(string texturename, float flag, ...) R_BeginPolygon = #306;
-// Specifies a polygon vertex with its various properties
-void(vector org, vector texcoords, vector rgb, float alpha) R_PolygonVertex = #307;
-// Ends the current polygon. At least 3 verticies must have been 
-// specified. You do not need to call beginpolygon if you wish to
-// draw another polygon with the same shader
-void() R_EndPolygon = #308;
-// Retrieve a currently-set (typically view) property, allowing you
-// to read the current viewport or other things. Due to cheat protection,
-// certain values may be unretrievable
-// define = FTE version of DP version
-#define getviewprop getproperty
-float(float property) getproperty = #309;
-vector(float property) getpropertyvec = #309;
-// Transform a 2d screen-space point (with depth) into a 3d world-space
-// point, according the various origin+angle+fov etc settings set via
-// setproperty
-vector (vector v) cs_unproject = #310;
-// Transform a 3d world-space point into a 2d screen-space point,
-// according the various origin+angle+fov etc settings set via
-// setproperty
-vector (vector v) cs_project = #311;
-// Draws a 2d line between the two 2d points
-void(float width, vector pos1, vector pos2, vector rgb, float alpha, float flag) drawline = #315;
-// Tells the engine that the image is no longer needed. 
-// The image will appear to be new the next time its needed
-void(string name) freepic = #319;
-// Draws the specified string without using any markup at all, 
-// even in engines that support it.
-// If UTF-8 is globally enabled in the engine, then that encoding
-// is used (without additional markup), otherwise it is raw quake chars.
-// Software engines may assume a size of '8 8 0', rgb='1 1 1', 
-// alpha=1, flag&3=0, but it is not an error to draw out of the screen.
-float(vector position, string text, vector scale, vector rgb, float alpha, float flag) drawstring = #321;
-// Retrieves the value of the given EV_STRING stat, as a tempstring.
-// Older engines may use 4 consecutive integer stats, with a limit
-// of 15 chars (yes, really. 15.), but FTE Quake uses a separate
-// namespace for string stats and has a much higher length limit.
-string(float stnum) getstats = #332;
-// Retrieves the name of the model based upon a precache index.
-// This can be used to reduce csqc network traffic by enabling
-// model matching
-string(float mdlindex) modelnameforindex = #334;
-// Looks up a named font slot. Matches the actual font name as a last resort.
-// find font by fontname and return it's index
-float findfont(string s) = #356;
-float loadfont(string fontname, string fontmaps, string sizes, float slot, float fix_scale, float fix_voffset) = #357;
-
-// ----------------------------------------------------------------------
-// QSS (CSQC Lit) + DP/FTE extensions
-// ----------------------------------------------------------------------
-// Checks to see if the image is currently loaded. 
-// Engines might lie, or cache between maps.
-float(string name) iscachedpic = #316;
-// Forces the engine to load the named image. If trywad is specified,
-// the specified name must any lack path and extension.
-string(string name, optional float trywad) precache_pic = #317;
-// Returns the dimensions of the named image. Images specified
-// with .lmp should give the original .lmp's dimensions even if
-// texture replacements use a different resolution.
-// define = FTE version of DP version
-#define drawgetimagesize draw_getimagesize 
-vector(string picname) draw_getimagesize = #318;
-// Draw the given quake character at the given position.
-// If flag&4, the function will consider the char to be a unicode 
-// char instead (or display as a ? if outside the 32-127 range).
-// size should normally be something like '8 8 0'.
-// rgb should normally be '1 1 1' and alpha normally 1.
-// Software engines may assume the named defaults.
-// Note that ALL text may be rescaled on the X axis due to 
-// variable width fonts. The X axis may even be ignored completely.
-float(vector position, float character, vector scale, vector rgb, float alpha, float flag) drawcharacter = #320;
-// Draws an shader within the given 2d screen box. Software engines
-// may omit support for rgb+alpha, but must support rescaling,
-// and must clip to the screen without crashing
-// flag = draw method; 0=normal, 1=additive, 2=modulate, 3=modulate2
-float(vector position, string pic, vector size, vector rgb, float alpha, float flag) drawpic = #322;
-// Draws a solid block over the given 2d box, with given colour, 
-// alpha, and blend mode (specified via flags).
-// flags&3=0 simple blend flags&3=1 additive blend
-float(vector position, vector size, vector rgb, float alpha, float flag) drawfill = #323;
-// Specifies a 2d clipping region (aka: scissor test).
-// 2d draw calls will all be clipped to this 2d box,
-// the area outside will not be modified by any 
-// 2d draw call (even 2d polygons).
-void(float x, float y, float width, float height) drawsetcliparea = #324;
-// Reverts the scissor/clip area to the whole screen
-void(void) drawresetcliparea = #325;
-// Draws a string, interpreting markup and recolouring as appropriate
-// QSS/FTE = drawstring, DP = drawcolorcodedstring/drawcolorcodedstring2
-// float(vector position, string text, vector size, vector rgb, float alpha, float drawflag) drawstring = #326;
-float(vector position, string text, vector scale, float alpha, float flag) drawcolorcodedstring = #326;
-vector(vector position, string text, vector scale, vector rgb, float alpha, float flag) drawcolorcodedstring2 = #326;
-// Calculates the width of the screen in virtual pixels.
-// If usecolours is 1, markup that does not affect the string
-// width will be ignored. Will always be decoded as UTF-8 if
-// UTF-8 is globally enabled.
-// If the char size is not specified, '8 8 0' will be assumed
-// float(string text, float usecolours, optional vector fontsize) stringwidth = #327;
-// QSS/FTE = float(string text, float usecolours, optional vector fontsize) stringwidth = #327;
-float(string text, float allowColorCodes, vector size) stringwidth = #327;
-// Draws a rescaled subsection of an image to the screen
-// QSS/FTE = void(vector pos, vector sz, string pic, vector srcpos, vector srcsz, vector rgb, float alpha, optional float drawflag) drawsubpic = #328;
-float(vector position, vector size, string pic, vector srcPosition, vector srcSize, vector rgb, float alpha, float flag) drawsubpic = #328;
-// Nasty convoluted DP extension. Typically returns deltas instead
-// of positions. Use CSQC_InputEvent for such things in csqc mods
-vector() getmousepos = #344;
-// Looks up an input frame from the log, setting the input_*
-// globals accordingly.
-// The sequence number range used for prediction should normally
-// be servercommandframe < sequence <= clientcommandframe.
-// The sequence equal to clientcommandframe will change between
-// input frames
-float(float framenum) getinputstate = #345;
-// Perform the engine's standard player movement prediction upon
-// the given entity using the input_* globals to describe movement
-// this may or may not take a player ent
-void(...) runstandardplayerphysics = #347;
-// Sets the position of the view, as far as the audio subsystem is
-// concerned. This should be called once per CSQC_UpdateView as it
-// will otherwise revert to default. For reverbtype,
-// see setup_reverb or treat as 'underwater'
-// FTE = void(vector origin, vector forward, vector right, vector up, optional float reverbtype) SetListener = #351;
-void(vector origin, vector forward, vector right, vector up) SetListener = #351;
-
-// ----------------------------------------------------------------------
-// This is a bit of mess with DP (below) and FTE/QSS (further below)
-// Going in different directions with the CSQC standard
-// This is all about #330 returning an INT instead of a FLOAT
-// As getstatf has optional parameters it will still work fine with DP
-// Going with the FTE/QSS direction as it still works for DP
-// ----------------------------------------------------------------------
-//float(float stnum) getstatf = #330;
-// Can optionally take first bit and count
-//float(float stnum, ...) getstati = #331;
-
-// Retrieves the numerical value of the given EV_INTEGER or EV_ENTITY stat.
-// Use getstati_punf if you wish to type-pun a float stat as an int to
-// avoid truncation issues in DP
-#define getstati_punf(stnum) (float)(__variant)getstati(stnum)
-int(float stnum) getstati = #330;
-#define getstatbits getstatf
-float(float stnum, optional float firstbit, optional float bitcount) getstatf = #331;
-
-// ----------------------------------------------------------------------
-// QSS (CSQC Lit) + DP/FTE extensions
-// ----------------------------------------------------------------------
-// Sets a model by precache index instead of by name. 
-// Otherwise identical to setmodel.
-void(entity e, float mdlindex) setmodelindex = #333;
-// Part of DP_ENT_TRAILEFFECTNUM, FTE_SV_POINTPARTICLES
-// Precaches the named particle effect. If your effect name is of
-// the form 'foo.bar' then particles/foo.cfg will be loaded by the
-// client if foo.bar was not already defined.
-// Different engines will have different particle systems, this
-// specifies the QC API only
-float(string effectname) particleeffectnum = #335;
-// Part of FTE_SV_POINTPARTICLES
-// Draws the given effect between the two named points. If ent is
-// not world, distances will be cached in the entity in order to
-// avoid framerate dependancies. The entity is not otherwise used
-void(float effectnum, entity ent, vector start, vector end) trailparticles = #336;
-// Part of FTE_SV_POINTPARTICLES
-// Spawn a load of particles from the given effect at the given
-// point traveling or aiming along the direction specified.
-// The number of particles are scaled by the count argument.
-// For regular particles, the dir vector is multiplied by the 
-// 'veladd' property (while orgadd will push the particles along it).
-// Decals will use it as a hint to align to the correct surface.
-// In both cases, it should normally be a unit vector, but other
-// lengths will still work. If it has length 0 then FTE will
-// assume downwards
-void(float effectnum, vector origin, optional vector dir, optional float count) pointparticles = #337;
-
-// conflicts with void(entity client, string s1) centerprint = #73;
-void(string s, ...) csqc_centerprint = #338;
-// Print into the center of the screen just as ssqc's centerprint
-// would appear
-void(string s, ...) cprint = #338;
-// This is identical to dprint except that it always prints 
-// regardless of the developer cvar. Same number as in EXT_CSQC
-// Unconditionally print on the local system's console, even in
-// ssqc (doesn't care about the value of the developer cvar)
-void(string s, ...) print = #339;
-// Returns a hunam-readable name for the given keycode, as a tempstring
-string(float keynum) keynumtostring = #340;
-// Looks up the key name in the same way that the bind command would,
-// returning the keycode for that key
-float(string keyname) stringtokeynum = #341;
-// Returns the current binding for the given key (returning only the 
-// command executed when no modifiers are pressed)
-string(float key, float bindmap) getkeybind_bindmap = #342;
-string(float keynum) getkeybind = #342;
-// Pass TRUE if you want the engine to release the mouse cursor
-// (absolute input events + touchscreen mode). Pass FALSE if you
-// want the engine to grab the cursor (relative input
-// events + standard looking). If the image name is specified,
-// the engine will use that image for a cursor (use an empty
-// string to clear it again), in a way that will not conflict
-// with the console. Images specified this way will be hardware
-// accelerated, if supported by the platform/port
-// QSS/FTE = void(float usecursor, optional string cursorimage, optional vector hotspot, optional float scale) setcursormode = #343;
-void(float usecursor) setcursormode = #343;
-// Reports the cursor mode this module previously attempted to use.
-// If 'effective' is true, reports the cursor mode currently active
-// (if was overriden by a different module which has precidence,
-// for instance, or if there is only a touchscreen and no mouse)
-float(float effective) getcursormode = #0;
-// Temporarily scales the player's mouse sensitivity based upon
-// something like zoom, avoiding potential cvar saving and thus
-// corruption
-void(float sens) setsensitivityscale = #346;
-// Look up a player's userinfo, to discover things like their name,
-// topcolor, bottomcolor, skin, team, *ver.
-// Also includes scoreboard info like frags, ping, pl, userid,
-// entertime, as well as voipspeaking and voiploudness
-string(float playernum, string keyname) getplayerkeyvalue = #348;
-// Cheaper version of getplayerkeyvalue that avoids the need for
-// so many tempstrings
-float(float playernum, string keyname, optional float assumevalue) getplayerkeyfloat = #0;
-// Returns if the client is currently playing a demo or not
-float() isdemo = #349;
-// Returns if the client is acting as the server (aka: listen server)
-float() isserver = #350;
-// Register the given console command, for easy console use.
-// Console commands that are later used will invoke CSQC_ConsoleCommand
-void(string cmdname) registercommand = #352;
-// Quickly check to see if the entity is currently free. This
-// function is only valid during the two-second non-reuse window,
-// after that it may give bad results. Try one second to make it
-// more robust.
-float(entity ent) wasfreed = #353;
-// Look up a key in the server's public serverinfo string
-string(string key) serverkey = #354;
-// Version of serverkey that returns the value as a float
-// (which avoids tempstrings)
-float(string key, optional float assumevalue) serverkeyfloat = #0;
-// Use proper case; refer to the id1 Write* functions!
-float() ReadByte = #360;
-float() ReadChar = #361;
-float() ReadShort = #362;
-float() ReadLong = #363;
-float() ReadCoord = #364;
-float() ReadAngle = #365;
-string() ReadString = #366;
-float() ReadFloat = #367;
-float() readentitynum = #368;
-// Replaces the title of the game window, as seen when 
-// task switching or just running in windowed mode
-void(string newcaption) setwindowcaption = #0;
-

diff --git a/qc-server/csqc/csqc_defsclient.qc b/qc-server/csqc/csqc_defsclient.qc
deleted file mode 100644
index 23e7f4b..0000000
--- a/qc-server/csqc/csqc_defsclient.qc
+++ /dev/null
@@ -1,759 +0,0 @@
-//======================================================================
-// Author : Simon "Sock" OCallaghan
-// Website: www.simonoc.com
-//
-// Based on the qsextensions.qc file in the QSS devkit
-// This is a special defs file for csprogs.dat ONLY
-// Requires csqc_defs.qc file for 300-399 range commands
-//
-//======================================================================
-// Some extra defs (csqc/csqc_simple)
-#ifndef CSQC
-#define CSQC
-#endif
-#ifndef CSQC_SIMPLE
-#define CSQC_SIMPLE
-#endif
-// Suppress reference errors
-#pragma noref 1
-
-//----------------------------------------------------------------------
-// Mostly stuff from GLOBALVARS_T C STRUCTURE
-//----------------------------------------------------------------------
-entity         self,other,world;
-float          time,frametime,force_retouch;
-string         mapname;
-float          deathmatch,coop,teamplay,serverflags,total_secrets,total_monsters,found_secrets,killed_monsters,parm1, parm2, parm3, parm4, parm5, parm6, parm7, parm8, parm9, parm10, parm11, parm12, parm13, parm14, parm15, parm16;
-vector         v_forward, v_up, v_right;
-float          trace_allsolid,trace_startsolid,trace_fraction;
-vector         trace_endpos,trace_plane_normal;
-float          trace_plane_dist;
-entity         trace_ent;
-float          trace_inopen,trace_inwater;
-entity         msg_entity;
-void()                 main,StartFrame,PlayerPreThink,PlayerPostThink,ClientKill,ClientConnect,PutClientInServer,ClientDisconnect,SetNewParms,SetChangeParms;
-void           end_sys_globals;
-.float         modelindex;
-.vector                absmin, absmax;
-.float         ltime,movetype,solid;
-.vector                origin,oldorigin,velocity,angles,avelocity,punchangle;
-.string                classname,model;
-.float         frame,skin,effects;
-.vector                mins, maxs,size;
-.void()                touch,use,think,blocked;
-.float         nextthink;
-.entity                groundentity;
-.float         health,frags,weapon;
-.string                weaponmodel;
-.float         weaponframe,currentammo,ammo_shells,ammo_nails,ammo_rockets,ammo_cells,items,takedamage;
-.entity                chain;
-.float         deadflag;
-.vector                view_ofs;
-.float         button0,button1,button2,impulse,fixangle;
-.vector                v_angle;
-.float         idealpitch;
-.string                netname;
-.entity        enemy;
-.float         flags,colormap,team,max_health,teleport_time,armortype,armorvalue,waterlevel,watertype,ideal_yaw,yaw_speed;
-.entity                aiment,goalentity;
-.float         spawnflags;
-.string                target,targetname;
-.float         dmg_take,dmg_save;
-.entity                dmg_inflictor,owner;
-.vector                movedir;
-.string                message;
-.float         sounds;
-.string                noise, noise1, noise2, noise3;
-void           end_sys_fields;
-
-// Custom types redefined as accessors
-#ifdef _ACCESSORS
-accessor strbuf:float;
-accessor searchhandle:float;
-accessor hashtable:float;
-accessor infostring:string;
-accessor filestream:float;
-#else
-#define strbuf float
-#define searchhandle float
-#define hashtable float
-#define infostring string
-#define filestream float
-#endif
-
-void(string cmd) SV_ParseClientCommand;
-void() EndFrame;
-
-// Core CSQC functions called by engine
-void(float apilevel, string enginename, float engineversion) CSQC_Init;
-void(vector virtsize, float showscores) CSQC_DrawHud;
-void(vector virtsize, float showscores) CSQC_DrawScores;
-float(float evtype, float scanx, float chary, float devid) CSQC_InputEvent;
-float(float save, float take, vector dir) CSQC_Parse_Damage;
-float(string cmdstr) CSQC_ConsoleCommand;
-void() CSQC_Parse_Event;
-
-float player_localnum;         // Player slot that is assigned to us
-
-const float FALSE                      = 0;
-const float TRUE                       = 1;
-const float IE_KEYDOWN         = 0;
-const float IE_KEYUP           = 1;
-const float IE_MOUSEDELTA      = 2;
-const float IE_MOUSEABS                = 3;
-const float IE_JOYAXIS         = 6;
-
-//----------------------------------------------------------------------
-// Extra fields
-//----------------------------------------------------------------------
-.float gravity;
-//.float items2;                       /*if defined, overrides serverflags for displaying runes on the hud*/
-.float traileffectnum;         /*can also be set with 'traileffect' from a map editor*/
-.float emiteffectnum;          /*can also be set with 'traileffect' from a map editor*/
-.vector movement;                      /*describes which forward/right/up keys the player is holidng*/
-.entity viewmodelforclient;    /*attaches this entity to the specified player's view. invisible to other players*/
-.float scale;                          /*rescales the etntiy*/
-.float alpha;                          /*entity opacity*/
-.vector colormod;                      /*tints the entity's colours*/
-.entity tag_entity;
-.float tag_index;
-.float button3;
-.float button4;
-.float button5;
-.float button6;
-.float button7;
-.float button8;
-.float viewzoom;                       /*rescales the user's fov*/
-.float modelflags;                     /*provides additional modelflags to use (effects&EF_NOMODELFLAGS to replace the original model's)*/
-
-//----------------------------------------------------------------------
-// Supported Extension Constants
-//----------------------------------------------------------------------
-const float MOVETYPE_FOLLOW    = 12;
-const float SOLID_CORPSE       = 5;
-const float CLIENTTYPE_DISCONNECT      = 0;
-const float CLIENTTYPE_REAL                    = 1;
-const float CLIENTTYPE_BOT                     = 2;
-const float CLIENTTYPE_NOTCLIENT       = 3;
-const float EF_NOSHADOW                = 0x1000;
-const float EF_NOMODELFLAGS    = 0x800000; /*the standard modelflags from the model are ignored*/
-const float MF_ROCKET          = 0x1;
-const float MF_GRENADE         = 0x2;
-const float MF_GIB                     = 0x4;
-const float MF_ROTATE          = 0x8;
-const float MF_TRACER          = 0x10;
-const float MF_ZOMGIB          = 0x20;
-const float MF_TRACER2         = 0x40;
-const float MF_TRACER3         = 0x80;
-const float MSG_MULTICAST      = 4;
-const float MULTICAST_ALL      = 0;
-const float MULTICAST_PVS      = 2;
-const float MULTICAST_ONE      = 6;
-const float MULTICAST_ALL_R    = 3;
-const float MULTICAST_PVS_R    = 5;
-const float MULTICAST_ONE_R    = 7;
-const float MULTICAST_INIT     = 8;
-const float FILE_READ          = 0;
-const float FILE_APPEND                = 1;
-const float FILE_WRITE         = 2;
-
-//----------------------------------------------------------------------
-// Vanilla Builtin list (reduced, so as to avoid conflicts)
-//----------------------------------------------------------------------
-void(vector) makevectors = #1;
-void(entity,vector) setorigin = #2;
-void(entity,string) setmodel = #3;
-void(entity,vector,vector) setsize = #4;
-float() random = #7;
-vector(vector) normalize = #9;
-void(string e) error = #10;
-void(string n) objerror = #11;
-float(vector) vlen = #12;
-entity() spawn = #14;
-void(entity e) remove = #15;
-void(string,...) dprint = #25;
-string(float) ftos = #26;
-string(vector) vtos = #27;
-float(float n) rint = #36;
-float(float n) floor = #37;
-float(float n) ceil = #38;
-float(float n) fabs = #43;
-float(string) cvar = #45;
-void(string,...) localcmd = #46;
-entity(entity) nextent = #47;
-void(string var, string val) cvar_set = #72;
-
-//----------------------------------------------------------------------
-// Builtin list
-//----------------------------------------------------------------------
-vector(vector fwd, optional vector up) vectoangles2 = #51; /*
-               Returns the angles (+x=UP) required to orient an entity to look in the given direction. The 'up' argument is required if you wish to set a roll angle, otherwise it will be limited to just monster-style turning. */
-
-float(float angle) sin = #60;
-float(float angle) cos = #61;
-float(float value) sqrt = #62;
-void(entity ent, entity ignore) tracetoss = #64;
-string(entity ent) etos = #65;
-string(entity e, string key) infokey = #80; /*
-               If e is world, returns the field 'key' from either the serverinfo or the localinfo. If e is a player, returns the value of 'key' from the player's userinfo string. There are a few special exceptions, like 'ip' which is not technically part of the userinfo. */
-
-float(entity e, string key) infokeyf = #0; /*
-               Identical to regular infokey, but returns it as a float instead of creating new tempstrings. */
-
-float(string) stof = #81;
-#define unicast(pl,reli) do{msg_entity = pl; multicast('0 0 0', reli?MULITCAST_ONE_R:MULTICAST_ONE);}while(0)
-void(vector where, float set) multicast = #82; /*
-               Once the MSG_MULTICAST network message buffer has been filled with data, this builtin is used to dispatch it to the given target, filtering by pvs for reduced network bandwidth. */
-
-void(vector start, vector mins, vector maxs, vector end, float nomonsters, entity ent) tracebox = #90; /*
-               Exactly like traceline, but a box instead of a uselessly thin point. Acceptable sizes are limited by bsp format, q1bsp has strict acceptable size values. */
-
-vector() randomvec = #91; /*
-               Returns a vector with random values. Each axis is independantly a value between -1 and 1 inclusive. */
-
-vector(vector org) getlight = #92;
-float(string cvarname, string defaultvalue) registercvar = #93; /*
-               Creates a new cvar on the fly. If it does not already exist, it will be given the specified value. If it does exist, this is a no-op.
-               This builtin has the limitation that it does not apply to configs or commandlines. Such configs will need to use the set or seta command causing this builtin to be a noop.
-               In engines that support it, you will generally find the autocvar feature easier and more efficient to use. */
-
-float(float a, float b, ...) min = #94; /*
-               Returns the lowest value of its arguments. */
-
-float(float a, float b, ...) max = #95; /*
-               Returns the highest value of its arguments. */
-
-float(float minimum, float val, float maximum) bound = #96; /*
-               Returns val, unless minimum is higher, or maximum is less. */
-
-float(float value, float exp) pow = #97;
-#define findentity findfloat
-entity(entity start, .__variant fld, __variant match) findfloat = #98; /*
-               Equivelent to the find builtin, but instead of comparing strings contents, this builtin compares the raw values. This builtin requires multiple calls in order to scan all entities - set start to the previous call's return value.
-               world is returned when there are no more entities. */
-
-float(string extname) checkextension = #99; /*
-               Checks for an extension by its name (eg: checkextension("FRIK_FILE") says that its okay to go ahead and use strcat).
-               Use cvar("pr_checkextension") to see if this builtin exists. */
-
-float(__variant funcref) checkbuiltin = #0; /*
-               Checks to see if the specified builtin is supported/mapped. This is intended as a way to check for #0 functions, allowing for simple single-builtin functions. */
-
-//----------------------------------------------------------------------
-// 100-199 Range
-//----------------------------------------------------------------------
-float(string builtinname) builtin_find = #100; /*
-               Looks to see if the named builtin is valid, and returns the builtin number it exists at. */
-
-float(float value) anglemod = #102;
-filestream(string filename, float mode, optional float mmapminsize) fopen = #110; /*
-               Opens a file, typically prefixed with "data/", for either read or write access. */
-
-void(filestream fhandle) fclose = #111;
-string(filestream fhandle) fgets = #112; /*
-               Reads a single line out of the file. The new line character is not returned as part of the string. Returns the null string on EOF (use if not(string) to easily test for this, which distinguishes it from the empty string which is returned if the line being read is blank */
-
-void(filestream fhandle, string s, optional string s2, optional string s3, optional string s4, optional string s5, optional string s6, optional string s7) fputs = #113; /*
-               Writes the given string(s) into the file. For compatibility with fgets, you should ensure that the string is terminated with a \n - this will not otherwise be done for you. It is up to the engine whether dos or unix line endings are actually written. */
-
-#define ftell fseek //c-compat
-int(filestream fhandle, optional int newoffset) fseek = #0; /*
-               Changes the current position of the file, if specified. Returns prior position, in bytes. */
-
-float(string s) strlen = #114;
-string(string s1, optional string s2, optional string s3, optional string s4, optional string s5, optional string s6, optional string s7, optional string s8) strcat = #115;
-string(string s, float start, float length) substring = #116;
-vector(string s) stov = #117;
-string(string s, ...) strzone = #118; /*
-               Create a semi-permanent copy of a string that only becomes invalid once strunzone is called on the string (instead of when the engine assumes your string has left scope). */
-
-void(string s) strunzone = #119; /*
-               Destroys a string that was allocated by strunzone. Further references to the string MAY crash the game. */
-
-//----------------------------------------------------------------------
-// 200-299 FTE Range
-//----------------------------------------------------------------------
-float(float number, float quantity) bitshift = #218;
-void(vector org) te_lightningblood = #219;
-float(string s1, string sub, optional float startidx) strstrofs = #221; /*
-               Returns the 0-based offset of sub within the s1 string, or -1 if sub is not in s1.
-               If startidx is set, this builtin will ignore matches before that 0-based offset. */
-
-float(string str, float index) str2chr = #222; /*
-               Retrieves the character value at offset 'index'. */
-
-string(float chr, ...) chr2str = #223; /*
-               The input floats are considered character values, and are concatenated. */
-
-string(float ccase, float redalpha, float redchars, string str, ...) strconv = #224; /*
-               Converts quake chars in the input string amongst different representations.
-               ccase specifies the new case for letters.
-                0: not changed.
-                1: forced to lower case.
-                2: forced to upper case.
-               redalpha and redchars switch between colour ranges.
-                0: no change.
-                1: Forced white.
-                2: Forced red.
-                3: Forced gold(low) (numbers only).
-                4: Forced gold (high) (numbers only).
-                5+6: Forced to white and red alternately.
-               You should not use this builtin in combination with UTF-8. */
-
-string(float pad, string str1, ...) strpad = #225; /*
-               Pads the string with spaces, to ensure its a specific length (so long as a fixed-width font is used, anyway). If pad is negative, the spaces are added on the left. If positive the padding is on the right. */
-
-string(infostring old, string key, string value) infoadd = #226; /*
-               Returns a new tempstring infostring with the named value changed (or added if it was previously unspecified). Key and value may not contain the \ character. */
-
-string(infostring info, string key) infoget = #227; /*
-               Reads a named value from an infostring. The returned value is a tempstring */
-
-#define strcmp strncmp
-float(string s1, string s2, optional float len, optional float s1ofs, optional float s2ofs) strncmp = #228; /*
-               Compares up to 'len' chars in the two strings. s1ofs allows you to treat s2 as a substring to compare against, or should be 0.
-               Returns 0 if the two strings are equal, a negative value if s1 appears numerically lower, and positive if s1 appears numerically higher. */
-
-float(string s1, string s2) strcasecmp = #229; /*
-               Compares the two strings without case sensitivity.
-               Returns 0 if they are equal. The sign of the return value may be significant, but should not be depended upon. */
-
-float(string s1, string s2, float len, optional float s1ofs, optional float s2ofs) strncasecmp = #230; /*
-               Compares up to 'len' chars in the two strings without case sensitivity. s1ofs allows you to treat s2 as a substring to compare against, or should be 0.
-               Returns 0 if they are equal. The sign of the return value may be significant, but should not be depended upon. */
-
-string(string s) strtrim = #0; /*
-               Trims the whitespace from the start+end of the string. */
-
-void(float num, float type, .__variant fld) clientstat = #232; /*
-               Specifies what data to use in order to send various stats, in a client-specific way.
-               'num' should be a value between 32 and 127, other values are reserved.
-               'type' must be set to one of the EV_* constants, one of EV_FLOAT, EV_STRING, EV_INTEGER, EV_ENTITY.
-               fld must be a reference to the field used, each player will be sent only their own copy of these fields. */
-
-void(float num, float type, string name) globalstat = #233; /*
-               Specifies what data to use in order to send various stats, in a non-client-specific way. num and type are as in clientstat, name however, is the name of the global to read in the form of a string (pass "foo"). */
-
-void(float num, float type, __variant *address) pointerstat = #0; /*
-               Specifies what data to use in order to send various stats, in a non-client-specific way. num and type are as in clientstat, address however, is the address of the variable you would like to use (pass &foo). */
-
-float(entity player) isbackbuffered = #234; /*
-               Returns if the given player's network buffer will take multiple network frames in order to clear. If this builtin returns non-zero, you should delay or reduce the amount of reliable (and also unreliable) data that you are sending to that client. */
-
-void(vector org, float count) te_bloodqw = #239;
-float(float a, float n) mod = #245;
-int(string) stoi = #259; /*
-               Converts the given string into a true integer. Base 8, 10, or 16 is determined based upon the format of the string. */
-
-string(int) itos = #260; /*
-               Converts the passed true integer into a base10 string. */
-
-int(string) stoh = #261; /*
-               Reads a base-16 string (with or without 0x prefix) as an integer. Bugs out if given a base 8 or base 10 string. :P */
-
-string(int) htos = #262; /*
-               Formats an integer as a base16 string, with leading 0s and no prefix. Always returns 8 characters. */
-
-int(float) ftoi = #0; /*
-               Converts the given float into a true integer without depending on extended qcvm instructions. */
-
-float(int) itof = #0; /*
-               Converts the given true integer into a float without depending on extended qcvm instructions. */
-
-#ifndef dotproduct
-#define dotproduct(v1,v2) ((vector)(v1)*(vector)(v2))
-#endif
-vector(vector v1, vector v2) crossproduct = #0; /*
-               Small helper function to calculate the crossproduct of two vectors. */
-
-float(float modidx, string framename) frameforname = #276; /*
-               Looks up a framegroup from a model by name, avoiding the need for hardcoding. Returns -1 on error. */
-
-float(float modidx, float framenum) frameduration = #277; /*
-               Retrieves the duration (in seconds) of the specified framegroup. */
-
-void(float buf, float fl) WriteFloat = #280;
-string(float modidx, float framenum) frametoname = #284;
-float(string name) checkcommand = #294; /*
-               Checks to see if the supplied name is a valid command, cvar, or alias. Returns 0 if it does not exist. */
-
-// ----------------------------------------------------------------------
-// 300-399 Range - Moved to CSQC DEFS file
-// ----------------------------------------------------------------------
-
-//----------------------------------------------------------------------
-// 400-499 DP Range
-//----------------------------------------------------------------------
-entity(entity from, optional entity to) copyentity = #400; /*
-               Copies all fields from one entity to another. */
-
-void(entity ent, float colours) setcolors = #401; /*
-               Changes a player's colours. The bits 0-3 are the lower/trouser colour, bits 4-7 are the upper/shirt colours. */
-
-entity(.string field, string match) findchain = #402;
-entity(.float fld, float match) findchainfloat = #403;
-void(vector org, vector dir, float count) te_blood = #405;
-void(vector mincorner, vector maxcorner, vector vel, float howmany, float color) te_particlerain = #409;
-void(vector mincorner, vector maxcorner, vector vel, float howmany, float color) te_particlesnow = #410;
-void(vector org, optional float count) te_gunshot = #418;
-void(vector org) te_spike = #419;
-void(vector org) te_superspike = #420;
-void(vector org) te_explosion = #421;
-void(vector org) te_tarexplosion = #422;
-void(vector org) te_wizspike = #423;
-void(vector org) te_knightspike = #424;
-void(vector org) te_lavasplash = #425;
-void(vector org) te_teleport = #426;
-void(vector org, float color, float colorlength) te_explosion2 = #427;
-void(entity own, vector start, vector end) te_lightning1 = #428;
-void(entity own, vector start, vector end) te_lightning2 = #429;
-void(entity own, vector start, vector end) te_lightning3 = #430;
-void(entity own, vector start, vector end) te_beam = #431;
-void(vector dir) vectorvectors = #432;
-float(entity e, float s) getsurfacenumpoints = #434;
-vector(entity e, float s, float n) getsurfacepoint = #435;
-vector(entity e, float s) getsurfacenormal = #436;
-string(entity e, float s) getsurfacetexture = #437;
-float(entity e, vector p) getsurfacenearpoint = #438;
-vector(entity e, float s, vector p) getsurfaceclippedpoint = #439;
-void(entity e, string s) clientcommand = #440;
-float(string s) tokenize = #441;
-string(float n) argv = #442;
-float() argc = #0;
-void(entity e, entity tagentity, string tagname) setattachment = #443; /* */
-
-searchhandle(string pattern, optional float caseinsensitive, optional float quiet) search_begin = #444; /*
-               initiate a filesystem scan based upon filenames. Be sure to call search_end on the returned handle. */
-
-void(searchhandle handle) search_end = #445; /* */
-
-float(searchhandle handle) search_getsize = #446; /*
-                Retrieves the number of files that were found. */
-
-string(searchhandle handle, float num) search_getfilename = #447; /*
-               Retrieves name of one of the files that was found by the initial search. */
-
-float(searchhandle handle, float num) search_getfilesize = #0; /*
-               Retrieves the size of one of the files that was found by the initial search. */
-
-string(searchhandle handle, float num) search_getfilemtime = #0; /*
-               Retrieves modification time of one of the files in %Y-%m-%d %H:%M:%S format. */
-
-string(string cvarname) cvar_string = #448;
-entity(entity start, .float fld, float match) findflags = #449;
-entity(.float fld, float match) findchainflags = #450;
-void(entity player) dropclient = #453;
-entity() spawnclient = #454; /*
-               Spawns a dummy player entity.
-               Note that such dummy players will be carried from one map to the next.
-               Warning: DP_SV_CLIENTCOLORS DP_SV_CLIENTNAME are not implemented in quakespasm, so use KRIMZON_SV_PARSECLIENTCOMMAND's clientcommand builtin to change the bot's name/colours/skin/team/etc, in the same way that clients would ask. */
-
-float(entity client) clienttype = #455;
-void(float target, string str) WriteUnterminatedString = #456;
-entity(float entnum) edict_num = #459;
-strbuf() buf_create = #460;
-void(strbuf bufhandle) buf_del = #461;
-float(strbuf bufhandle) buf_getsize = #462;
-void(strbuf bufhandle_from, strbuf bufhandle_to) buf_copy = #463;
-void(strbuf bufhandle, float sortprefixlen, float backward) buf_sort = #464;
-string(strbuf bufhandle, string glue) buf_implode = #465;
-string(strbuf bufhandle, float string_index) bufstr_get = #466;
-void(strbuf bufhandle, float string_index, string str) bufstr_set = #467;
-float(strbuf bufhandle, string str, float order) bufstr_add = #468;
-void(strbuf bufhandle, float string_index) bufstr_free = #469;
-float(float s) asin = #471;
-float(float c) acos = #472;
-float(float t) atan = #473;
-float(float c, float s) atan2 = #474;
-float(float a) tan = #475;
-float(string s) strlennocol = #476; /*
-               Returns the number of characters in the string after any colour codes or other markup has been parsed. */
-
-string(string s) strdecolorize = #477; /*
-               Flattens any markup/colours, removing them from the string. */
-
-string(float uselocaltime, string format, ...) strftime = #478;
-float(string s, string separator1, ...) tokenizebyseparator = #479;
-string(string s) strtolower = #480;
-string(string s) strtoupper = #481;
-string(string s) cvar_defstring = #482;
-void(vector origin, string sample, float volume, float attenuation) pointsound = #483;
-string(string search, string replace, string subject) strreplace = #484;
-string(string search, string replace, string subject) strireplace = #485;
-vector(entity e, float s, float n, float a) getsurfacepointattribute = #486;
-float(float caseinsensitive, string s, ...) crc16 = #494;
-float(string name) cvar_type = #495;
-float() numentityfields = #496; /*
-               Gives the number of named entity fields. Note that this is not the size of an entity, but rather just the number of unique names (ie: vectors use 4 names rather than 3). */
-
-float(string fieldname) findentityfield = #0; /*
-               Find a field index by name. */
-
-typedef .__variant field_t;
-field_t(float fieldnum) entityfieldref = #0; /*
-               Returns a field value that can be directly used to read entity fields. Be sure to validate the type with entityfieldtype before using. */
-
-string(float fieldnum) entityfieldname = #497; /*
-               Retrieves the name of the given entity field. */
-
-float(float fieldnum) entityfieldtype = #498; /*
-               Provides information about the type of the field specified by the field num. Returns one of the EV_ values. */
-
-string(float fieldnum, entity ent) getentityfieldstring = #499;
-
-//----------------------------------------------------------------------
-// 500-599 Range
-//----------------------------------------------------------------------
-float(float fieldnum, entity ent, string s) putentityfieldstring = #500;
-string(string filename, optional float makereferenced) whichpack = #503; /*
-               Returns the pak file name that contains the file specified. progs/player.mdl will generally return something like 'pak0.pak'. If makereferenced is true, clients will automatically be told that the returned package should be pre-downloaded and used, even if allow_download_refpackages is not set. */
-
-string(string in) uri_escape = #510;
-string(string in) uri_unescape = #511;
-float(entity ent) num_for_edict = #512;
-float(string str) tokenize_console = #514; /*
-               Tokenize a string exactly as the console's tokenizer would do so. The regular tokenize builtin became bastardized for convienient string parsing, which resulted in a large disparity that can be exploited to bypass checks implemented in a naive SV_ParseClientCommand function, therefore you can use this builtin to make sure it exactly matches. */
-
-float(float idx) argv_start_index = #515; /*
-               Returns the character index that the tokenized arg started at. */
-
-float(float idx) argv_end_index = #516; /*
-               Returns the character index that the tokenized arg stopped at. */
-
-string(string cvarname) cvar_description = #518; /*
-               Retrieves the description of a cvar, which might be useful for tooltips or help files. This may still not be useful. */
-
-float(optional float timetype) gettime = #519;
-string(string command, optional float bindmap) findkeysforcommand = #521; /*
-               Returns a list of keycodes that perform the given console command in a format that can only be parsed via tokenize (NOT tokenize_console). This always returns at least two values - if only one key is actually bound, -1 will be returned. The bindmap argument is listed for compatibility with dp-specific defs, but is ignored in FTE. */
-
-string(string command, optional float bindmap) findkeysforcommandex = #0; /*
-               Returns a list of key bindings in keyname format instead of keynums. Use tokenize to parse. This list may contain modifiers. May return large numbers of keys. */
-
-float(float v, optional float base) log = #532; /*
-               Determines the logarithm of the input value according to the specified base. This can be used to calculate how much something was shifted by. */
-
-float(string filename, strbuf bufhandle) buf_loadfile = #535; /*
-               Appends the named file into a string buffer (which must have been created in advance). The return value merely says whether the file was readable. */
-
-float(filestream filehandle, strbuf bufhandle, optional float startpos, optional float numstrings) buf_writefile = #536; /*
-               Writes the contents of a string buffer onto the end of the supplied filehandle (you must have already used fopen). Additional optional arguments permit you to constrain the writes to a subsection of the stringbuffer. */
-
-//----------------------------------------------------------------------
-// 600-699 Range
-//----------------------------------------------------------------------
-void(.../*, string funcname*/) callfunction = #605; /*
-               Invokes the named function. The function name is always passed as the last parameter and must always be present. The others are passed to the named function as-is */
-
-float(string s) isfunction = #607; /*
-               Returns true if the named function exists and can be called with the callfunction builtin. */
-
-float(entity e, string s, optional float offset) parseentitydata = #613; /*
-               Reads a single entity's fields into an already-spawned entity. s should contain field pairs like in a saved game: {"foo1" "bar" "foo2" "5"}. Returns <=0 on failure, otherwise returns the offset in the string that was read to. */
-
-string(string fmt, ...) sprintf = #627;
-float(entity e, float s) getsurfacenumtriangles = #628;
-vector(entity e, float s, float n) getsurfacetriangle = #629;
-
-//----------------------------------------------------------------------
-//Builtin Stubs List - present for simpler compatibility
-// Not properly supported in QuakeSpasm at this time
-//----------------------------------------------------------------------
-/*
-void(vector org, string modelname, float startframe, float endframe, float framerate) effect = #404;
-void(vector mincorner, vector maxcorner, float explosionspeed, float howmany) te_bloodshower = #406;
-void(vector org, vector color) te_explosionrgb = #407;
-void(vector mincorner, vector maxcorner, vector vel, float howmany, float color, float gravityflag, float randomveljitter) te_particlecube = #408;
-void(vector org, vector vel, float howmany) te_spark = #411;
-void(vector org) te_gunshotquad = #412;
-void(vector org) te_spikequad = #413;
-void(vector org) te_superspikequad = #414;
-void(vector org) te_explosionquad = #415;
-void(vector org) te_smallflash = #416;
-void(vector org, float radius, float lifetime, vector color) te_customflash = #417;
-void(vector org) te_plasmaburn = #433;
-*/
-
-//----------------------------------------------------------------------
-// Keyboard input values
-//----------------------------------------------------------------------
-const float K_TAB = 9;
-const float K_ENTER = 13;
-const float K_ESCAPE = 27;
-const float K_SPACE = 32;
-const float K_BACKSPACE = 127;
-const float K_UPARROW = 128;
-const float K_DOWNARROW = 129;
-const float K_LEFTARROW = 130;
-const float K_RIGHTARROW = 131;
-const float K_ALT = 132;
-const float K_CTRL = 133;
-const float K_SHIFT = 134;
-const float K_F1 = 135;
-const float K_F2 = 136;
-const float K_F3 = 137;
-const float K_F4 = 138;
-const float K_F5 = 139;
-const float K_F6 = 140;
-const float K_F7 = 141;
-const float K_F8 = 142;
-const float K_F9 = 143;
-const float K_F10 = 144;
-const float K_F11 = 145;
-const float K_F12 = 146;
-const float K_INS = 147;
-const float K_DEL = 148;
-const float K_PGDN = 149;
-const float K_PGUP = 150;
-const float K_HOME = 151;
-const float K_END = 152;
-const float K_KP_SLASH = 168;
-const float K_KP_STAR = 169;
-const float K_KP_MINUS = 170;
-const float K_KP_HOME = 164;
-const float K_KP_UPARROW = 165;
-const float K_KP_PGUP = 166;
-const float K_KP_PLUS = 171;
-const float K_KP_LEFTARROW = 161;
-const float K_KP_5 = 162;
-const float K_KP_RIGHTARROW = 163;
-const float K_KP_END = 158;
-const float K_KP_DOWNARROW = 159;
-const float K_KP_PGDN = 160;
-const float K_KP_ENTER = 172;
-const float K_KP_INS = 157;
-const float K_KP_DEL = 167;
-const float K_COMMAND = -170;
-const float K_MOUSE1 = 512;
-const float K_MOUSE2 = 513;
-const float K_MOUSE3 = 514;
-const float K_JOY1 = 768;
-const float K_JOY2 = 769;
-const float K_JOY3 = 770;
-const float K_JOY4 = 771;
-const float K_AUX1 = 784;
-const float K_AUX2 = 785;
-const float K_AUX3 = 786;
-const float K_AUX4 = 787;
-const float K_AUX5 = 788;
-const float K_AUX6 = 789;
-const float K_AUX7 = 790;
-const float K_AUX8 = 791;
-const float K_AUX9 = 792;
-const float K_AUX10 = 793;
-const float K_AUX11 = 794;
-const float K_AUX12 = 795;
-const float K_AUX13 = 796;
-const float K_AUX14 = 797;
-const float K_AUX15 = 798;
-const float K_AUX16 = 799;
-const float K_AUX17 = 800;
-const float K_AUX18 = 801;
-const float K_AUX19 = 802;
-const float K_AUX20 = 803;
-const float K_AUX21 = 804;
-const float K_AUX22 = 805;
-const float K_AUX23 = 806;
-const float K_AUX24 = 807;
-const float K_AUX25 = 808;
-const float K_AUX26 = 809;
-const float K_AUX27 = 810;
-const float K_AUX28 = 811;
-const float K_AUX29 = 812;
-const float K_AUX30 = 813;
-const float K_AUX31 = 814;
-const float K_AUX32 = 815;
-const float K_MWHEELUP = 515;
-const float K_MWHEELDOWN = 516;
-const float K_MOUSE4 = 517;
-const float K_MOUSE5 = 518;
-const float K_LTHUMB = 822;
-const float K_RTHUMB = 823;
-const float K_LSHOULDER = 824;
-const float K_RSHOULDER = 825;
-const float K_ABUTTON = 826;
-const float K_BBUTTON = 827;
-const float K_XBUTTON = 828;
-const float K_YBUTTON = 829;
-const float K_LTRIGGER = 830;
-const float K_RTRIGGER = 831;
-const float K_PAUSE = 153;
-
-//----------------------------------------------------------------------
-// Reset suppression of ref errors
-#pragma noref 0
-
-//----------------------------------------------------------------------
-// List of advertised extensions (not used, reference only)
-//----------------------------------------------------------------------
-//DP_CON_SET
-//DP_CON_SETA
-//DP_EF_NOSHADOW
-//DP_ENT_ALPHA
-//DP_ENT_COLORMOD
-//DP_ENT_SCALE
-//DP_ENT_TRAILEFFECTNUM
-//DP_INPUTBUTTONS
-//DP_QC_AUTOCVARS
-//DP_QC_ASINACOSATANATAN2TAN
-//DP_QC_COPYENTITY
-//DP_QC_CRC16
-//DP_QC_CVAR_DEFSTRING
-//DP_QC_CVAR_STRING
-//DP_QC_CVAR_TYPE
-//DP_QC_EDICT_NUM
-//DP_QC_ENTITYDATA
-//DP_QC_ETOS
-//DP_QC_FINDCHAIN
-//DP_QC_FINDCHAINFLAGS
-//DP_QC_FINDCHAINFLOAT
-//DP_QC_FINDFLAGS
-//DP_QC_FINDFLOAT
-//DP_QC_GETLIGHT
-//DP_QC_GETSURFACE
-//DP_QC_GETSURFACETRIANGLE
-//DP_QC_GETSURFACEPOINTATTRIBUTE
-//DP_QC_MINMAXBOUND
-//DP_QC_MULTIPLETEMPSTRINGS
-//DP_QC_RANDOMVEC
-//DP_QC_SINCOSSQRTPOW
-//DP_QC_SPRINTF
-//DP_QC_STRFTIME
-//DP_QC_STRING_CASE_FUNCTIONS
-//DP_QC_STRINGBUFFERS
-//DP_QC_STRINGCOLORFUNCTIONS
-//DP_QC_STRREPLACE
-//DP_QC_TOKENIZEBYSEPARATOR
-//DP_QC_TRACEBOX
-//DP_QC_TRACETOSS
-//DP_QC_TRACE_MOVETYPES
-//DP_QC_URI_ESCAPE
-//DP_QC_VECTOANGLES_WITH_ROLL
-//DP_QC_VECTORVECTORS
-//DP_QC_WHICHPACK
-//DP_VIEWZOOM
-//DP_REGISTERCVAR
-//DP_SV_BOTCLIENT
-//DP_SV_DROPCLIENT
-//DP_SV_POINTSOUND
-//DP_SV_PRINT
-//DP_SV_SETCOLOR
-//DP_SV_SPAWNFUNC_PREFIX
-//DP_SV_WRITEUNTERMINATEDSTRING
-//DP_TE_PARTICLERAIN
-//DP_TE_PARTICLESNOW
-//DP_TE_STANDARDEFFECTBUILTINS
-//EXT_BITSHIFT
-//FRIK_FILE
-//FTE_PART_SCRIPT
-//FTE_PART_NAMESPACES
-//FTE_PART_NAMESPACE_EFFECTINFO
-//FTE_QC_CHECKCOMMAND
-//FTE_QC_CROSSPRODUCT
-//FTE_QC_INFOKEY
-//FTE_QC_INTCONV
-//FTE_QC_MULTICAST
-//FTE_STRINGS
-//FTE_SV_POINTPARTICLES
-//KRIMZON_SV_PARSECLIENTCOMMAND
-//ZQ_QC_STRINGS