← Back to branch summary

~armagetronad-ap/armagetronad/BattleMania

« back to all changes in this revision

Viewing changes to src/engine/cycle.php

  • Committer: zodiacsohma1 at gmail
  • Date: 2014-03-07 04:20:29 UTC
  • Revision ID: zodiacsohma1@gmail.com-20140307042029-34oc5evovei40uik
Added #death_time variable to cycle.php
Renamed Attack functions to suitable names which make better sense and purpose.
Renamed KillTheKingInteract function to KillTheKingInteractAllowed for purposeful definition.
Renamed RandomColors function to RandomColorsRGB for purposeful definition.
Changed the integer value of DELAY_COMMAND function to float value.
Used BridgePieces function in config.php to grab values.
Simplify the chat string in chat.php for script memory check.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/engine/cycle.php
20
20
    var $rubber = 0;        //!< Rubber the cycle has currently has
21
21
    var $total_rubber = 0;  //!< Rubber the cycle had at the beginning of the round
22
22
 
23
 
    var $alive = false; //!< Flag for whether cycle is alive or dead
 
23
    var $alive = false;     //!< Flag for whether cycle is alive or dead
 
24
    var $death_time = 0;    //!< The time of last death
24
25
 
25
26
    var $bounty = null; //!< The bounty data for this player
26
27
 
280
281
            }
281
282
 
282
283
            $cycle->ResetParalyze();
283
 
            $cycle->deathTime = Base::$base->TIMER->gameTimer();
 
284
            $cycle->death_time = Base::$base->TIMER->gameTimer();
284
285
 
285
286
            if ((Base::$base->game_mode == 2) && Base::$base->respawn)
286
287
                respawn_player($player, $cycle->spawn_pos, $cycle->spawn_dir);