Ignore:
Timestamp:
May 7, 2011, 4:06:03 PM (12 years ago)
Author:
Sam Hocevar
Message:

data: remove exact duplicate Lisp files, merge all main space Lisp files,
and move most frabs addons to the main data directory.

Location:
abuse/trunk/data/addon/aliens
Files:
1 added
23 moved

Legend:

Unmodified
Added
Removed
  • abuse/trunk/data/addon/aliens/powerold.lsp

    r588 r589  
    1111        (progn
    1212           (with_object (bg) (make_view_solid (find_rgb 255 255 255)))
    13            (with_object (bg) (setq special_power SHLAMP))
     13           (with_object (bg) (setq special_power SHLAMP_POWER))
    1414           (with_object (add_object_after SHLMP2 (x) (y)) (link_object (bg)))
    1515           (with_object (add_object_after WTW (x) (y)) (link_object (bg)))
     
    3232        (set_light_y (get_light 0) (y)))
    3333    nil)
    34   (if (not (eq (with_object (get_object 0) special_power) SHLAMP))
     34  (if (not (eq (with_object (get_object 0) special_power) SHLAMP_POWER))
    3535        (progn
    3636        (if (eq (total_lights) 1)
     
    6565      'SNEAKY_POWER
    6666      'HEALTH_POWER
    67         'SHLAMP)
     67      'SHLAMP_POWER)
    6868
    6969(defun give_player_health (amount)
     
    154154                        (put_image (- (view_x2) 20) (+ (view_y1) 5) sneaky_image))
    155155                                 (sneaky_draw used_special_power (player_number)))
    156                    (SHLAMP (player_draw (player_number))
     156                   (SHLAMP_POWER (player_draw (player_number))
    157157                                 (if (local_player)
    158158                                     (put_image (- (view_x2) 20) (+ (view_y1) 5) shlamp_image)))
  • abuse/trunk/data/addon/aliens/powerups.lsp

    r588 r589  
    1111        (progn
    1212           (with_object (bg) (make_view_solid (find_rgb 255 255 255)))
    13            (with_object (bg) (setq special_power SHLAMP))
     13           (with_object (bg) (setq special_power SHLAMP_POWER))
    1414           (with_object (add_object_after SHLMP2 (x) (y)) (link_object (bg)))
    1515           (with_object (add_object_after WTW (x) (y)) (link_object (bg)))
     
    3232        (set_light_y (get_light 0) (y)))
    3333    nil)
    34   (if (not (eq (with_object (get_object 0) special_power) SHLAMP))
     34  (if (not (eq (with_object (get_object 0) special_power) SHLAMP_POWER))
    3535        (progn
    3636        (if (eq (total_lights) 1)
Note: See TracChangeset for help on using the changeset viewer.