home *** CD-ROM | disk | FTP | other *** search
/ Superpower (Alt) / SUPERPOWER.iso / q / patch / mbq624 / _srvmods.pat < prev    next >
Encoding:
Text File  |  1996-08-19  |  9.0 KB  |  328 lines
  1. diff -ur -x qcc -x *.exe -x *.list -x *.pl -x *.h qc-ori/buttons.qc qc/buttons.qc
  2. --- qc-ori/buttons.qc    Fri Aug 16 20:15:23 1996
  3. +++ qc/buttons.qc    Sun Aug 18 20:41:45 1996
  4. @@ -55,6 +55,7 @@
  5.  {
  6.      if (other.classname != "player")
  7.          return;
  8. +    if (other.player_flag & PLAYER_IS_OBSERVER) return; //#jp#(Observer)
  9.      self.enemy = other;
  10.      button_fire ();
  11.  };
  12. diff -ur -x qcc -x *.exe -x *.list -x *.pl -x *.h qc-ori/client.qc qc/client.qc
  13. --- qc-ori/client.qc    Fri Aug 16 20:15:23 1996
  14. +++ qc/client.qc    Sun Aug 18 20:41:45 1996
  15. @@ -53,6 +53,7 @@
  16.      parm7 = self.ammo_cells;
  17.      parm8 = self.weapon;
  18.      parm9 = self.armortype * 100;
  19. +        parm16 = self.player_flag; //#jp#(PlayerFlag)
  20.  };
  21.  
  22.  void() SetNewParms =
  23. @@ -66,10 +67,14 @@
  24.      parm6 = 0;
  25.      parm8 = 1;
  26.      parm9 = 0;
  27. +        parm16 = 0; //#jp#(PlayerFlag)
  28.  };
  29.  
  30.  void() DecodeLevelParms =
  31.  {
  32. +        self.player_flag = parm16;            //#jp#(PlayerFlag)
  33. +        self.skin = (self.player_flag & 65280)/256;    //#jp#(Skin)
  34. +
  35.      if (serverflags)
  36.      {
  37.          if (world.model == "maps/start.bsp")
  38. @@ -143,6 +148,7 @@
  39.  // skip any text in deathmatch
  40.      if (deathmatch)
  41.      {
  42. +        MapQueueChooseMap(); //#jp#(MapQueue)
  43.          GotoNextMap ();
  44.          return;
  45.      }
  46. @@ -343,7 +349,9 @@
  47.      if (coop)
  48.      {
  49.          // make a copy of the dead body for appearances sake
  50. +if (!(self.player_flag & PLAYER_IS_OBSERVER)) {//#jp#(Observer)
  51.          CopyToBodyQue (self);
  52. +}//#jp#(Observer)
  53.          // get the spawn parms as they were at level start
  54.          setspawnparms (self);
  55.          // respawn        
  56. @@ -352,9 +360,12 @@
  57.      else if (deathmatch)
  58.      {
  59.          // make a copy of the dead body for appearances sake
  60. +if (!(self.player_flag & PLAYER_IS_OBSERVER)) {//#jp#(Observer)
  61.          CopyToBodyQue (self);
  62. +}//#jp#(Observer)
  63.          // set default spawn parms
  64.          SetNewParms ();
  65. +        parm16 = self.player_flag; //#jp#(PlayerFlag)
  66.          // respawn        
  67.          PutClientInServer ();
  68.      }
  69. @@ -379,6 +390,8 @@
  70.      set_suicide_frame ();
  71.      self.modelindex = modelindex_player;
  72.      self.frags = self.frags - 2;    // extra penalty
  73. +    RankCountEvent(self,RANK_SUICIDE);    //#jp#(Rank)
  74. +    if (KickSuicider(self)) return;        //#jp#(KickSuicider)
  75.      respawn ();
  76.  };
  77.  
  78. @@ -496,6 +509,20 @@
  79.      
  80.      self.view_ofs = '0 0 22';
  81.  
  82. +if (!self.kick_suicider_lasttime)                //#jp#(KickSuicider)
  83. +   self.kick_suicider_lasttime = time - 100000;            //#jp#(KickSuicider)
  84. +
  85. +if (!self.player_flag) {                    //#jp#(PlayerFlag)
  86. +   PlayerFlagSetFlag(self,PLAYER_IS_CLIENT);            //#jp#(PlayerFlag)
  87. +   PlayerFlagSetFlag(self,PLAYER_IS_OBSERVER);            //#jp#(Observer)
  88. +   self.observer_status = OBSERVER_BECOME_OBSERVER;        //#jp#(Observer)
  89. +}                                //#jp#(PlayerFlag)
  90. +
  91. +if (self.observer_status & OBSERVER_BECOME_OBSERVER) {        //#jp#(Observer)
  92. +   ObserverBecomeObserver(self);                //#jp#(Observer)
  93. +   return;                            //#jp#(Observer)
  94. +}                                //#jp#(Observer)
  95. +
  96.      player_stand1 ();
  97.      
  98.      if (deathmatch || coop)
  99. @@ -654,6 +681,7 @@
  100.      }
  101.  
  102.      nextmap = o.map;
  103. +    MapQueueChooseMap(); //#jp#(MapQueue)
  104.      
  105.      if (o.nextthink < time)
  106.      {
  107. @@ -737,6 +765,11 @@
  108.          return;
  109.      }
  110.  
  111. +   // check if player turned into observer //#jp#(Observer)
  112. +   if (ObserverDeathThink()) {             //#jp#(Observer)
  113. +      return;                              //#jp#(Observer)
  114. +   }
  115. +
  116.  // wait for any button down
  117.      if (!self.button2 && !self.button1 && !self.button0)
  118.          return;
  119. @@ -948,6 +981,18 @@
  120.          return;
  121.      }
  122.      
  123. +    if (!(self.player_flag & PLAYER_PASSED_MOTD)) {    //#jp#(Motd)
  124. +       if (!(self.player_flag & PLAYER_IS_INITIALIZED)) {//#jp#(Modules)
  125. +              ModulesInitModules(self);            //#jp#(Modules)
  126. +           }                        //#jp#(Modules)
  127. +           MotdThink();                    //#jp#(Motd)
  128. +    }                        //#jp#(Motd)
  129. +
  130. +    if (self.player_flag & PLAYER_IS_OBSERVER) {    //#jp#(Observer)
  131. +       ObserverThink();                //#jp#(Observer)
  132. +           return;                    //#jp#(Observer)
  133. +    }                        //#jp#(Observer)
  134. +
  135.      if (self.deadflag == DEAD_DYING)
  136.          return;    // dying, so do nothing
  137.  
  138. @@ -1217,6 +1262,8 @@
  139.      local    float rnum;
  140.      local    string deathstring, deathstring2;
  141.      rnum = random();
  142. +
  143. +    RankClientObituary(targ,attacker); //#jp#(Rank)
  144.  
  145.      if (targ.classname == "player")
  146.      {
  147. diff -ur -x qcc -x *.exe -x *.list -x *.pl -x *.h qc-ori/items.qc qc/items.qc
  148. --- qc-ori/items.qc    Fri Aug 16 20:15:23 1996
  149. +++ qc/items.qc    Sun Aug 18 20:41:45 1996
  150. @@ -168,10 +168,12 @@
  151.              return;
  152.      }
  153.      
  154. +     if (!USE_MODULE_MESSAGES || messages_flag & MESSAGES_HEALTH) { //#jp#(Messages)
  155.      sprint(other, "You receive ");
  156.      s = ftos(self.healamount);
  157.      sprint(other, s);
  158.      sprint(other, " health\n");
  159. +     }                    //#jp#(Messages)
  160.      
  161.  // health touch sound
  162.      sound(other, CHAN_ITEM, self.noise, 1, ATTN_NORM);
  163. @@ -275,6 +277,7 @@
  164.          self.nextthink = time + 20;
  165.      self.think = SUB_regen;
  166.  
  167. +    if (!USE_MODULE_MESSAGES || messages_flag & MESSAGES_ARMOR) //#jp#(Messages)
  168.      sprint(other, "You got armor\n");
  169.  // armor touch sound
  170.      sound(other, CHAN_ITEM, "items/armor1.wav", 1, ATTN_NORM);
  171. @@ -460,9 +463,11 @@
  172.      else
  173.          objerror ("weapon_touch: unknown classname");
  174.  
  175. +    if (!USE_MODULE_MESSAGES || messages_flag & MESSAGES_WEAPON) {//#jp#(Messages)
  176.      sprint (other, "You got the ");
  177.      sprint (other, self.netname);
  178.      sprint (other, "\n");
  179. +    }//#jp#(Messages)
  180.  // weapon touch sound
  181.      sound (other, CHAN_ITEM, "weapons/pkup.wav", 1, ATTN_NORM);
  182.      stuffcmd (other, "bf\n");
  183. @@ -645,9 +650,11 @@
  184.  
  185.      bound_other_ammo ();
  186.      
  187. +    if (!USE_MODULE_MESSAGES || messages_flag & MESSAGES_AMMO) {//#jp#(Messages)
  188.      sprint (other, "You got the ");
  189.      sprint (other, self.netname);
  190.      sprint (other, "\n");
  191. +    }//#jp#(Messages)
  192.  // ammo touch sound
  193.      sound (other, CHAN_ITEM, "weapons/lock4.wav", 1, ATTN_NORM);
  194.      stuffcmd (other, "bf\n");
  195. @@ -879,9 +886,11 @@
  196.      if (other.items & self.items)
  197.          return;
  198.  
  199. +    if (!USE_MODULE_MESSAGES || messages_flag & MESSAGES_KEY) {//#jp#(Messages)
  200.      sprint (other, "You got the ");
  201.      sprint (other, self.netname);
  202.      sprint (other,"\n");
  203. +    }//#jp#(Messages)
  204.  
  205.      sound (other, CHAN_ITEM, self.noise, 1, ATTN_NORM);
  206.      stuffcmd (other, "bf\n");
  207. @@ -1086,9 +1095,11 @@
  208.      if (other.health <= 0)
  209.          return;
  210.  
  211. +    if (!USE_MODULE_MESSAGES || messages_flag & MESSAGES_POWERUP) {//#jp#(Messages)
  212.      sprint (other, "You got the ");
  213.      sprint (other, self.netname);
  214.      sprint (other,"\n");
  215. +    }//#jp#(Messages)
  216.  
  217.      if (deathmatch)
  218.      {
  219. @@ -1254,6 +1265,7 @@
  220.      
  221.      bound_other_ammo ();
  222.  
  223. +    if (!USE_MODULE_MESSAGES || messages_flag & MESSAGES_BACKPACK) {//#jp#(Messages)
  224.      sprint (other, "You get ");
  225.  
  226.      if (self.ammo_shells)
  227. @@ -1282,6 +1294,8 @@
  228.      }
  229.      
  230.      sprint (other, "\n");
  231. +    }//#jp#(Messages)
  232. +
  233.  // backpack touch sound
  234.      sound (other, CHAN_ITEM, "weapons/lock4.wav", 1, ATTN_NORM);
  235.      stuffcmd (other, "bf\n");
  236. diff -ur -x qcc -x *.exe -x *.list -x *.pl -x *.h qc-ori/progs.src qc/progs.src
  237. --- qc-ori/progs.src    Fri Aug 16 20:15:23 1996
  238. +++ qc/progs.src    Sun Aug 18 20:41:45 1996
  239. @@ -1,6 +1,18 @@
  240.  ../progs.dat
  241.  
  242.  defs.qc
  243. +
  244. +_modules.qh
  245. +_playflg.qh
  246. +_kckscdr.qh
  247. +_mapque.qh
  248. +_message.qh
  249. +_motd.qh
  250. +_rank.qh
  251. +_skin.qh
  252. +_observe.qh
  253. +_server.qh
  254. +
  255.  subs.qc
  256.  fight.qc
  257.  ai.qc
  258. @@ -33,3 +45,14 @@
  259.  shalrath.qc        // registered
  260.  enforcer.qc        // registered
  261.  oldone.qc        // registered
  262. +
  263. +_playflg.qc
  264. +_kckscdr.qc
  265. +_mapque.qc
  266. +_message.qc
  267. +_modules.qc
  268. +_motd.qc
  269. +_observe.qc
  270. +_skin.qc
  271. +_rank.qc
  272. +_server.qc
  273. diff -ur -x qcc -x *.exe -x *.list -x *.pl -x *.h qc-ori/weapons.qc qc/weapons.qc
  274. --- qc-ori/weapons.qc    Fri Aug 16 20:15:23 1996
  275. +++ qc/weapons.qc    Sun Aug 18 20:41:45 1996
  276. @@ -1066,6 +1066,8 @@
  277.  void() CycleWeaponCommand =
  278.  {
  279.      local    float    it, am;
  280. +
  281. +    if (self.player_flag & PLAYER_IS_OBSERVER) return;  //#jp#(Observer)
  282.      
  283.      it = self.items;
  284.      self.impulse = 0;
  285. @@ -1172,6 +1174,31 @@
  286.  
  287.      if (self.impulse == 255)
  288.          QuadCheat ();
  289. +
  290. +       
  291. +        if (self.impulse >= 200) {                //#jp#(Modules)
  292. +           if (self.impulse == 200) {                //#jp#(Skin)
  293. +          if (USE_MODULE_SKIN) SkinUseOtherSkin(self,1);    //#jp#(Skin)
  294. +           }                            //#jp#(Skin)
  295. +           else if (self.impulse == 201) {            //#jp#(Skin)
  296. +          if (USE_MODULE_SKIN) SkinUseOtherSkin(self,(-1));    //#jp#(Skin)
  297. +           }                            //#jp#(Skin)
  298. +           else if (self.impulse == 202) {            //#jp#(Skin)
  299. +          if (USE_MODULE_SKIN) SkinHelp(self);        //#jp#(Skin)
  300. +           }                            //#jp#(Skin)
  301. +           else if (self.impulse == 203) {            //#jp#(Rank)
  302. +              if (USE_MODULE_RANK) RankDumpRanksToConsole(self);//#jp#(Rank)
  303. +           }                            //#jp#(Rank)
  304. +           else if (self.impulse == 204) {            //#jp#(Rank)
  305. +              if (USE_MODULE_RANK) RankHelp(self);        //#jp#(Rank)
  306. +           }                            //#jp#(Rank)
  307. +           else if (self.impulse == 205) {            //#jp#(Observer)
  308. +              if (USE_MODULE_OBSERVER) ObserverHelp(self);    //#jp#(Observer)
  309. +           }                            //#jp#(Observer)
  310. +           else if (self.impulse == 206) {            //#jp#(Server)
  311. +              if (USE_MODULE_SERVER) ServerHelp(self);        //#jp#(Server)
  312. +           }                            //#jp#(Server)
  313. +        }                            //#jp#(Modules)
  314.          
  315.      self.impulse = 0;
  316.  };
  317. diff -ur -x qcc -x *.exe -x *.list -x *.pl -x *.h qc-ori/world.qc qc/world.qc
  318. --- qc-ori/world.qc    Fri Aug 16 20:15:23 1996
  319. +++ qc/world.qc    Sun Aug 18 20:41:45 1996
  320. @@ -377,6 +377,7 @@
  321.  // respawned elsewhere
  322.  void(entity ent) CopyToBodyQue =
  323.  {
  324. +    bodyque_head.skin = ent.skin; //#jp#(Skin)
  325.      bodyque_head.angles = ent.angles;
  326.      bodyque_head.model = ent.model;
  327.      bodyque_head.modelindex = ent.modelindex;
  328.