Changeset 582 for abuse/trunk/data-macTweet

Timestamp:

May 6, 2011, 12:47:14 AM (12 years ago)

Author:

Sam Hocevar

Message:

data: remove \r and trailing spaces and tabs from all Lisp sources.

Location:

abuse/trunk/data-mac

Files:

• abuse.lsp (modified) (2 diffs)
• addon/bong/bong.lsp (modified) (13 diffs)
• addon/deathmat/deathmat.lsp (modified) (1 diff)
• addon/deathmat/dstartup.lsp (modified) (5 diffs)
• addon/deathmat/large.lsp (modified) (1 diff)
• addon/deathmat/medium.lsp (modified) (1 diff)
• addon/deathmat/small.lsp (modified) (1 diff)
• lisp/ant.lsp (modified) (31 diffs)
• lisp/chat.lsp (modified) (1 diff)
• lisp/common.lsp (modified) (7 diffs)
• lisp/doors.lsp (modified) (9 diffs)
• lisp/duong.lsp (modified) (19 diffs)
• lisp/english.lsp (modified) (16 diffs)
• lisp/explo.lsp (modified) (4 diffs)
• lisp/flyer.lsp (modified) (4 diffs)
• lisp/french.lsp (modified) (15 diffs)
• lisp/gates.lsp (modified) (6 diffs)
• lisp/general.lsp (modified) (10 diffs)
• lisp/german.lsp (modified) (17 diffs)
• lisp/guns.lsp (modified) (25 diffs)
• lisp/jugger.lsp (modified) (19 diffs)
• lisp/ladder.lsp (modified) (1 diff)
• lisp/light.lsp (modified) (3 diffs)
• lisp/options.lsp (modified) (1 diff)
• lisp/people.lsp (modified) (49 diffs)
• lisp/platform.lsp (modified) (5 diffs)
• lisp/playwav.lsp (modified) (1 diff)
• lisp/powerup.lsp (modified) (2 diffs)
• lisp/sfx.lsp (modified) (10 diffs)
• lisp/startup.lsp (modified) (1 diff)
• lisp/switch.lsp (modified) (19 diffs)
• lisp/teleport.lsp (modified) (4 diffs)
• lisp/userfuns.lsp (modified) (2 diffs)
• lisp/weapons.lsp (modified) (33 diffs)

abuse/trunk/data-mac/abuse.lsp

@@ -10 +10 @@
     (progn
       (print "Please make sure you unzipped the game with the -d option")
-      (print "so that all directories get created properly.")      
-      (print "example : pkunzip -d abusXXXX.zip")      
+      (print "so that all directories get created properly.")
+      (print "example : pkunzip -d abusXXXX.zip")
       (quit)))
 (setq load_warn T)
@@ -18 +18 @@
 (load "lisp/common.lsp")
 (load "lisp/userfuns.lsp")
-(load "lisp/options.lsp")     
+(load "lisp/options.lsp")
 (load "lisp/startup.lsp")
 (local_load "lisp/input.lsp")

abuse/trunk/data-mac/addon/bong/bong.lsp

@@ -24 +24 @@
 ;;;; called lisp :-)
 
-;;;; Please do not ask me for docs on how to code with the abuse engine, there are 
+;;;; Please do not ask me for docs on how to code with the abuse engine, there are
 ;;;; none at this time and there won't be any until networked abuse is available.
 ;;;; ALL games written with the abuse engine are network ready with no additional
-;;;; work including this one, but there are some issues that need addressing 
+;;;; work including this one, but there are some issues that need addressing
 ;;;; that cannot be fully discussed until the net code is finished.  When these
 ;;;; docs are written they will be available at http://www.crack.com   Estimated
@@ -66 +66 @@
 (setq pong_dir "addon/bong/")  ; in case we change the location of these files later
                                ; this is always a very good idea to do because the user of
-                               ; this program may/may not be able to install into this directory       
+                               ; this program may/may not be able to install into this directory
 (setq pong_art (concatenate 'string pong_dir "bong.spe"))  ; all artwork is in this file
 
@@ -116 +116 @@
       (let ((this-digit (/ score digs_left)))
         (put_image x y (aref nums this-digit))
-        (show_score (+ x (image_width (aref nums this-digit))) y 
+        (show_score (+ x (image_width (aref nums this-digit))) y
                     (/ digs_left 10) (- score (* digs_left this-digit))))))
 
@@ -153 +153 @@
           (blow_up_tile tilex (+ tiley 1))
           (blow_up_tile (+ tilex 1) tiley)))
-              
+
     (with_object (bg) (add_hp 10))           ; give player points
 
@@ -165 +165 @@
 (defun check_collide (status)    ;; returns T if we hit something
   (if (not (eq status T))                                  ; did we hit anything?
-      (if (eq (car (cdr status)) 'object)                  ; did we hit an object?            
+      (if (eq (car (cdr status)) 'object)                  ; did we hit an object?
           (let ((object (car (cdr (cdr status)))))
             (if (eq (with_object object (otype)) PADDLE)   ; did we hit the paddle?
@@ -173 +173 @@
                       (if (> 20 (aistate)) (set_aistate 20)
                         (if (< 160 (aistate)) (set_aistate 160)))
-                      T) 
+                      T)
                   nil)
               nil)
@@ -195 +195 @@
 (defun move_ball ()  ;; returns status of move
   (let ((status (float_tick)))
-    (if (not (eq status T))   ; T means we did not hit anything 
+    (if (not (eq status T))   ; T means we did not hit anything
         (let ((block_flags (car status)))
           (if (or (blocked_left block_flags) (blocked_right block_flags)) ; bounce left/right
@@ -218 +218 @@
   (select (aitype)
           (0  ; normal play, bounce around and stuff..
-           (check_collide (move_ball))             
+           (check_collide (move_ball))
            (if (> (y) 240)  ; check to see if we are dead
                (progn
@@ -231 +231 @@
                      T)))
              T))
-                  
+
            (1 ; ball is dead - go to paddle and fade in
             (set_x (with_object (bg) (x)))
@@ -239 +239 @@
                 (set_aitype 0))
             T)))
-          
+
 
 (def_char BALL
@@ -265 +265 @@
       (mover xm 0 0)
     0))
-     
+
 
 (def_char PADDLE
@@ -292 +292 @@
   (next_picture)
   (if (touching_bg)  ; are we touching the paddle
-      (progn 
+      (progn
         (add_score 1000)
         (with_object (add_object BALL (x) (y) 1) (progn (set_fade_count 15) (set_aistate 80)))
@@ -339 +339 @@
 (create_players PADDLE)
 (set_first_level (get_level_name current_level))
-(gc)    ; garbage collect 
+(gc)    ; garbage collect
 (tmp-space)
 

abuse/trunk/data-mac/addon/deathmat/deathmat.lsp

@@ -6 +6 @@
 (defun net_file (x) (concatenate 'string net_dir x))
 (load (net_file "dstartup.lsp"))
-(load "lisp/options.lsp")     
+(load "lisp/options.lsp")
 
 (local_load "lisp/input.lsp")

abuse/trunk/data-mac/addon/deathmat/dstartup.lsp

@@ -10 +10 @@
       (load "addon/deathmat/cur_lev.lsp")
       (set_first_level (nth current_net_level net_levels)))
-  
+
   ;; save the level we are so joining clients know which one to load
-  (open_file "addon/deathmat/cur_lev.lsp" "wb" 
+  (open_file "addon/deathmat/cur_lev.lsp" "wb"
              (print `(setq current_net_level ,current_net_level))))
-  
+
 
 ;; this is a simple check to see if they player has an engine version
@@ -32 +32 @@
     (progn
       (print "\nPlease make sure you unzipped the game with the -d option")
-      (print "so that all directories get created properly.")      
-      (print "example : pkunzip -d abusXXXX.zip")      
+      (print "so that all directories get created properly.")
+      (print "example : pkunzip -d abusXXXX.zip")
       (quit)))
 (setq load_warn T)
@@ -52 +52 @@
              (print (list 'setq 'server_version_major (major_version) ))
              (print (list 'setq 'server_version_minor (minor_version)))))
-              
+
 
 (if (not (am_a_client))
@@ -59 +59 @@
 ;(let ((input (nice_input "DEATHMATCH : Enter your name below" "Name" username)))
 ;  (open_file "addon/deathmat/username.lsp" "wb"
-;            (print (list 'setq 'username 
+;            (print (list 'setq 'username
 ;                         (concatenate 'string '(#\") input '(#\"))))))
 
@@ -82 +82 @@
 (defun display_player (player text_x text_y)
   (if player
-      (with_object player       
-        (put_string (get_main_font) text_x text_y 
-                    (concatenate 'string (digstr (kills) 2) " " (player_name) 
-                                                     (if (local_player) 
+      (with_object player
+        (put_string (get_main_font) text_x text_y
+                    (concatenate 'string (digstr (kills) 2) " " (player_name)
+                                                     (if (local_player)
                                                          " <<"
                                                        ""))

abuse/trunk/data-mac/addon/deathmat/large.lsp

@@ -1 @@
-(setq net_levels 
+(setq net_levels
       '("netlevel/8play1.spe"
         "netlevel/8play2.spe"

abuse/trunk/data-mac/addon/deathmat/medium.lsp

@@ -1 @@
-(setq net_levels 
+(setq net_levels
       '(
         "netlevel/4play1.spe"

abuse/trunk/data-mac/addon/deathmat/small.lsp

@@ -1 @@
-(setq net_levels 
+(setq net_levels
       '("netlevel/2play1.spe"
         "netlevel/2play2.spe"

abuse/trunk/data-mac/lisp/ant.lsp

@@ -2 +2 @@
 ;; See licensing information for more details on usage rights
 
-(setq ant_tints (make-array 11 :initial-contents (list 
+(setq ant_tints (make-array 11 :initial-contents (list
                                                 (def_tint "art/tints/ant/green.spe")
-                                                (def_tint "art/tints/ant/blue.spe") 
+                                                (def_tint "art/tints/ant/blue.spe")
                                                 (def_tint "art/tints/ant/brown.spe")
                                                 (def_tint "art/tints/ant/egg.spe")
@@ -16 +16 @@
                                                 )))
 
-/* 
+/*
 ------ this code has been compiled --------
 (defun no_fall_move (xm ym but)
@@ -35 +35 @@
             0)
         ret))))
-            
-      
+
+
 (defun will_fall_if_jump ()
   nil)
@@ -60 +60 @@
 
 (defun strait_rocket_ai ()
-  (set_course (aistate) 
+  (set_course (aistate)
               (select difficulty
                       ('easy    12)
@@ -72 +72 @@
     (progn
       (if (not (eq stat nil))
-          (progn 
+          (progn
             (add_object EXPLODE3 (+ (x) (random 5)) (+ (y) (random 5)) 0)
             (add_object EXPLODE2 (+ (x) (random 5)) (+ (y) (random 5)) 2)
@@ -82 +82 @@
           (with_object (add_object EG_EXPLO (x) (y)) (user_fun myself (car stat)))))
       nil))))
-    
+
 
 (def_char STRAIT_ROCKET
@@ -97 +97 @@
       (if (or (blocked_left block_flags) (blocked_right block_flags))
           (set_state blocking))))
-         
+
 (def_char EG_EXPLO
   (funs (ai_fun   animate_ai)
@@ -107 +107 @@
           (blocking (seq "bilw" 1 4))))
 
-/* 
+/*
 ------ this code has been compiled --------
 (defun alien_wait_time ()
-  (select difficulty 
+  (select difficulty
           ('easy    6)
           ('medium  4)
@@ -131 +131 @@
         nil
       T)))
-      
-      
+
+
 (defun roof_above () (not (can_see (x) (y) (x) (- (y) 120) nil)))
 
@@ -140 +140 @@
         (playerx (+ (with_object (bg) (x)) (with_object (bg) (* (xvel) 8))))
         (playery (+ (- (with_object (bg) (y)) 15) (with_object (bg) (* (yvel) 2)))))
-    
+
     (if (and (can_see (x) (y) firex firey nil) (can_see firex firey playerx playery nil))
         (progn
@@ -152 +152 @@
 (defun ant_dodge ()
   (if (eq need_to_dodge 1)
-      (progn 
+      (progn
         (setq need_to_dodge 0)
         (if (eq (random 2) 1)
@@ -159 +159 @@
               (go_state 6))         ;; jump at player
           (if (roof_above)
-              (progn                    
-                (set_yvel -17)  ;; jump up  
+              (progn
+                (set_yvel -17)  ;; jump up
                 (set_xvel 0)
                 (go_state 12))
@@ -190 +190 @@
                          (set_aistate 16)))
 
-                  (15 ;; hanging on the roof waiting for the main character                
+                  (15 ;; hanging on the roof waiting for the main character
                    (if (next_picture) T (set_state hanging))
                    (if (if (eq (total_objects) 0);; no sensor, wait for guy
                            (and (< (distx) 130) (< (y) (with_object (bg) (y))))
                          (not (eq (with_object (get_object 0) (aistate)) 0)))
-                       (progn 
+                       (progn
                          (set_state fall_start)                  (set_direction (toward))
                          (set_aistate 1))))
@@ -204 +204 @@
                            (and (< (distx) 130) (< (y) (with_object (bg) (y))))
                          (not (eq (with_object (get_object 0) (aistate)) 0)))
-                       (progn 
+                       (progn
                          (set_state fall_start)                  (set_direction (toward))
                          (set_aistate 1))))
@@ -219 +219 @@
                   (9 ;; landing / turn around (gerneal finish animation state)
                    (if (next_picture) T
-                     (if (try_move 0 2) 
+                     (if (try_move 0 2)
                          (progn
                            (set_gravity 1)
                            (set_aistate 1))
-                       (progn (set_state stopped)                         
+                       (progn (set_state stopped)
                               (go_state 2)))))  ;; running
 
@@ -254 +254 @@
                              (set_state turn_around)
                              (set_aistate 9)))))
-              
+
                   (4 ;; wait for pounce
                    (if (ant_dodge) T
@@ -266 +266 @@
                              (go_state 6))))))
 
-                  (6 ;; jump              
+                  (6 ;; jump
                    (setq need_to_dodge 0)
                    (if (blocked_down (move (direction) -1 0))
@@ -273 +273 @@
 
                   (8 ;; fire at player
-                   (if (ant_dodge) T                 
+                   (if (ant_dodge) T
                      (if (eq (state) fire_wait)
                          (if (next_picture)
@@ -304 +304 @@
                   (13 ;; roof walking
                    (scream_check)
-                   (if (or (and (< (y) (with_object (bg) (y))) 
-                                (< (distx) 10) (eq (random 8) 0)) 
+                   (if (or (and (< (y) (with_object (bg) (y)))
+                                (< (distx) 10) (eq (random 8) 0))
                            (eq need_to_dodge 1))  ;; shooting at us, fall down
                        (progn
@@ -321 +321 @@
                                          (- 0 (get_ability run_top_speed)))))
                            (if (and (can_see (x) (- (y) 31) (+ (x) xspeed) (- (y) 31) nil)
-                                    (not (can_see (+ (x) xspeed) (- (y) 31) 
+                                    (not (can_see (+ (x) xspeed) (- (y) 31)
                                                   (+ (x) xspeed) (- (y) 32) nil)))
                                (progn
                                  (set_x (+ (x) xspeed))
-                                 (if (not (next_picture)) 
+                                 (if (not (next_picture))
                                      (set_state top_walk)))
                              (set_aistate 1)))))))
 
-        
+
                   (14 ;; cieling shoot
                    (if (next_picture)
@@ -339 +339 @@
 
                   )))
-      
+
       T)
-*/   
+*/
 
 
@@ -380 +380 @@
       'electric_part
       'normal_part)
-      
+
 (defun get_dead_part (from)
   (if from
@@ -397 +397 @@
 
   (if (and (not (eq (state) dead))
-           (or (not from) 
-               (with_object from (if (eq (total_objects) 0) 
+           (or (not from)
+               (with_object from (if (eq (total_objects) 0)
                                      (not (eq (otype) ANT_ROOF))
                                    (with_object (get_object 0) (not (eq (otype) ANT_ROOF)))))))
@@ -408 +408 @@
             (damage_fun amount from hitx hity push_xvel push_yvel)
             (play_sound APAIN_SND 127 (x) (y))
-            (setq need_to_dodge 1)          
+            (setq need_to_dodge 1)
             (if (<= (hp) 0)
                 (progn
@@ -461 +461 @@
   (range 250 20)
   (draw_range 40 40)
-  (funs (ai_fun     ant_ai)     
+  (funs (ai_fun     ant_ai)
         (draw_fun   ant_draw)
         (constructor ant_cons)
@@ -476 +476 @@
              (push_xrange     1)
              (jump_top_speed 20))
-  
+
   (flags (hurtable  T)
          (force_health T))
 
-  (states "art/ant.spe" 
+  (states "art/ant.spe"
           (hanging (rep "ant" 2))
 
           (fall_start "affc0001.pcx")
           (falling    "affc0002.pcx")
-          
+
           (stopped "awlk0001.pcx")
           (running (seq "awlk" 1 10))
@@ -517 +517 @@
   (states "art/ant.spe" (stopped "hidden")))
 
-  
+
 
 
@@ -531 +531 @@
              (let ((d (direction))
                    (type (aitype)))
-               (if (or (eq create_total 0) (eq create_total 1))           
+               (if (or (eq create_total 0) (eq create_total 1))
                    (set_current_frame 4)
                  (progn
@@ -548 +548 @@
             (2 (next_picture))))
   T)
-            
+
 
 (defun crack_cons ()
@@ -575 +575 @@
            (bounce_move T T T '(progn (set_state dieing) (set_aistate 1)) T)
            (or (< (state_time) 15)
-               (not (frame_panic))))          
+               (not (frame_panic))))
           (1 ;; hit the ground
            nil)
           ))
 
-(setq ant_dead_parts (make-array (* 3 4) :initial-contents 
+(setq ant_dead_parts (make-array (* 3 4) :initial-contents
                              '((AD_1  "adbn") (AD_2  "adha") (AD_3  "adla")     ; disapear
                                (AD_4  "adaf") (AD_5  "adah") (AD_6  "adlf")     ; flaming
@@ -608 +608 @@
 (do ((i 0 (setq i (+ i 1))))
            ((>= i 12) nil)
-           (setq (aref ant_dead_parts i) 
+           (setq (aref ant_dead_parts i)
                  (make_dead_part (car (aref ant_dead_parts i))
                                  (car (cdr (aref ant_dead_parts i))) 4 "art/ant.spe" 'ant_draw)))

abuse/trunk/data-mac/lisp/chat.lsp

@@ -8 +8 @@
                                           (player_name))))
         (if (search "/help" str)
-            (if (local_player) 
+            (if (local_player)
                 (chat_print "Commands : /nick name, /help"))
         (if (local_player)

abuse/trunk/data-mac/lisp/common.lsp

@@ -2 +2 @@
 ;; See licensing information for more details on usage rights
 
-; draw function for characters only displayed during edit mode 
+; draw function for characters only displayed during edit mode
 ; such as start, etc.
 ; (defun dev_draw () (if (edit_mode) (draw) nil))       -- compiled C function --
@@ -12 +12 @@
     (draw)
     (set_y y)))
-        
+
 
 
@@ -50 +50 @@
     nil)
   T)
-    
+
 
 
@@ -56 +56 @@
   (funs  (ai_fun   lhold_ai)
          (draw_fun dev_draw))
-  (states "art/misc.spe"         
+  (states "art/misc.spe"
           (stopped           "lhold")))
 
 
 
-(def_char OBJ_MOVER 
+(def_char OBJ_MOVER
   (funs (ai_fun       mover_ai)
         (constructor  mover_cons)
@@ -70 +70 @@
   (states "art/misc.spe" (stopped '("mover" "mover" ))))
 
-/*    Compiled C           
+/*    Compiled C
 (defun mover_ai ()
   (if (eq (total_objects) 2)
       (let ((dest (get_object 0))
             (mover (get_object 1)))
-        (if (< (aistate) 2)             ; transfer object to next mover       
+        (if (< (aistate) 2)             ; transfer object to next mover
             (progn
-              (with_object dest 
+              (with_object dest
                            (progn
                              (link_object mover)
                              (set_aistate (aitype))))
               (remove_object mover))
-          (progn              
+          (progn
             (set_aistate (- (aistate) 1))
             (let ((newx (- (with_object dest (x)) (/ (* (- (with_object dest (x)) (x)) (aistate)) (aitype))))
                   (newy (- (with_object dest (y)) (/ (* (- (with_object dest (y)) (y)) (aistate)) (aitype)))))
-              (with_object mover 
-                           (progn 
+              (with_object mover
+                           (progn
                              (platform_push (- newx (x)) (- newy (y)))
                              (set_x newx)
@@ -105 +105 @@
       (let ((last (get_object (- x 1))))   ; see if the last object has the same position as us
         (if (and (eq (with_object last (x)) (x)) (eq (with_object last (y)) (y)))
-            (if (eq (aistate) 1)                        
+            (if (eq (aistate) 1)
                 (if (eq (with_object last (fade_count)) 0)
                     (set_aistate 1)
@@ -122 +122 @@
 
 
-(defun respwan_cons () (set_xvel 50)) 
+(defun respwan_cons () (set_xvel 50))
 
 
-(def_char RESPAWN 
+(def_char RESPAWN
   (funs (ai_fun      respawn_ai)
-        (draw_fun    dev_draw)  
+        (draw_fun    dev_draw)
         (constructor respwan_cons))
 ;  (flags (unlistable T))

abuse/trunk/data-mac/lisp/doors.lsp

@@ -2 +2 @@
 ;; See licensing information for more details on usage rights
 
-(defun general_door_ai (push?) 
+(defun general_door_ai (push?)
   (select (aistate)
           (0 (if (> (total_objects) 0)             ; are we linked to a key?
@@ -16 +16 @@
                  nil)))
           (1 (if (not (next_picture))              ; wait till open animation finishes
-                 (progn 
+                 (progn
                    (set_state stopped)             ; set opened animation
-                   (go_state 2))))              
+                   (go_state 2))))
 
           (2 (if (> (total_objects) 0)             ; wait till level editor links us to a key
-                 (progn 
+                 (progn
                    (set_state blocking)
                    (go_state 0))
@@ -45 +45 @@
           (1 ;          opening
            (if (next_picture) nil
-             (progn 
+             (progn
                (set_state blocking)
                (set_aistate 2))))
@@ -59 +59 @@
                (set_aistate 0))))
           )
-  
+
 
 T)
@@ -83 +83 @@
               (bgy (with_object who (y)) (y)))
           (if (and (>= bgy (y)) (<= bgy (+ end_y 20))
-                   (< (abs (- bgx (x))) xamount))            
+                   (< (abs (- bgx (x))) xamount))
               (let ((amount (if (> bgx (x))
                                 (- xamount (- bgx (x)))
@@ -106 +106 @@
         (ff_push (first_focus) 35)))
   T)
-        
+
 
 (defun ff_draw ()
@@ -126 +126 @@
   (states "art/misc.spe"
           (stopped "force_field")))
-        
+
 
 (defun hwall_ai ()
-  (if (or (eq (hp) 0) 
+  (if (or (eq (hp) 0)
           (and (eq (total_objects) 1)
                (with_object (get_object 0) (not (eq (aistate) 0)))))
@@ -140 +140 @@
 
 (defun big_wall_ai ()
-  (if (or (eq (hp) 0) 
+  (if (or (eq (hp) 0)
           (and (eq (total_objects) 1)
                (with_object (get_object 0) (not (eq (aistate) 0)))))
@@ -165 +165 @@
       (set_hp 25)))
 
-      
+
 (defun make_hidden_wall_char (name start end ai)
   (eval `(def_char ,name

abuse/trunk/data-mac/lisp/duong.lsp

@@ -21 +21 @@
                          (y (- (y) 16))
                          (fade (if (< (current_frame) 16) (current_frame) 15)))
-                     (with_object (get_object 1) 
+                     (with_object (get_object 1)
                                   (progn
-                                    (set_x x) 
-                                    (set_y y) 
+                                    (set_x x)
+                                    (set_y y)
                                     (user_fun SET_FADE_COUNT fade)
                                     (setq is_teleporting 1)
                                     )))
-                                  
+
                  (let ((x (with_object (get_object 0) (x)))
-                       (y (with_object (get_object 0) (- (y) 16))))                
+                       (y (with_object (get_object 0) (- (y) 16))))
                    (with_object (get_object 1)
-                                (progn 
+                                (progn
                                   (set_x x)
                                   (set_y y)
@@ -41 +41 @@
                    (set_aistate 0))))))
   T)
-*/         
+*/
 
 (defun mine_ai ()
@@ -129 +129 @@
              (set_y oldy))
            nil)))
-  
-          
-                          
+
+
+
 (def_char BOMB
   (funs (ai_fun      bomb_ai)
@@ -151 +151 @@
   (states "art/chars/mine.spe"
           (stopped '("abomb0001.pcx+" "abomb0002.pcx+"))))
-          
+
 
 
@@ -181 +181 @@
               (0 ;; wait for switch to go off
                (if (not (eq (with_object (get_object 0) (aistate)) 0))
-                   (progn 
+                   (progn
                      (set_state running)
                      (go_state 1))))
@@ -189 +189 @@
                    (set_state blocking)
                    (set_aistate 2))))
-              (2 ;; just stay here 
+              (2 ;; just stay here
                T)))
 T)
-      
+
 
 (defun strap_door_ai ()
@@ -241 +241 @@
           (running   (seq "lite" 1 9))
           (stopped    "lite0001.pcx")))
-          
+
 
 
@@ -267 +267 @@
            (stopped (seq "lava" 1 15))))
 
-                          
+
 
 (def_char TELE2
@@ -275 +275 @@
           (stopped "close")
           (running (seq "elec" 1 15))))
-         
+
 
 (defun bolder_ai ()
@@ -295 +295 @@
         (progn
           (next_picture)
-          (set_yvel (+ (yvel) 1))         
+          (set_yvel (+ (yvel) 1))
           (let ((old_yv  (yvel))
                 (old_xv  (xvel))
@@ -310 +310 @@
               (set_y new_y))
             (hurt_radius (x) (y) 19 30 (me) 15)
-            (if (not (eq status T));; T means we did not hit anything   
+            (if (not (eq status T));; T means we did not hit anything
                 (let ((block_flags (car status)))
                   (if (or (blocked_up block_flags) (blocked_down block_flags));; bounce up/down
@@ -326 +326 @@
           T))
     T))
-  
+
 
 (defun bolder_cons ()
@@ -333 +333 @@
 
 
-(defun bold_dam (amount from hitx hity push_xvel push_yvel) 
+(defun bold_dam (amount from hitx hity push_xvel push_yvel)
   (add_object EXPLODE3 (+ (x) (- 10 (random 20))) (- (y) (random 30)) 0)
   (damage_fun amount from hitx hity (/ push_xvel 10) (/ push_yvel 2)))
@@ -346 +346 @@
   (range 200 200)
   (abilities (start_hp 40))
-  (fields ("xvel" ai_xvel)        
+  (fields ("xvel" ai_xvel)
           ("yvel" ai_yvel)
           ("hp"   ai_health)
           )
   (states "art/bold.spe"
-          (stopped '("bold0001.pcx" "bold0001.pcx" "bold0001.pcx" 
+          (stopped '("bold0001.pcx" "bold0001.pcx" "bold0001.pcx"
                     "bold0002.pcx" "bold0002.pcx" "bold0002.pcx"
                     "bold0003.pcx" "bold0003.pcx" "bold0003.pcx"
@@ -360 +360 @@
         (old_xv  (xvel))
         (status (float_tick)))
-    (if (not (eq status T)) ;; T means we did not hit anything  
-        (let ((block_flags (car status)))                   
+    (if (not (eq status T)) ;; T means we did not hit anything
+        (let ((block_flags (car status)))
           (if (blocked_up block_flags) ;; bounce up/down
               (progn
@@ -387 +387 @@
                       (eval right_stub)))))))
       (eval nothing_stub))))
-              
+
 
 
@@ -393 +393 @@
   (next_picture)
   (set_yvel (+ (yvel) 1))
-  (bounce_move T T T           
-               '(progn (add_object EXPLODE1 (+ (x) (random 10)) (- (+ (random 5) (y)) 10)     0)                       
+  (bounce_move T T T
+               '(progn (add_object EXPLODE1 (+ (x) (random 10)) (- (+ (random 5) (y)) 10)     0)
                  (add_object EXPLODE1 (- (x) (random 10)) (- (- (y) (random 5)) 10) 2)
                  (play_sound P_EXPLODE_SND 127 (x) (y))
@@ -401 +401 @@
                                               nil) 20)
                  nil) T))
-  
+
 
 (def_char SMALL_BOLDER
@@ -408 +408 @@
   (flags (add_front  T)
          (unlistable T))
-        
+
   (states "art/bold.spe"
           (stopped "bsmall")))

abuse/trunk/data-mac/lisp/english.lsp

@@ -5 +5 @@
 ;; Latest version of this file is "V-E"  (version E=1.47)
 
-(select section 
+(select section
         ('game_section
 
@@ -37 +37 @@
          (setq New?               "New?")
          (setq l_EDIT             "EDIT")
- 
+
 
          /********** New for Version D (1.46)   **************/
@@ -110 +110 @@
          (setq sens_cs            "current state")
          (setq tp_amb             "ambient setting")
-         
-
-               
+
+
+
          (setq ai_xvel            "Xvel    ")
          (setq ai_yvel            "Yvel    ")
@@ -124 +124 @@
          (setq ai_state           "ai state")
          (setq ai_fade            "fade 0-15")
-         
+
          (setq a_ambient          "Ambient      ")
          (setq a_aspeed           "Ambient speed")
@@ -139 +139 @@
          (setq ap_pal             "Add palette")
          (setq mouse_at           "Mouse at location %d, %d\n")
-         
+
 
          (setq l_links            "Links")
@@ -162 +162 @@
          (setq edit_top           "Edit")
          (setq window_top         "Windows")
-         (setq menu1_load         "Load Level")  
+         (setq menu1_load         "Load Level")
          (setq menu1_save         "Save Level (S)")
          (setq menu1_saveas       "Save level as")
@@ -207 +207 @@
          (setq level_size "Level size")
                            ; 012345678901234567 (please keep same allignment of Name level & total)
-         (setq score_header "Name              Level Total")   ; V-E 
+         (setq score_header "Name              Level Total")   ; V-E
          (setq space_cont "Press SPACEBAR to continue")        ; V-E
          (setq no_saved "No saved game")
@@ -224 +224 @@
 b
          (defun get_train_msg (message_num)
-           (select message_num    
+           (select message_num
                    ;   0123456789012345678901234567890123456789012345678901234567890123456789
                    ;  "--------------------------------------------------------------------"  ; V-A
@@ -303 +303 @@
          (setq to_be_continued "To be continued.....")
          (setq no_edit         "This version of ABUSE does not have editing features")
-         (setq no_hirez        "Hi-rez is only available for edit mode (-edit)") 
+         (setq no_hirez        "Hi-rez is only available for edit mode (-edit)")
          (setq no2             "Cannot use -2 with -edit")
          (setq no_pals         "No palettes defined")
@@ -313 +313 @@
          (setq d_nosel         "No selected object or light to delete.")
          (setq forward?        "Forward which object?")
-         (setq back?           "Back which object?") 
+         (setq back?           "Back which object?")
          (setq aitype?         "Ai type for who?")
          (setq prof_off        "Cache profiling is now off.")
@@ -324 +324 @@
          (setq quit_title      "Quit?")
          (setq YES             "YES")
-         (setq NO              "NO")     
+         (setq NO              "NO")
          (setq seqs_off        "Sequential screen shots off\n")
          (setq seqs_on         "Sequential screen shots on (1 per 5 sec)\n")
@@ -346 +346 @@
 
 
-         (setq net_not_reg  
+         (setq net_not_reg
                (concatenate 'string "Sorry, this server is running REGISTERED ABUSE and you are not.\n"
                             "Ask the server operator to run with -share option or better yet,\n"
@@ -369 +369 @@
 
          (setq plot_start
-               (concatenate 'string 
+               (concatenate 'string
                             "You are Nick Vrenna. It is the year 2009.  You have been falsely incarcerated "
                             "inside a high security underground prison where illegal genetic experiments "
-                            "are taking place.\\n"                          
+                            "are taking place.\\n"
                             "Alan Blake, the head research scientist, has isolated the specific gene which "
                             "causes violence and aggression in humans.  This genetic sequence, called "
@@ -388 +388 @@
 
          (setq plot_middle
-               (concatenate 'string 
+               (concatenate 'string
                             "You have survived the initial outbreak, but you are still lost deep "
-                            "within the prison. So far it's been suspiciously easy. \\n"       
+                            "within the prison. So far it's been suspiciously easy. \\n"
                             "If you want to break out - the real ABUSE lies ahead. "))
 
 
          (setq plot_end
-               (concatenate 'string 
+               (concatenate 'string
                             "You've survived impossible odds and made it to the Control Room.  "
                             "By pulling the switch, you have diverted the water supply and stopped the spread of Abuse!\\n "
@@ -401 +401 @@
 
          (setq thanks_text
-               (concatenate 'string 
+               (concatenate 'string
                             "Bungie Crew\\n"
                                                         "- Production Manager "
@@ -476 +476 @@
                                                         "Jason Budravage, "
                                                         "and Jonah Kowall\\n"
-                                "\\nIcepops!\n"))) 
+                                "\\nIcepops!\n")))
 )

abuse/trunk/data-mac/lisp/explo.lsp

@@ -13 +13 @@
                T))))
 
-(defun do_small_explo (radius amount)  
+(defun do_small_explo (radius amount)
   (add_object EXPLODE3 (+ (x) (random 5)) (+ (y) (random 5)) 0)
   (add_object EXPLODE2 (+ (x) (random 5)) (+ (y) (random 5)) 2)
@@ -50 +50 @@
 
 (def_char EXP_LIGHT
-  (funs (ai_fun   explo_light)  
+  (funs (ai_fun   explo_light)
         (draw_fun dev_draw))
   (flags (unlistable T))
@@ -58 +58 @@
 
 /* written in C
-(defun exp_ai () 
-  (if (eq (aitype) 0) (next_picture) 
+(defun exp_ai ()
+  (if (eq (aitype) 0) (next_picture)
     (progn (set_aitype (- (aitype) 1))
            T)))
@@ -65 +65 @@
 
 (defun exp_draw ()
-  (if (eq (aitype) 0) 
+  (if (eq (aitype) 0)
       (middle_draw)))
 */

abuse/trunk/data-mac/lisp/flyer.lsp

@@ -28 +28 @@
           (with_object (bg) (set_kills (+ (kills) 1)))
           nil)
-      (progn      
+      (progn
         (if (eq (mod (state_time) 5) 0)      ;; make flyer noise every 5 ticks
             (play_sound FLYER_SND 127 (x) (y)))
@@ -67 +67 @@
 
         (if (next_picture) T (set_state running))  ;; reset animation when done
-            
+
         (bounce_move '(set_xvel (/ (xvel) 2)) '(set_xvel (/ (xvel) 2))
                      '(set_yvel (/ (yvel) 2)) '(set_yvel (/ (yvel) 2)) nil)
-      
+
         (if (> fire_time 0)              ;; if we need to wait till next burst
             (progn
               (setq fire_time (- fire_time 1))
               (if (eq fire_time 0)
-                  (progn 
+                  (progn
                     (setq burst_left burst_total)
                     (setq burst_wait 0))))
@@ -92 +92 @@
                               (setq burst_left (- burst_left 1)))
                             (setq burst_wait burst_delay)
-                            (fire_object (me) (aitype) firex firey angle (bg)) 
+                            (fire_object (me) (aitype) firex firey angle (bg))
                             )))))
-            (setq burst_wait (- burst_wait 1))))                
+            (setq burst_wait (- burst_wait 1))))
         T))))
 
 
 
-(defun flyer_cons ()      
+(defun flyer_cons ()
   (setq fire_delay 20)
   (setq burst_delay 3)
@@ -109 +109 @@
 
 (defun flyer_damage (amount from hitx hity push_xvel push_yvel)
-  (if (and from (with_object from (and (> (total_objects) 0) 
-                                       (with_object (get_object 0) 
+  (if (and from (with_object from (and (> (total_objects) 0)
+                                       (with_object (get_object 0)
                                                     (or (eq (otype) FLYER)
                                                         (eq (otype) GREEN_FLYER))

abuse/trunk/data-mac/lisp/french.lsp

@@ -6 +6 @@
 
 
-(select section 
+(select section
         ('game_section
 
@@ -108 +108 @@
          (setq sens_cs            "Etat actuel")
          (setq tp_amb             "R‚glage ambiance")
-         
-
-               
+
+
+
          (setq ai_xvel            "Xvel      ")
          (setq ai_yvel            "Yvel      ")
@@ -122 +122 @@
          (setq ai_state           "Etat IA   ")
          (setq ai_fade            "Fondu 0-15")
-         
+
          (setq a_ambient          "Ambiant     ")
          (setq a_aspeed           "Vitesse ambiante")
@@ -137 +137 @@
          (setq ap_pal             "Ajouter palette")
          (setq mouse_at           "Position la souris %d, %d\n")
-         
+
 
          (setq l_links            "Liens")
@@ -148 +148 @@
 
          (setq SHOW?              "AFFICHER ?")
-         (setq back_loss (concatenate 'string "Ce taux de d‚filement diminue la taille de la care d'arriŠre 
+         (setq back_loss (concatenate 'string "Ce taux de d‚filement diminue la taille de la care d'arriŠre
 plan \n"
                                       "Des dalles risquent d'ˆtre perdues, ˆtes-vous s–r(e) de vouloir le faire ?\n"))
@@ -164 +164 @@
          (setq edit_top           "Editer")
          (setq window_top         "Fenˆtres")
-         (setq menu1_load         "Lancer niveau")       
+         (setq menu1_load         "Lancer niveau")
          (setq menu1_save         "Sauvegarder niveau (S)")
          (setq menu1_saveas       "Enregistrer sous")
@@ -209 +209 @@
          (setq level_size "Taille du niveau")
                            ; 012345678901234567 (please keep same allignment of Name level & total)
-         (setq score_header "Nom          Total du niveau")   ; V-E 
+         (setq score_header "Nom          Total du niveau")   ; V-E
          (setq space_cont "Appuyez sur la BARRE D'ESPACE pour continuer")        ; V-E
          (setq no_saved "Pas de jeu sauvegard‚")
@@ -229 +229 @@
 
          (defun get_train_msg (message_num)
-           (select message_num    
+           (select message_num
                    (0 "Pointez le canon avec la souris, tirez avec le bouton gauche")
                    (1 "R‚cup‚rez des munitions pour augmenter votre cadence de tir")
@@ -290 +290 @@
          (setq client          "Participer au jeu en cours ?")
          (setq single_play     " Un seul joueur ")
-(setq single_play     "    Sortir du jeu sur r‚seau    ")  ; V-A 
+(setq single_play     "    Sortir du jeu sur r‚seau    ")  ; V-A
          (setq cancel_net      "      Annuler        ")
 
@@ -311 +311 @@
          (setq to_be_continued "A suivre.....")
          (setq no_edit         "Cette version du jeu est d‚pourvue de l'‚diteur")
-         (setq no_hirez        "La haute r‚solution n'est disponible qu'avec le mode ‚diter (-edit)") 
+         (setq no_hirez        "La haute r‚solution n'est disponible qu'avec le mode ‚diter (-edit)")
          (setq no2             "Ne peut pas utiliser -2 avec -edit")
          (setq no_pals         "Aucune palette d‚finie")
@@ -322 +322 @@
  effacer.")
          (setq forward?        "Avancer quel objet ?")
-         (setq back?           "Reculer quel objet ?") 
+         (setq back?           "Reculer quel objet ?")
          (setq aitype?         "Type IA pour qui ?")
          (setq prof_off        "Cache d‚sactiv‚")
@@ -333 +333 @@
          (setq quit_title      "Sortir ?")
          (setq YES             "OUI")
-         (setq NO              "NON")     
+         (setq NO              "NON")
          (setq seqs_off        "S‚quences photos off\n")
          (setq seqs_on         "S‚quences photos on (1 toutes les 5 sec)\n")
@@ -376 +376 @@
          (setq load_warn nil)
          (if (not (load "register/english.lsp"))
-             (setq end_msg 
-                   (concatenate 'string 
+             (setq end_msg
+                   (concatenate 'string
                                 "* Editer LISP/OPTIONS.LSP pour configurer quelques options pour ABUSE.\n\n"
-                                "* Procurez-vous la version commerciale d'ABUSE qui sera en vente fin mars 96, et\n"                        
+                                "* Procurez-vous la version commerciale d'ABUSE qui sera en vente fin mars 96, et\n"
                                 "  sera jouable sur r‚seau IPX supportant huit joueurs. Elle comportera un ‚diteur\n"
                                 "  de niveau int‚gr‚, 17 niveaux un seul joueur (plus 12 niveaux sur le\n"
@@ -391 +391 @@
                                 "  ALLEMAGNE   05241 / 24307\n"
                                 "  AUSTRALIE +61(75)911 388\n"
-                                "  JAPON     03-5410-3100\n\n")))  
+                                "  JAPON     03-5410-3100\n\n")))
 
          (setq load_warn T)
 
          (setq plot_start
-               (concatenate 'string 
+               (concatenate 'string
                             "Vous ˆtes Nick Vrenna. C'est l'ann‚e 2009.  A tort, vous avez ‚t‚ incarc‚r‚ "
                             "dans une prison souterraine de haute surveillance o— ont lieu des exp‚riences g‚n‚tiques "
-                            " ill‚gales.\\n"                          
+                            " ill‚gales.\\n"
                             "Alan Blake, 
- la tˆte de la recherche scientifique, a isol‚ le gˆne qui provoque "                   
+ la tˆte de la recherche scientifique, a isol‚ le gˆne qui provoque "
                             "violence et agression chez les humains. Cette s‚quence g‚n‚tique appel‚e "
-                            '(#\") "Abuse" '(#\") " est extrˆmement infectieuse, elle engendre des transformations "                    
+                            '(#\") "Abuse" '(#\") " est extrˆmement infectieuse, elle engendre des transformations "
                             "horribles et provoque de monstrueux effets secondaires.  "
                             "Vous ˆtes la seule personne immunis‚e contre ces effets. \\n"
                             "Une ‚meute commence et dans ce d‚sordre, toutes les portes de "
-                            "prison s'ouvrent. TrŠs vite, les gardes, ainsi que les d‚tenus " 
+                            "prison s'ouvrent. TrŠs vite, les gardes, ainsi que les d‚tenus "
                             "sont contamin‚s et transform‚s en une horde de mutants qui envahissent le "
                             "bƒtiment.\\n"
-                            "Votre seule chance pour vous enfuir est de vous revˆtir d'une armure "                                     
+                            "Votre seule chance pour vous enfuir est de vous revˆtir d'une armure "
                             "de combat et d'aller 
  la Salle des commandes "
-                            "qui se trouve au niveau le plus ‚loign‚ de la structure. Mais d'abord, vous devez " 
+                            "qui se trouve au niveau le plus ‚loign‚ de la structure. Mais d'abord, vous devez "
                             "empˆcher l'approvisionnement d'eau qui a ‚t‚ infect‚ par Abuse de contaminer "
                             "le monde ext‚rieur. La libert‚ et le sort de l'humanit‚ sont maintenant entre vos mains. " ))
-         
+
          (setq plot_middle
-               (concatenate 'string 
+               (concatenate 'string
                             "Vous avez surv‚cu la vague initiale de contamination, mais vous ˆtes "
                             "encore perdu au fin fond de la prison "
-                            "Jusqu'ici, c'‚tait d'une facilit‚ suspecte. \\n"      
+                            "Jusqu'ici, c'‚tait d'une facilit‚ suspecte. \\n"
                             "Si vous voulez vous ‚chapper, ne manquez pas de jouer 
  Abuse dans son int‚gralit‚. "))
@@ -427 +427 @@
 
          (setq plot_end
-               (concatenate 'string 
+               (concatenate 'string
                             "F‚licitations ! Vous avez r‚ussi 
- survivre dans une situation incroyable et " 
+ survivre dans une situation incroyable et "
                             "vous ˆtes 
  la Salle de commandes.  "

abuse/trunk/data-mac/lisp/gates.lsp

@@ -27 +27 @@
           ("aistate"    ai_state)
           )
-  (states "art/misc.spe" 
+  (states "art/misc.spe"
           (stopped "0_delay")
           (on_state "1_delay")))
@@ -35 +35 @@
   (funs (ai_fun or_ai)
         (draw_fun dev_draw))
-  (states "art/misc.spe" 
+  (states "art/misc.spe"
           (stopped "0_or_gate")
           (on_state "1_or_gate")))
-          
+
 (def_char GATE_AND
   (funs (ai_fun and_ai)
         (draw_fun dev_draw))
-  (states "art/misc.spe" 
+  (states "art/misc.spe"
           (stopped "0_and_gate")
           (on_state "1_and_gate")))
-          
-          
+
+
 (def_char GATE_NOT
   (funs (ai_fun not_ai)
         (draw_fun dev_draw))
-  (states "art/misc.spe" 
+  (states "art/misc.spe"
           (stopped "0_not_gate")
           (on_state "1_not_gate")))
 
-          
+
 (def_char GATE_XOR
   (funs (ai_fun xor_ai)
         (draw_fun dev_draw))
-  (states "art/misc.spe" 
+  (states "art/misc.spe"
           (stopped "0_xor_gate")
           (on_state "1_xor_gate")))
@@ -72 +72 @@
           (on_state "1_pulse")))
 
-          
+
 (def_char INDICATOR
   (funs (ai_fun indicator_ai))
-  (states "art/misc.spe" 
+  (states "art/misc.spe"
           (stopped "0_indicator")
           (on_state "1_indicator")))
-        
+
 (defun indicator_ai ()
   (if (> (total_objects) 0)
@@ -111 +111 @@
         (or_check (- last_object 1))
       T)))
- 
+
 (defun or_ai ()
   (if (or_check (- (total_objects) 1))
@@ -121 +121 @@
       (set_aistate 0))) T)
 
-        
+
 (defun and_check (last_object)
   (if (< last_object 0)
@@ -128 +128 @@
         nil
       (and_check (- last_object 1)))))
-   
- 
+
+
 (defun and_ai ()
   (if (and_check (- (total_objects) 1))

abuse/trunk/data-mac/lisp/general.lsp

@@ -25 +25 @@
 
 (defun spring_cons () (set_yvel -15))
-(defun spring_ai () 
+(defun spring_ai ()
   (if (or (eq (total_objects) 0) (not (eq (with_object (get_object 0) (aistate)) 0)))
       (select (aistate)
@@ -32 +32 @@
                    (let ((add_yvel (yvel)))
                      (play_sound SPRING_SOUND 127 (x) (y))
-                     (with_object (bg) 
+                     (with_object (bg)
                               (progn
                                 (set_yvel (+ (yvel) add_yvel))
@@ -58 +58 @@
           (running (rep "spri0001.pcx" 4))))
 
-(defun pr_draw () 
+(defun pr_draw ()
   (draw_predator)
 
   )
-  
+
 
 (defun train_ai ()
@@ -69 +69 @@
           (let ((type (aitype)))
             (with_object (bg)
-                         (if (local_player)     
-                             (progn                              
+                         (if (local_player)
+                             (progn
                                (play_sound (aref voice_hints type))
                                ;(expire_cache_item (aref voice_hints type))
@@ -93 +93 @@
   (states "art/misc.spe"
           (stopped "bubble")))
-        
+
 (defun sball_damage (amount from hitx hity push_xvel push_yvel)  ; transfer damage to lower half
   (if (eq (state) stopped)
@@ -105 +105 @@
         (ai_fun do_nothing))
   (flags (hurtable T))
-  (states "art/misc.spe" 
+  (states "art/misc.spe"
           (stopped (seq "swit" 1 9))
           (running (seq "swit" 10 18))))
@@ -114 +114 @@
           (stopped "pointer")))
 
-(defun shifter_cons () 
-  (set_xvel 300) 
-  (set_yvel 300) 
-  (set_xacel 0) 
+(defun shifter_cons ()
+  (set_xvel 300)
+  (set_yvel 300)
+  (set_xacel 0)
   (set_yacel -1))
 
 (defun holder_ai ()
   (select (total_objects)
-          (2 
+          (2
            (let ((newx (+ (with_object (get_object 1) (x)) (xvel)))
                  (newy (+ (with_object (get_object 1) (y)) (yvel))))
@@ -129 +129 @@
              (set_y newy)
              T))
-          (3  
+          (3
            (if (with_object (get_object 2) (not (eq (aistate) 0)))
                (let ((newx (+ (with_object (get_object 1) (x)) (xvel)))
@@ -137 +137 @@
                  (set_y newy)
                  T)
-             (if (eq (xacel) 1) 
+             (if (eq (xacel) 1)
                  nil
                T)))
@@ -145 +145 @@
           (0 nil)
           (1 nil)))
-  
+
 
 (def_char OBJ_HOLDER

abuse/trunk/data-mac/lisp/german.lsp

@@ -6 +6 @@
 
 
-(select section 
+(select section
         ('game_section
 
@@ -104 +104 @@
          (setq sens_cs            "Jetztstatus")
          (setq tp_amb             "Umgebung")
-         
-
-               
+
+
+
          (setq ai_xvel            "Xvel    ")
          (setq ai_yvel            "Yvel    ")
@@ -118 +118 @@
          (setq ai_state           "AI-Status")
          (setq ai_fade            "Transparenz 0-15")
-         
+
          (setq a_ambient          "Umgebung      ")
          (setq a_aspeed           "Umgeb.-Tempo")
@@ -133 +133 @@
          (setq ap_pal             "Palette hinzu")
          (setq mouse_at           "Maus an Punkt %d, %d\n")
-         
+
 
          (setq l_links            "Link")
@@ -152 +152 @@
          (setq y_div              "Y div")
 
-         /*********** New for Version 1.45 ***********************/ 
-
-
-;; Weitere Einzelheiten zu den Benutzerrechten unter Lizenzrechte. 
+         /*********** New for Version 1.45 ***********************/
+
+
+;; Weitere Einzelheiten zu den Benutzerrechten unter Lizenzrechte.
 
 
@@ -161 +161 @@
          (setq edit_top           "Bearbeiten")
          (setq window_top         "Fenster")
-         (setq menu1_load         "Level laden")         
+         (setq menu1_load         "Level laden")
          (setq menu1_save         "Level speichern (S)")
          (setq menu1_saveas       "Level speichern als")
@@ -206 +206 @@
          (setq level_size "LevelgrӇe")
                            ; 012345678901234567 (please keep same allignment of Name level & total)
-         (setq score_header "Name              Level gesamt")   ; V-E 
+         (setq score_header "Name              Level gesamt")   ; V-E
          (setq space_cont "LEERTASTE, um fortzufahren ")        ; V-E
          (setq no_saved "Kein gespeichertes Spiel")
@@ -221 +221 @@
          (setq gamma_msg "Klicken Sie die dunkelste Farbe \nauf Ihrem Monitor an, und klicken Sie OK.")
          (setq telep_msg "Pfeiltaste  (unten) drcken, um zu teleportieren.")
- 
 
          (defun get_train_msg (message_num)
-           (select message_num    
+           (select message_num
                    (0 "Mit der Maus zielen und mit Linksklick feuern.")
                    (1 "Munition sammeln, um Schuárate zu erh”hen.")
@@ -237 +236 @@
                    (10 "Kugel anschieáen, um zu aktivieren.")
                    (11 "Pfeiltaste (unten) drcken, um zu teleportieren.")))
-        
+
  (setq not_there       "Spiel l„uft nicht mehr ")
  (setq max_error       "Max Spielerzahl sollte gleich oder mehr als Min Spielerzahl sein ") ; V-C changed
@@ -270 +269 @@
                                            "    - TSR's u. fr ABUSE nicht ben”tigte Treiber beseitigen\n"
                                            "    - Machen Sie mehr Speicher frei\n"))
-         
+
          (setq no_mem    (concatenate 'string "Nicht gengend Speicher verfgbar\n"
                                            "  Vorschl„ge...\n"
                                            "    - Startdiskette erstellen (Info im Handbuch)\n"
                                            "    - TSR's u. fr ABUSE nicht ben”tigte Treiber beseitigen\n"
- 
                                            "    - Machen Sie mehr Speicher frei\n"))
 
@@ -311 +309 @@
          (setq to_be_continued "Fortsetzung folgt.....")
          (setq no_edit         "Diese Abuse-Version hat keine Edit-Funktionen")
-         (setq no_hirez        "High-Res. gibt es nur im Edit-Modus (-edit)") 
+         (setq no_hirez        "High-Res. gibt es nur im Edit-Modus (-edit)")
          (setq no2             "-2 kann nicht mit -edit zusammen benutzt werden")
          (setq no_pals         "Paletten sind nicht definiert")
@@ -321 +319 @@
          (setq d_nosel         "Kein Objekt oder Licht zum L”schen ausgew„hlt.")
          (setq forward?        "Welches Objekt mitnehmen?")
-         (setq back?           "Welches Objekt zurcklegen?") 
+         (setq back?           "Welches Objekt zurcklegen?")
          (setq aitype?         "AI „ndern wofr?")
          (setq prof_off        "Cache-Profiling ist jetzt aus.")
@@ -332 +330 @@
          (setq quit_title      "Abbrechen")
          (setq YES             "JA")
-         (setq NO              "NEIN")     
+         (setq NO              "NEIN")
          (setq seqs_off        "Kontinuierliche Bildsequenzen aus\n")
          (setq seqs_on         " Kontinuierliche Bildsequenzen an (1 Bild alle 5 Sek)\n")
@@ -353 +351 @@
          (setq SAVE            "SPEICHERN")   ; don't let this get too long
 
-         (setq net_not_reg  
+         (setq net_not_reg
                (concatenate 'string "Dieser Server betreibt die REGISTRIERTE ABUSE Version, Sie aber nicht.\n"
                             "Bitten Sie den Betreiber des Servers, mit der Shareware-Version zu spielen,\n"
@@ -368 +366 @@
          (setq load_warn nil)
          (if (not (load "register/english.lsp"))
-             (setq end_msg 
-                   (concatenate 'string 
-                                "* Žndern Sie LISP/OPTIONS.LSP, um einige Optionen fr ABUSE zu
-"
+             (setq end_msg
+                   (concatenate 'string
+                                "* Žndern Sie LISP/OPTIONS.LSP, um einige Optionen fr ABUSE zu\n"
                                 "    konfigurieren.\n\n"
-                                "* Halten Sie beim Einkaufsbummel die Augen auf, denn Ende M„rz '96 erscheint die "                             
+                                "* Halten Sie beim Einkaufsbummel die Augen auf, denn Ende M„rz '96 erscheint die "
                                 "  kommerzielle Version von ABUSE fr acht Spieler, IPX-Netzwerk untersttzt, \n"
-                                "  mit einem eingebauten Level-Editor, 17 Einzelspieler-Level plus 12 Exklusiv-
-"
+                                "  mit einem eingebauten Level-Editor, 17 Einzelspieler-Level plus 12 Exklusiv-\n"
                                 "  Netzwerk- \n Level, todbringenderen Waffen, extra Powerups, \n"
-                                "  st„rkeren Feinden, besseren Soundeffekten und noch mehr knstlerischen
-"
+                                "  st„rkeren Feinden, besseren Soundeffekten und noch mehr knstlerischen\n"
                                 "  Effekten.\n\n"
 
@@ -395 +390 @@
 
          (setq plot_start
-               (concatenate 'string 
-                            "Ihr Name ist Nick Vrenna. Wir schreiben das Jahr 2009. Sie werden zu Unrecht in 
-"
+               (concatenate 'string
+                            "Ihr Name ist Nick Vrenna. Wir schreiben das Jahr 2009. Sie werden zu Unrecht in \n"
                             "einem streng bewachten unterirdischen Gef„ngnis festgehalten, "
                             "wo illegale genetische Experimente durchgefhrt werden.\\n"
                             "Alan Blake, der leitende Wissenschaftler der Forschungsabteilung, hat das Gen isoliert, "
                             "das in Menschen Gewalt und Aggressionen hervorruft. Diese genetische Sequenz, die "
-                            '(#\") "Abuse" '(#\") " heiát, ist hochansteckend und verursacht schreckliche "                                                 
+                            '(#\") "Abuse" '(#\") " heiát, ist hochansteckend und verursacht schreckliche "
                             "Transformationen und groteske Nebenwirkungen. "
                             "Sie sind die einzige Person, die dagegen immun ist. \\n"
-                            "Im Gef„ngnis bricht ein Aufstand aus, und w„hrend dieses wilden Durcheinanders werden "                
+                            "Im Gef„ngnis bricht ein Aufstand aus, und w„hrend dieses wilden Durcheinanders werden "
                             "alle Zellentren ge”ffnet. Bald sind alle, sowohl W„rter als auch Str„flinge, infiziert "
                             "und werden in Mutanten transformiert, "
                             "die das Geb„ude in ihre Gewalt bringen.\\n"
                             "Ihre einzige Chance zu entkommen ist es, den Kampfanzug anzuziehen und m”glichst "
-                            "schnell zum Kontroll-Raum zu gelangen, der im untersten Geschoá des Geb„udes liegt. "                          
+                            "schnell zum Kontroll-Raum zu gelangen, der im untersten Geschoá des Geb„udes liegt. "
                             "Erst mssen Sie jedoch die Wasserversorgung des Gef„ngnisses unterbrechen, damit "
                             "das Abuse-infizierte Wasser nicht auch noch die Auáenwelt vergiften kann. Freiheit und "
@@ -418 +412 @@
 
          (setq plot_middle
-               (concatenate 'string 
+               (concatenate 'string
                             "Sie haben den anf„nglichen Aufstand berlebt, haben sich aber im Gef„ngnis komplett "
-                            "verirrt. Bis jetzt war es verd„chtig einfach. \\n"       
-                            "Wenn Sie ausbrechen wollen - liegt das wirkliche ABUSE noch vor Ihnen. ")) 
+                            "verirrt. Bis jetzt war es verd„chtig einfach. \\n"
+                            "Wenn Sie ausbrechen wollen - liegt das wirkliche ABUSE noch vor Ihnen. "))
 
 
          (setq plot_end
-               (concatenate 'string 
+               (concatenate 'string
                             "Glckwunsch! Sie haben das Undenkbare berlebt  und sind bis in den Kontroll-Raum "
                             "vorgedrungen. Sie haben den Schalter umgelegt, somit die Wasserversorgung "
-                            "umgeleitet und der Verbreitung von Abuse Einhalt geboten! "))) 
+                            "umgeleitet und der Verbreitung von Abuse Einhalt geboten! ")))
 )
 

abuse/trunk/data-mac/lisp/guns.lsp

@@ -8 +8 @@
 */
 
-(setq gun_tints (make-array 11 :initial-contents (list 
+(setq gun_tints (make-array 11 :initial-contents (list
                                                   normal_tint
                                                   (def_tint "art/tints/guns/orange.spe") ; orange
@@ -22 +22 @@
 
 
-(setq ai_ammo (make-array 9 :initial-contents (list MBULLET_ICON5 
-                                                MBULLET_ICON5 
+(setq ai_ammo (make-array 9 :initial-contents (list MBULLET_ICON5
+                                                MBULLET_ICON5
                                                 GRENADE_ICON2
-                                                ROCKET_ICON2 
+                                                ROCKET_ICON2
                                                 PLASMA_ICON20
-                                                MBULLET_ICON5 
-                                                MBULLET_ICON5 
-                                                MBULLET_ICON5 
+                                                MBULLET_ICON5
+                                                MBULLET_ICON5
+                                                MBULLET_ICON5
                                                 MBULLET_ICON5)))
 
@@ -50 +50 @@
                                         (setq sgb_bright_color (find_rgb 255 255 200))
                                         (setq sgb_medium_color (find_rgb 150 150 0))
-                                        (if creator 
+                                        (if creator
                                             (progn
                                               (setq sgb_speed (+ sgb_speed (/ (xvel) 2)))
@@ -64 +64 @@
                                         (setq sgb_lasty (y))
                                         (setq sgb_angle angle)
-                                        
+
                                         (setq sgb_bright_color (find_rgb 255 128 64))
                                         (setq sgb_medium_color (find_rgb 255 0 0))
-                                        (if creator 
+                                        (if creator
                                             (progn
                                               (setq sgb_speed (+ sgb_speed (/ (xvel) 2)))
@@ -77 +77 @@
                             (play_sound GRENADE_THROW 127 x y)
                             (set_course angle 20)
-                            (if creator 
+                            (if creator
                                 (progn
                                   (link_object creator)
@@ -83 +83 @@
                                   (set_yvel (+ (yvel) (with_object creator (yvel))))
                                   ))
-                            
+
                             (set_frame_angle 0 359 angle)
                             )))
@@ -93 +93 @@
 
                             (if (and target   ;; don't link if not in line of site
-                                     (can_see (x) (y) 
+                                     (can_see (x) (y)
                                               (with_object target (x))
                                               (with_object target (y)) nil))
@@ -111 +111 @@
                                         (setq sgb_lastx (x))
                                         (setq sgb_lasty (y))
-                                        (if creator 
+                                        (if creator
                                               (link_object creator))
                                         (set_course angle 200)
@@ -119 +119 @@
                                           (if (not (eq bx T))
                                               (if (eq bx nil)
-                                                  (add_object EXPLODE5 (- (x) (random 5)) 
+                                                  (add_object EXPLODE5 (- (x) (random 5))
                                                               (- (y) (random 5)) 0)
                                                 (progn
-                                                  (add_object EXPLODE3 (- (x) (random 5)) 
+                                                  (add_object EXPLODE3 (- (x) (random 5))
                                                               (- (y) (random 5)) 0)
-                                                  (do_damage 10 bx (* (cos sgb_angle) 20) 
+                                                  (do_damage 10 bx (* (cos sgb_angle) 20)
                                                              (* (sin sgb_angle) 10)))))
                                           (setq sgb_lastx (x))
@@ -137 +137 @@
                             (play_sound FIREBOMB_SND 127 (x) (y))
                             (set_course angle 20)
-                            (if creator 
+                            (if creator
                                 (progn
                                   (link_object creator)
@@ -148 +148 @@
                                         (set_course angle 25)
                                         (set_aistate angle)
-                                        (if creator 
+                                        (if creator
                                               (link_object creator))
                                         (dfris_ai)
@@ -158 +158 @@
                                         (setq sgb_lastx (x))
                                         (setq sgb_lasty (y))
-                                        (if creator 
+                                        (if creator
                                               (link_object creator))
                                         (set_course angle 45)
@@ -164 +164 @@
                                           (if (not (eq bx T))
                                               (if (not (eq bx nil))
-                                                  (do_damage 30 bx (* (cos sgb_angle) 20) 
+                                                  (do_damage 30 bx (* (cos sgb_angle) 20)
                                                              (* (sin sgb_angle) 10)))))
                                         )))
-                           
+
 
           (9 (with_object (add_object STRAIT_ROCKET x y)
                                       (progn
                                         (play_sound MGUN_SND 127 (x) (y))
-                                        (if creator 
+                                        (if creator
                                               (link_object creator))
                                         (set_aistate angle)
@@ -188 +188 @@
                                         (setq sgb_bright_color (find_rgb 255 0 0))
                                         (setq sgb_medium_color (find_rgb 150 0 0))
-                                        (if creator 
+                                        (if creator
                                             (progn
                                               (setq sgb_speed (+ sgb_speed (/ (xvel) 2)))
@@ -195 +195 @@
                                         )))
 
-          ) 
+          )
 )
 
@@ -227 +227 @@
 
                   (1;; unfold
-                   (if (next_picture) T 
+                   (if (next_picture) T
                      (progn (set_aistate 3)
                             (set_state spray.aim)
@@ -235 +235 @@
 
                   (2;; fold up
-                   (if (next_picture) T 
+                   (if (next_picture) T
                      (progn (set_state stopped)
                             (set_aistate 0))))
 
-                 
+
                   (3;; swivel down
                    (if (> (state_time) spray.fire_delay)
@@ -268 +268 @@
         (set_state stopped)
         T))))
-                
-
-              
-              
-    (defun spray_gun_cons () 
+
+
+
+
+    (defun spray_gun_cons ()
       (setq spray.bullet_speed 20)
       (setq spray.angle_speed  10)
@@ -294 +294 @@
         spray.end_angle
         spray.angle_speed
-        spray.angle)     
+        spray.angle)
 
   (fields ("hp"                 ai_health)
@@ -314 +314 @@
 
 (def_char TRACK_GUN
-  (vars 
+  (vars
         fire_delay            ; how long between each shot
         fire_delay_left
@@ -331 +331 @@
         (constructor track_cons)
         (draw_fun    gun_draw)
-        (damage_fun   guner_damage))    
+        (damage_fun   guner_damage))
 
   (flags (can_block  T)
@@ -387 +387 @@
         (setq angle new_angle))))
 
-(defun track_ai ()   
+(defun track_ai ()
   (if (eq (hp) 0)                                                  ;; are we dead?
       nil
@@ -410 +410 @@
                                               (- angle pangle)
                                             (+ angle (- 360 pangle)))))
-                          (let ((closest_dist (if (> clock_dist 180) 
+                          (let ((closest_dist (if (> clock_dist 180)
                                                   (- 360 clock_dist)
                                                 clock_dist)))
@@ -419 +419 @@
                                   (track_set_angle (mod (+ angle angle_add) 360))
                                 (track_set_angle (mod (+ (- angle angle_add) 360) 360)))
-                              (if (< angle_add 5);; pretty close to target, FIRE!                               
+                              (if (< angle_add 5);; pretty close to target, FIRE!
                                   (track_fire))))))
                     (setq fire_delay_left (- fire_delay_left 1)))
@@ -430 +430 @@
         (set_targetable nil)
         (set_state stopped)
-        T))))  
-          
-        
-
-
-
+        T))))
+
+
+
+
+

abuse/trunk/data-mac/lisp/jugger.lsp

@@ -4 +4 @@
 (defun jug_ai ()
   (if (<= (hp) 0)
-      (if (eq (state) dieing)          
+      (if (eq (state) dieing)
           (if (not (next_picture))
               (progn
@@ -12 +12 @@
         (set_state dieing))
     (if (activated)
-        (progn       
+        (progn
           (set_targetable T)
           (push_char 35 40)
-          (select (aistate) 
+          (select (aistate)
                   (0 ;; prepare to walk toward player
                    (if (eq stationary 0)
@@ -31 +31 @@
                          (set_direction (toward))
                          (let ((curx (x));; save position in case we fall off a cliff
-                               (cury (y)))                   
-                           (if (next_picture) 
+                               (cury (y)))
+                           (if (next_picture)
                                (if (eq (current_frame) 8)
                                    (play_sound JSTOMP_SND 127 (x) (y)))
@@ -54 +54 @@
                              (xspeed (* throw_xvel (direction)))
                              (yspeed throw_yvel))
-                         (with_object (add_object GRENADE (x) (- (y) 24) 1) 
+                         (with_object (add_object GRENADE (x) (- (y) 24) 1)
                                       (progn
                                         (user_fun myself)
@@ -63 +63 @@
                   (3 ;; wait for fire animation
                    (if (next_picture) nil (set_aistate 0))))
-          T) 
+          T)
       (progn (set_targetable nil)
              T))))
-           
+
 (defun jug_cons ()
   (setq throw_xvel 13)
@@ -92 +92 @@
           ("aistate"       ai_state))
 
-  (states "art/jug.spe" 
+  (states "art/jug.spe"
           (stopped "robo0001.pcx")
           (running (seq "rwlk" 1 13))
@@ -113 +113 @@
                (set_targetable T)           ;; can lock into us
                (push_char 30 55)))          ;; push player away
-           
+
            (if (or (< (total_objects) 1)    ;; if not linked or link is on
                    (not (eq (with_object (get_object 0) (aistate)) 0)))
@@ -134 +134 @@
 
            (if (<= (hp) 0)                        ;; are we dead, if so blow up
-               (progn   
-                 (add_object EXPLODE1 (+ (x) 5) (- (y) 10)     0)  
+               (progn
+                 (add_object EXPLODE1 (+ (x) 5) (- (y) 10)     0)
                  (add_object EXPLODE1 (+ (x) -5) (- (y) 15)    2)  ;; wait 2 frames before appearing
                  (add_object EXPLODE1 (+ (x) 10) (- (y) 2)     1)
@@ -148 +148 @@
            (push_char 30 55)
            (< (state_time) 3))))  ;; return nil (dead) if we've been in this state for 3 frames
-      
-                     
-
-(defun explo_damage (amount from hitx hity push_xvel push_yvel)   
+
+
+
+(defun explo_damage (amount from hitx hity push_xvel push_yvel)
   (add_object EXPLODE6 (+ (x) (- 10 (random 20))) (- (y) (random 30))     0)
   (damage_fun amount from hitx hity 0 0)
@@ -167 +167 @@
   (flags (hurtable T)
          (can_block T))
-  (abilities (run_top_speed 4)       
+  (abilities (run_top_speed 4)
              (start_hp      70)
              (push_xrange   1))
@@ -175 +175 @@
           ("rob_hiden"    rob_hide)
           ("hp"           ai_health))
-  (states "art/rob1.spe" 
+  (states "art/rob1.spe"
           (rob_hiding             "hiding")
           (stopped (seq "clen" 1 10))))
@@ -195 +195 @@
                    nil nil nil)
       T)))
-  
+
 (defun who_cache (type) `((,STRAIT_ROCKET) nil))
 
@@ -207 +207 @@
   (flags (hurtable T))
   (abilities (start_hp 20))
-  (vars fire_delay burst_delay burst_total burst_wait burst_left 
+  (vars fire_delay burst_delay burst_total burst_wait burst_left
         max_xvel   max_yvel    smoke_time fire_time)
   (fields ("fire_delay"   who_fdelay)
@@ -217 +217 @@
           ("aistate"      ai_state))
 
-  (states "art/rob2.spe" 
+  (states "art/rob2.spe"
           (stopped (seq "wgo" 1 3))
           (running (seq "wgo" 1 3))
@@ -231 +231 @@
         (setq fire_time (- fire_time 1))
         (if (eq fire_time 0)
-            (progn 
+            (progn
               (setq burst_left burst_total)
               (setq burst_wait 0))))
@@ -244 +244 @@
 
 
-(defun wrob_cons ()       
+(defun wrob_cons ()
   (setq fire_delay 4)
   (setq burst_delay 1)
@@ -267 +267 @@
                    (set_aistate 1))))
               (1;; stop and fire
-               (burst_fire  (+ (x) (* (direction) 28)) (- (y) 35)                     
+               (burst_fire  (+ (x) (* (direction) 28)) (- (y) 35)
                             (if (> (direction) 0)
                                 (mod (- 375 (/ (* burst_left 30) burst_total)) 360)
@@ -274 +274 @@
                    (set_aistate 0))))
       T)))
-              
-    
+
+
 
 
 (def_char WALK_ROB
   (funs (ai_fun wrob_ai)
-        (constructor wrob_cons) 
+        (constructor wrob_cons)
         (damage_fun  guner_damage))
   (abilities (run_top_speed 12))
   (flags (hurtable T) (can_block T))
   (range 300 100)
-  (vars fire_delay burst_delay burst_total burst_wait burst_left 
+  (vars fire_delay burst_delay burst_total burst_wait burst_left
         max_xvel   max_yvel    smoke_time fire_time)
   (fields ("fire_delay"   wrob_fdelay)
@@ -295 +295 @@
           ("aistate"      ai_state))
 
-  (states "art/rob2.spe" 
+  (states "art/rob2.spe"
           (stopped "wwlk0001.pcx")
           (running (seq "wwlk" 1 10))

abuse/trunk/data-mac/lisp/ladder.lsp

@@ -43 +43 @@
           (stopped "step")
           (running "step_gone")))
-  
-        
-        
+
+

abuse/trunk/data-mac/lisp/light.lsp

@@ -9 +9 @@
                        (eq (with_object (get_object 0) (aistate)) 0)
                      nil)))
-                    
+
 
 (defun dim_ai ()
@@ -70 +70 @@
   (flags (unlistable T))
   (fields  ("aistate"    ai_state)
-           ("xvel"       dimmer_step_amount) 
-           ("yvel"       dimmer_steps) 
+           ("xvel"       dimmer_step_amount)
+           ("yvel"       dimmer_steps)
            ("aitype"     dimmer_dist)
            ("xacel"      dimmer_dedist)
@@ -85 +85 @@
         (constructor dim_cons))
   (fields  ("aistate"   ai_state)
-           ("xvel"      dimmer_step_amount) 
+           ("xvel"      dimmer_step_amount)
            ("yvel"      dimmer_steps)
            ("yacel"     dimmer_silent))

abuse/trunk/data-mac/lisp/options.lsp

@@ -50 +50 @@
 
 ; this option allows the game to exit a idle game after 1 minute
-; and go into a demo 
+; and go into a demo
 
 ; (demo_break_enable)

abuse/trunk/data-mac/lisp/people.lsp

@@ -3 +3 @@
 
 (setq bright_tint (def_tint "art/tints/cop/bright.spe"))  ;; used when the player fires a weapon
-(setq player_tints (make-array 8 :initial-contents (list 
+(setq player_tints (make-array 8 :initial-contents (list
                                                     0                                      ; 0 this is not used
                                                     (def_tint "art/tints/cop/blue.spe")    ; 1 bright blue
@@ -15 +15 @@
 )))
 
-(setq player_text_color (make-array 8 :initial-contents (list 
+(setq player_text_color (make-array 8 :initial-contents (list
                                                          43       ; 0 brown
                                                          216      ; 1 blue
@@ -25 +25 @@
                                                          192)))   ; 7 purple
 
-(setq cop_dead_parts (make-array (* 4 3) :initial-contents 
+(setq cop_dead_parts (make-array (* 4 3) :initial-contents
                                ;       head           arm            leg
                              '((CP_1  "4dha") (CP_2  "4daa") (CP_3  "4dba")     ; disapear
@@ -35 +35 @@
 (do ((i 0 (setq i (+ i 1))))
            ((>= i 12) nil)
-           (setq (aref cop_dead_parts i) 
-                 (make_dead_part (car (aref cop_dead_parts i))            
+           (setq (aref cop_dead_parts i)
+                 (make_dead_part (car (aref cop_dead_parts i))
                                  (car (cdr (aref cop_dead_parts i))) 4 "art/cop.spe" 'dead_cop_part_draw)))
 
@@ -49 +49 @@
 
 
-                                  
+
 
 (defun give_player_health (amount)
@@ -70 +70 @@
         T)))
 )
-    
+
 
 
@@ -122 +122 @@
       nil
     (select signal
-            (SET_SNEAKY_TIME 
-             (progn 
+            (SET_SNEAKY_TIME
+             (progn
                (set_sneaky_time value)
                (with_obj0 (set_sneaky_time value))))
             (SET_VISOR_TIME (set_visor_time value))
-            (SET_FAST_TIME 
-             (progn 
+            (SET_FAST_TIME
+             (progn
                (set_fast_time value)
                (with_obj0 (set_fast_time value))))
-            (SET_FADE_COUNT (set_fade_count value) 
+            (SET_FADE_COUNT (set_fade_count value)
                             (with_obj0 (set_fade_count value)))
-             
+
             )))
-                    
+
 
 (defun cop_adjust_top (return)
@@ -165 +165 @@
             (if (> ym 0)
                 (progn
-                  (if (eq (current_frame) 0) (set_current_frame 9) 
+                  (if (eq (current_frame) 0) (set_current_frame 9)
                     (set_current_frame (- (current_frame) 1)))
                   (set_y (+ (y) 3)))
@@ -188 +188 @@
 
             0)
-        (if (and (>= (yvel) 0) (or (> ym 0) 
+        (if (and (>= (yvel) 0) (or (> ym 0)
                                    (and (< ym 0) (> yd 8))))
             (progn
@@ -202 +202 @@
             (cop_adjust_top (mover xm ym but))))
         ))))
-      
-      
+
+
 (defun undo_special_power (xm ym but)
   (select special_power
@@ -222 +222 @@
                (set_yvel (- (yvel) 1)))
            )
-          
-
-          (FAST_POWER 
+
+
+          (FAST_POWER
            (setq used_special_power 1)
            (setq last1_x (x))
@@ -230 +230 @@
            (if (> (total_objects) 0)
                (with_obj0
-                            (if (> fire_delay1 0) 
+                            (if (> fire_delay1 0)
                                 (setq fire_delay1 (- fire_delay1 1)))))
 
-           
+
            (let ((in_area in_climbing_area)
                  (old_yvel (yvel)))
@@ -240 +240 @@
              (if (and (< ym 0) (eq old_yvel 0) (< (yvel) 0))
                  (set_yvel (+ (yvel) (/ (yvel) 3))))
-                 
+
              )
 
@@ -246 +246 @@
            (setq last2_y (y)))
 
-          (SNEAKY_POWER (if (<= used_special_power 15)                     
+          (SNEAKY_POWER (if (<= used_special_power 15)
                             (setq used_special_power (+ used_special_power 1))))
           ))
@@ -261 +261 @@
     (climb_handler xm ym but)))
 
-/*(defun cop_mover (xm ym but) 
-  (if (> (yvel) 10) 
-      (progn 
+/*(defun cop_mover (xm ym but)
+  (if (> (yvel) 10)
+      (progn
         (set_yacel 0)
         (set_yvel (- (yvel) 1))))  ;; terminal velocity
   (select (aistate)
-          (JUST_START 
-           (if (eq but 0)              ; wait till user lets go of button before moving        
+          (JUST_START
+           (if (eq but 0)              ; wait till user lets go of button before moving
                (progn
                  (set_aistate NORMAL_PLAY)
@@ -299 +299 @@
                    (do_special_power xm ym but)
                  (undo_special_power xm ym but))
-               
+
                (let ((ret (player_move xm ym but))
                      (other (me)))
-                 (with_obj0 
+                 (with_obj0
                               (progn
                                 (set_x (with_object other (x)))
-                                (set_y (- (- (with_object other (y)) -29) 
+                                (set_y (- (- (with_object other (y)) -29)
                                           (with_object other (picture_height))))
                                 ))
@@ -311 +311 @@
                           (not (eq (state) dead)) (not (eq (state) dieing)))
                      (let ((ammo (ammo_total (current_weapon_type))))
-                       (add_ammo (current_weapon_type) (with_obj0 
+                       (add_ammo (current_weapon_type) (with_obj0
                                                                     (user_fun 'FIRE ammo)))
                        nil))
@@ -365 +365 @@
                                              ;; save the level we are so joining clients know which one to load
                                              (if (not (am_a_client))
-                                                 (open_file "addon/deathmat/cur_lev.lsp" "wb" 
+                                                 (open_file "addon/deathmat/cur_lev.lsp" "wb"
                                                             (print `(setq current_net_level ,current_net_level))))
 
@@ -376 +376 @@
 
 
-              ))) 
+              )))
   )
 
@@ -383 +383 @@
           (JUST_START T)
           (NORMAL_PLAY T)))
-             
+
 (defun change_mode (new_mode)
   (setq disable_top_draw (if (should_draw_top? new_mode) 0 1))
@@ -392 +392 @@
       (put_image (- (view_x2) 20) (+ (view_y1) 5) fast_image))
                        (if (eq used_special_power 1)
-                           (if (> (total_objects) 0)                    
+                           (if (> (total_objects) 0)
                                (let ((nowx (x))
                                      (nowy (y))
@@ -431 +431 @@
 
 (defun player_draw (num)
-  (if (eq num 0) 
+  (if (eq num 0)
       (if (eq just_fired 1)           ;; if they just fired a weapon, draw them lite up.. use the bright tint
           (progn
@@ -439 +439 @@
 ;       (draw_tint (aref player_tints (aitype)))
         )
-    (if (eq just_fired 1)    
+    (if (eq just_fired 1)
         (progn
           (draw_double_tint (aref player_tints num) bright_tint)
-          (setq just_fired 0))      ;; ok to change this in the draw function only if it is not accessed anywhere else!      
+          (setq just_fired 0))      ;; ok to change this in the draw function only if it is not accessed anywhere else!
       (draw_tint (aref player_tints num)))))
 
@@ -468 +468 @@
             (setq b_ramp 0)))
 
-        (if (local_player)      
+        (if (local_player)
             (tint_palette r_ramp g_ramp b_ramp))))
 
@@ -474 +474 @@
   (select (aistate)
           (JUST_START (player_draw (player_number)))
-          (NORMAL_PLAY 
+          (NORMAL_PLAY
            (select special_power
                    (NO_POWER (player_draw (player_number)))
@@ -481 +481 @@
                                      (put_image (- (view_x2) 20) (+ (view_y1) 5) health_image)))
                    (FAST_POWER (draw_fast) (player_draw (player_number)))
-                   (FLY_POWER   (player_draw (player_number)) 
+                   (FLY_POWER   (player_draw (player_number))
                                 (if (local_player)
                                     (put_image (- (view_x2) 20) (+ (view_y1) 5) fly_image)))
-                   (SNEAKY_POWER 
+                   (SNEAKY_POWER
                     (if (local_player)
                         (put_image (- (view_x2) 20) (+ (view_y1) 5) sneaky_image))
@@ -503 +503 @@
 
   (if (eq (total_players) 1)     ;; is this a single player game?
-      (request_level_load  (if (eq has_saved_this_level 0) 
+      (request_level_load  (if (eq has_saved_this_level 0)
                                (progn
                                  (set_hp 100)
@@ -514 +514 @@
 
 
-(defun start_cache (type) 
+(defun start_cache (type)
   `((,DARNEL) nil))
 
@@ -539 +539 @@
                                     (aref player_text_color (player_number)))))
                    (p_compass_draw (next_focus player)))))
-  
+
 
 (defun compass_draw ()
@@ -626 +626 @@
           ))
 
-  
+
 (defun clone_ai ()
   (if (and (< (state_time) 200) (not (eq (state) dead)))
@@ -636 +636 @@
                 (-1 (if (blocked_left (move -1 0 0))
                         (set_direction 1)
-                      nil)))        
+                      nil)))
             (if (or (> (state_time) 185) (eq (state) dieing))
                 (set_fade_count (+ (fade_count) 1))
-              nil)          
+              nil)
             T)
         nil))
@@ -649 +649 @@
 
   (or (eq state stopped) (eq state running)
-                        (eq state run_jump) (eq state run_jump_fall) 
+                        (eq state run_jump) (eq state run_jump_fall)
                         (eq state end_run_jump)))
 
@@ -655 +655 @@
   (if (> (total_objects) 0)
       (let ((other  (get_object 0)))
-        (if (or (with_object other (morphing)) 
+        (if (or (with_object other (morphing))
                 (eq (with_object other disable_top_draw) 1)
                 (not (top_draw_state (with_object other (state)))))
@@ -664 +664 @@
                              (with_object other (player_number)))
               (let ((nowx (x))
-                    (nowy (y)))                         
+                    (nowy (y)))
                 (set_x (with_object other (if (> (direction) 0) (x) (+ (x) 2))))
                 (set_y (- (- (with_object other (y)) -29) (with_object other (picture_height))))
@@ -695 +695 @@
 (defun player_fire_weapon (type target)
   (let ((angle (with_obj0 (player_angle_suggestion))))
-                            
+
     (let ((firex (+ (x) (* (cos angle) 17) (xvel)))
           (firey (+ (- (y) (* (sin angle) 16) 20) (yvel))))
-      (if (can_see (x) (- (y) 16) firex firey nil)      
+      (if (can_see (x) (- (y) 16) firex firey nil)
           (progn
             (fire_object  (get_object 0) type firex firey angle target)
@@ -704 +704 @@
         nil))))
 
-/* (defun top_ai () 
+/* (defun top_ai ()
   (if (> (total_objects) 0)
       (let ((myself (get_object 0)))
-      
+
         (set_state rotate)
-        (let ((angle (with_object myself 
+        (let ((angle (with_object myself
                                             (if (> (direction) 0)
                                                 (player_angle_suggestion)
@@ -722 +722 @@
             (select (aistate)
                     (2                  ; start fire up
-                     (progn 
+                     (progn
                        (set_state rotate_fire)
-                       (set_frame_angle 0 359 (with_object myself 
+                       (set_frame_angle 0 359 (with_object myself
                                             (if (> (direction) 0)
                                                 (player_angle_suggestion)
@@ -735 +735 @@
 ;;                          (let ((otype (otype)))
 ;;                            (with_object myself (add_ammo otype -1)))
-;;                          (with_object (add_object (ammo_type) (x) (- (y) 16) 1) 
+;;                          (with_object (add_object (ammo_type) (x) (- (y) 16) 1)
 ;;                                       (user_fun myself))
                           (set_aistate 3)))
@@ -752 +752 @@
                          )))
           (set_otype (with_object myself (weapon_to_type (current_weapon_type)))))))
-  (move 0 0 0) 
+  (move 0 0 0)
   T)
 
@@ -762 +762 @@
   (select signal
           ('FIRE (if (eq (aistate) 0)  ;;  not already firing
-                     (if (> value 0)   ;; have ammo              
-                         (progn                
+                     (if (> value 0)   ;; have ammo
+                         (progn
                            (setq fire_delay1 3)
                            (set_aistate 2)
@@ -769 +769 @@
                                -1
                              0))
-                       (progn                  
+                       (progn
                          (setq fire_delay1 7)
                          (set_aistate 2)
@@ -775 +775 @@
 
                          0))
-                   0))    
+                   0))
           ('RESET_FIRE_OK (>= (state_time) fire_delay1))))
 
@@ -812 +812 @@
                        (setq fire_delay1 12)
                        (set_aistate 2)
-                       (if (player_fire_weapon (ammo_type) 
-                                           (with_obj0 (find_object_in_area 
+                       (if (player_fire_weapon (ammo_type)
+                                           (with_obj0 (find_object_in_area
                                                                         (- (x) 160) (- (y) 160)
-                                                                        (+ (x) 160) (+ (y) 160) 
+                                                                        (+ (x) 160) (+ (y) 160)
                                                                         bad_guy_list)))
                            -1 0))
@@ -835 +835 @@
            (DFRIS_TOP     (list DFRIS_BULLET))
    nil)))
-            
+
 
 (defun make_top_char (symbol base ufun dfun)
@@ -850 +850 @@
                        (stopped        (seq ,base 1 24))))))
 
-              
+
 
 (make_top_char 'MGUN_TOP     "4gma" 'laser_ufun         'top_draw)
@@ -869 +869 @@
                  (if (and (touching_bg) (with_object (bg) (pressing_action_key)))
                      (set_aistate 2)))
-              (2 (set_state running)       
+              (2 (set_state running)
                  (set_aistate 3))
-              (3 (set_aistate 4))           
-              (4 
+              (3 (set_aistate 4))
+              (4
                (let ((spot (get_save_slot)))
                  (set_state stopped)
@@ -892 +892 @@
                )))
   T)
-          
+
 
 (def_char RESTART_POSITION
@@ -909 +909 @@
           (request_level_load (concatenate 'string "levels/level" (digstr (aistate) 2) ".spe")))))
   T)
-        
+
 
 (def_char NEXT_LEVEL
-  (funs (ai_fun next_level_ai)) 
+  (funs (ai_fun next_level_ai))
   (flags (can_block T))
   (fields ("aistate" next_level))
@@ -947 +947 @@
           (set_direction 1))
       (set_fade_count (- (fade_count) 1)))))
-    
-                     
+
+
 (def_char TELE_BEAM
   (funs (ai_fun tele_beam_ai))

abuse/trunk/data-mac/lisp/platform.lsp

@@ -48 +48 @@
       (let ((speed (plat_speed)))
         (let ((newx (- destx (/ (* (- destx sourcex) (xvel)) speed)))
-              (newy (- desty (/ (* (- desty sourcey) (xvel)) speed))))  
+              (newy (- desty (/ (* (- desty sourcey) (xvel)) speed))))
           (progn
             (platform_push (- newx (x)) (- newy (y)))
@@ -57 +57 @@
 (defun platform_ai ()
   (if (or (eq (total_objects) 2)                     ;; no switch to listen to processed as normal
-          (and (eq (total_objects) 3) 
+          (and (eq (total_objects) 3)
                (not (eq (with_object (get_object 2) (aistate)) 0))))  ;; see if switch is active
       (progn
@@ -78 +78 @@
                  (play_sound PLAT_A_SND 127 (x) (y))
                  (set_aitype (- 1 (aitype)))
-                 (set_xvel (plat_speed));; steps to go           
+                 (set_xvel (plat_speed));; steps to go
                  (go_state 3))
-                
+
                 (3 ;; go to dest
-                 (if (eq (xvel) 6) 
+                 (if (eq (xvel) 6)
                      (play_sound PLAT_D_SND 127 (x) (y)))
                  (platform_move (get_object (aitype)) (get_object (- 1 (aitype)))))
@@ -88 +88 @@
     (set_state stopped))
   T)
-                 
 
 
@@ -120 +119 @@
 
 
+

abuse/trunk/data-mac/lisp/playwav.lsp

@@ -9 +9 @@
       nil
     (progn
-      (print (concatenate 'string "Playing " (argv arg_on) 
+      (print (concatenate 'string "Playing " (argv arg_on)
                                   ", type c <ENTER> to continue"))
       (play_sound (def_sound (argv arg_on)))

abuse/trunk/data-mac/lisp/powerup.lsp

@@ -2 +2 @@
 ;; See licensing information for more details on usage rights
 
-(defun key_ai () (if (touching_bg) 
-                     (progn 
+(defun key_ai () (if (touching_bg)
+                     (progn
                        (play_sound YEAH_SOUND 127 (x) (y))
                        nil) T))
 
-(defun hp_up () 
+(defun hp_up ()
         (next_picture)
 
@@ -37 +37 @@
   (states "art/compass.spe" (stopped "compass" )))
 
-(defun fast_ai () 
+(defun fast_ai ()
   (next_picture)
-  (if (touching_bg) 
-      (progn (with_object (bg) 
+  (if (touching_bg)
+      (progn (with_object (bg)
                           (progn
                             (setq special_power FAST_POWER)

abuse/trunk/data-mac/lisp/sfx.lsp

@@ -47 +47 @@
 (def_sound 'TICK_SND       (sfxdir "timerfst.wav"))
 
-(setq PLAYER_PAIN (make-array 4 :initial-contents 
+(setq PLAYER_PAIN (make-array 4 :initial-contents
                               (list (def_sound (sfxdir "plpain01.wav"))
                                     (def_sound (sfxdir "plpain02.wav"))
@@ -58 +58 @@
                                    (def_sound (sfxdir "pldeth05.wav"))
                                    (def_sound (sfxdir "pldeth07.wav")))))
-                                   
+
 
 ;; jugger stomp
@@ -80 +80 @@
 
 ;; shotgun/laser taking from the lava sample
-(def_sound 'ZAP_SND       (sfxdir "zap2.wav")) 
+(def_sound 'ZAP_SND       (sfxdir "zap2.wav"))
 
 ;; rocket launch sound
@@ -93 +93 @@
 
 ;; machine gun hitting the floor, sounds 1 & 2, played randomly
-(def_sound    'MG_HIT_SND1 (sfxdir "mghit01.wav"))   
+(def_sound    'MG_HIT_SND1 (sfxdir "mghit01.wav"))
 (def_sound    'MG_HIT_SND2 (sfxdir "mghit02.wav"))
 
@@ -131 +131 @@
 ;; electricity shooting up from the ground
 (def_sound 'ELECTRIC_SND   (sfxdir "elect02.wav"))
- 
+
 ;; rocket being fired
 (def_sound 'ROCKET_SND     (sfxdir "rocket02.wav"))
@@ -185 +185 @@
 
 
-(setq AMB_SOUNDS (make-array 17 :initial-contents (list 
+(setq AMB_SOUNDS (make-array 17 :initial-contents (list
                                (def_sound (sfxdir "ambtech1.wav"))   ;; 0
                                (def_sound (sfxdir "ambtech2.wav"))  ;; 1
@@ -205 +205 @@
                                )))
 
-(setq voice_hints (make-array 12 :initial-contents (list 
+(setq voice_hints (make-array 12 :initial-contents (list
                                                     (def_sound "sfx/voice/aimsave.wav")
                                                     (def_sound "sfx/voice/ammosave.wav")
@@ -238 +238 @@
       T)))
 
-        
-(defun ambs_cons () 
+
+(defun ambs_cons ()
   (set_xvel 100)  ;; delay time to 100
   (set_yvel 127)) ;; set volume default to 127
 
-(def_char AMBIENT_SOUND 
+(def_char AMBIENT_SOUND
   (funs (ai_fun          amb_sound_ai)
         (draw_fun        dev_draw)
@@ -250 +250 @@
   (range 500 500)
   (fields ("aitype" amb_num)
-          ("yvel"   amb_vol)     
+          ("yvel"   amb_vol)
           ("xvel"   amb_rep)
           ("xacel"  amb_rand))
   (states "art/misc.spe"
           (stopped "sfx_player")))
-        
+
 (setq song_list '("music/abuse01.hmi" "music/abuse02.hmi"))
 (setq current_song song_list)
@@ -265 +265 @@
         (break)
         (setq current_song (cdr current_song))
-        (if (not current_song) 
+        (if (not current_song)
             (setq current_song song_list))
         (break)
         )))
 
-                                    
+
 (defun level_loaded (name)
   (trace)

abuse/trunk/data-mac/lisp/startup.lsp

@@ -6 +6 @@
 (setq load_warn nil)
 
-(if (local_load "addon/deathmat/username.lsp")  
+(if (local_load "addon/deathmat/username.lsp")
   (set_login username))
 
-(if (local_load "addon/deathmat/gamename.lsp")  
+(if (local_load "addon/deathmat/gamename.lsp")
   (set_game_name gamename)
   (set_game_name "Joe's Game"))

abuse/trunk/data-mac/lisp/switch.lsp

@@ -2 +2 @@
 ;; See licensing information for more details on usage rights
 
-(defun switcher_ai () 
+(defun switcher_ai ()
   (next_picture)
   (select (aistate)
@@ -9 +9 @@
                (progn
                  (play_sound SWITCH_SND 127 (x) (y))
-                 (set_state running)             
+                 (set_state running)
                  (set_aistate 1))))
-          (1     ; wait for player to let go of button    
+          (1     ; wait for player to let go of button
            (if (not (with_object (bg) (pressing_action_key)))
                (set_aistate 2)))
@@ -19 +19 @@
                  (play_sound SWITCH_SND 127 (x) (y))
                  (set_state stopped)
-                 (set_aistate 4))))     
+                 (set_aistate 4))))
            (4     ; wait for player to let go of button
             (if (not (with_object (bg) (pressing_action_key)))
@@ -25 +25 @@
            )
 T)
-              
-
-(defun switch_once_ai () 
+
+
+(defun switch_once_ai ()
   (select (aistate)
           (0      ; waiting for player to press, then turn to on
@@ -38 +38 @@
                  (set_aistate 1)))))
   T)
-         
+
 (defun lower_reload () (lower))   ;; move object below all other objects
-     
+
 (def_char SWITCH
   (funs (ai_fun switcher_ai)
         (reload_fun lower_reload))
-  (range 0 0)  
+  (range 0 0)
   (states "art/misc.spe"
           (stopped '("switch_off1" "switch_off2"))
@@ -52 +52 @@
   (funs (ai_fun switch_once_ai)
         (reload_fun lower_reload))
-  (range 0 0)  
+  (range 0 0)
   (states "art/misc.spe"
           (stopped '("switch_off1" "switch_off2"))
@@ -67 +67 @@
   (vars reset_time)
   (fields ("reset_time" switch_reset))
-  (range 0 0)  
+  (range 0 0)
   (states "art/misc.spe"
           (stopped '("switch_off1" "switch_off2"))
@@ -99 +99 @@
   (if (> (total_objects) 1)
       (select (aistate)
-              (0 (if (not (eq (with_object (get_object 0) (aistate)) 0))                     
+              (0 (if (not (eq (with_object (get_object 0) (aistate)) 0))
                      (let ((mex (x))
                            (mey (y)))
@@ -124 +124 @@
                        (with_object (get_object 1) (set_fade_count (- count 1)))
                        T)))))
-                              
+
     nil))
 
@@ -138 +138 @@
   (set_aitype 1)
   (add_hp -10))
-  
+
 
 /* -- compiled code
@@ -144 +144 @@
   (if (eq (aistate) 0)
       (if (and (< (distx) (xvel)) (< (disty) (yvel)))
-          (progn 
+          (progn
             (if (eq (hp) 0)  ;; don't time out
                 (set_aistate 1)
@@ -152 +152 @@
 
         (if (eq (hp) 0)
-            (if (or (> (distx) (xacel)) (> (disty) (yacel)))        
+            (if (or (> (distx) (xacel)) (> (disty) (yacel)))
                 (set_aistate 0))
           (set_aistate (- (aistate) 1))))
@@ -158 +158 @@
 
 (defun sensor_draw ()
-  (if (edit_mode) 
+  (if (edit_mode)
       (progn
         (draw)
@@ -216 +216 @@
           (stopped "off")
           (blocking "on")))
-                    
+
 /*
 (defun sensor_linker_ai ()
   (if (eq (aistate) 0)
       (if (and (< (distx) (xvel)) (< (disty) (yvel)))
-          (progn 
+          (progn
             (if (eq (hp) 0)  ;; don't time out
                 (set_aistate 1)
@@ -229 +229 @@
 
     (if (eq (hp) 0)
-        (if (or (> (distx) (xacel)) (> (disty) (yacel)))            
+        (if (or (> (distx) (xacel)) (> (disty) (yacel)))
             (set_aistate 0))
       (set_aistate (- (aistate) 1)))))
@@ -251 +251 @@
           (stopped "off")
           (blocking "on")))
- 
+
 */
 
@@ -258 +258 @@
       (let ((st (with_object (get_object current) (state))))
         (if (or (eq st dead) (eq st blown_back_dead))
-            (let ((dead_guy (get_object current)))            
+            (let ((dead_guy (get_object current)))
               (remove_object (get_object current))
               dead_guy)
@@ -268 +268 @@
       (let ((find (dead_object (- (total_objects) 1))))
         (if find
-            (add_object (with_object (get_object 0) (otype)) 
+            (add_object (with_object (get_object 0) (otype))
                         (with_object find (x))
                         (with_object find (y))))))
-                         
+
   T)
 
@@ -282 +282 @@
 
 
-(defun death_sen_ai () 
+(defun death_sen_ai ()
   (if (eq (total_objects) 0)
       (progn

abuse/trunk/data-mac/lisp/teleport.lsp

@@ -7 +7 @@
     (with_object (get_object 0)
                  (if (eq (otype) TP_DOOR)
-                     (if (eq is_opening 0)                       
+                     (if (eq is_opening 0)
                          (if (and (< (distx) 100) (< (disty) 80))
                              T
@@ -32 +32 @@
           (play_sound DOOR_DOWN 127 (x) (y)))
       (set_current_frame (- (current_frame) 1)))))
-  
+
 
 (defun tpd_ai ()     ;; teleporting door ai
@@ -49 +49 @@
                 (othery (with_object (get_object 0) (y))))
             (with_object (get_object 0) (link_object player))
-            (with_object player (progn 
-                                  (set_x otherx) 
+            (with_object player (progn
+                                  (set_x otherx)
                                   (set_y othery)))))))
 T)
@@ -56 +56 @@
 
 (defun tp_door_cons () (set_xvel -1))
-(defun tp_door_draw () (set_ambient_light (bg) (xvel)) (draw))   
+(defun tp_door_draw () (set_ambient_light (bg) (xvel)) (draw))
 
 (def_char TP_DOOR

abuse/trunk/data-mac/lisp/userfuns.lsp

@@ -8 +8 @@
       (set_lives first x)
       (set_all_lives (next_focus first) x))))
-  
 
-(defun select_place (x place) 
+
+(defun select_place (x place)
   (- (/ x place) (* (/ x (* place 10)) 10)))
 
-(defun dig2char (x) 
+(defun dig2char (x)
   (code-char (+ x (char-code "0"))))
 
@@ -25 +25 @@
     (reverse-seq name first last))
 )
-(defun forward-seq (name first last) 
-  (if (> first last) 
-      nil 
-    (cons (concatenate 'string name (digstr first 4) ".pcx") 
+(defun forward-seq (name first last)
+  (if (> first last)
+      nil
+    (cons (concatenate 'string name (digstr first 4) ".pcx")
           (forward-seq name (+ 1 first) last))))
-(defun reverse-seq (name last first) 
-  (if (< last first) 
-      nil 
-    (cons (concatenate 'string name (digstr last 4) ".pcx") 
+(defun reverse-seq (name last first)
+  (if (< last first)
+      nil
+    (cons (concatenate 'string name (digstr last 4) ".pcx")
           (reverse-seq name (- last 1) first))))
 */

abuse/trunk/data-mac/lisp/weapons.lsp

@@ -9 +9 @@
       (if (eq bx T)
           T
-        (progn 
+        (progn
           (if (null bx)
               (if (eq (random 2) 0)
@@ -20 +20 @@
             (progn
 ;             (add_panim EXPLO2 (x) (y) (direction))
-;             (add_object EXP_LIGHT (x) (y) 80) 
+;             (add_object EXP_LIGHT (x) (y) 80)
               (do_damage 5 bx (if (> 0 (direction)) -10 10) 0)
               ))
@@ -29 +29 @@
   (if (and (eq (tick) 0)
            (if (< (total_objects) 1)
-               nil           
+               nil
              (let ((mex (x))
                    (mey (y)))
-               (not (with_object (get_object 0) (find_object_in_area (- mex 7) 
-                                                                     (- mey 7) 
-                                                                     (+ mex 7) 
+               (not (with_object (get_object 0) (find_object_in_area (- mex 7)
+                                                                     (- mey 7)
+                                                                     (+ mex 7)
                                                                      (+ mey 7) bad_guy_list))))))
       (progn (next_picture) T)
@@ -44 +44 @@
 
   (add_object EXPLODE1 (- (x) (random 5)) (+ (y) (random 20)) 0)
-  (hurt_radius (x) (y) 60 40 (if (> (total_objects) 0) (get_object 0) nil) 10)     
+  (hurt_radius (x) (y) 60 40 (if (> (total_objects) 0) (get_object 0) nil) 10)
 
   (and (or (< (state_time) 3) (not (eq (xvel) 0)))
        (< (state_time) 20)
        (select (direction)
-              (1 (progn ;(set_xvel 30) 
+              (1 (progn ;(set_xvel 30)
                         (not (blocked_right (move 0 0 0)))
                         ))
-              (-1 (progn ;(set_xvel -30) 
+              (-1 (progn ;(set_xvel -30)
                          (not (blocked_left (move 0 0 0))))))))
-      
-
-
-
-
-(defun mbullet_ufun (creator) 
+
+
+
+
+
+(defun mbullet_ufun (creator)
   (set_direction (with_object creator (direction)))
 
@@ -76 +76 @@
 
 
-(defun firebomb_ufun (creator) 
+(defun firebomb_ufun (creator)
   (set_direction (with_object creator (direction)))
   (link_object creator)
@@ -83 +83 @@
 
 
-(defun player_mine_ufun (creator) 
+(defun player_mine_ufun (creator)
   (set_x (with_object creator (x)))
   (set_y (with_object creator (y)))
@@ -94 +94 @@
   (select (aistate)
           (0
-           ;; wait till no player (just in case), or player lets go of fire button  
-           (if (or (eq 0 (total_objects)) 
+           ;; wait till no player (just in case), or player lets go of fire button
+           (if (or (eq 0 (total_objects))
                    (and (eq (with_object (get_object 0) (player_b1_suggest)) 0)
                         (eq (with_object (get_object 0) (player_b2_suggest)) 0)))
@@ -107 +107 @@
                (do_explo 50 40)
              ))))
-      
+
 
 (def_char MBULLET
-  (funs (ai_fun     mbullet_ai)  
+  (funs (ai_fun     mbullet_ai)
         (draw_fun   dev_draw)     ; you can't see the bullets
         (user_fun   mbullet_ufun))
@@ -118 +118 @@
 
 
-(defun grenade_ufun (creator) 
+(defun grenade_ufun (creator)
   (set_direction (with_object creator (direction)))
   (play_sound GRENADE_THROW 127 (x) (y))
   (select (aitype)
-          (1 (progn (set_xvel (if (> (direction) 0) 
-                                  (+ 13 (random 2)) 
+          (1 (progn (set_xvel (if (> (direction) 0)
+                                  (+ 13 (random 2))
                                 (+ -13 (random 2)))) (set_yvel -4)))
-          (2 (progn (set_xvel (if (> (direction) 0) 
-                                  (+ 7 (random 2)) 
+          (2 (progn (set_xvel (if (> (direction) 0)
+                                  (+ 7 (random 2))
                                 (+ -7 (random 2)))) (set_yvel -10))))
   (set_xvel (+ (xvel) (with_object creator (xvel))))
@@ -133 +133 @@
 
 (defun grenade_cache (type)
-  (list (list EXPLODE1 EXP_LIGHT) 
+  (list (list EXPLODE1 EXP_LIGHT)
         (list GRENADE_SND)))
 
 
 (def_char GRENADE
-  (funs (ai_fun   grenade_ai)  
+  (funs (ai_fun   grenade_ai)
         (get_cache_list_fun grenade_cache)
         (user_fun grenade_ufun))
@@ -147 +147 @@
 
 (def_char FIREBOMB
-  (funs (ai_fun   firebomb_ai)  
+  (funs (ai_fun   firebomb_ai)
         (user_fun firebomb_ufun)
         (get_cache_list_fun grenade_cache)
@@ -159 +159 @@
           (walking "firebomb")))
 
-      
+
 
 (defun ammo_cache (type)    ;; tells what other chars to load in with this character
@@ -169 +169 @@
            (MBULLET_ICON20   `(,SHOTGUN_BULLET ,MGUN_TOP))
            (ROCKET_ICON2     `(,ROCKET ,ROCKET_TOP))
-           (ROCKET_ICON5     `(,ROCKET ,ROCKET_TOP))      
+           (ROCKET_ICON5     `(,ROCKET ,ROCKET_TOP))
            (FBOMB_ICON1      `(,FIREBOMB ,FIREBOMB_TOP))
            (FBOMB_ICON5      `(,FIREBOMB ,FIREBOMB_TOP))
 
            (PLASMA_ICON20    `(,PLASMAGUN_BULLET))
-           (PLASMA_ICON50    `(,PLASMAGUN_BULLET))         
+           (PLASMA_ICON50    `(,PLASMAGUN_BULLET))
 
            (LSABER_ICON50    `(,LSABER_BULLET ,PGUN_TOP))
@@ -183 +183 @@
    nil)))
 
-      
+
 
 /*  written in C
@@ -192 +192 @@
     (dev_draw)))
 
-(defun weapon_icon_ai () 
+(defun weapon_icon_ai ()
   (if (eq0 (aistate))
       (if (activated)
@@ -200 +200 @@
                 (set_aistate 1))
 
-            (if (touching_bg) 
+            (if (touching_bg)
                 (progn
                   (play_sound AMMO_SND 127 (x) (y))
@@ -206 +206 @@
                           (MBULLET_ICON5   (giver 0));; these numbers correspond to status bar position
                           (MBULLET_ICON20  (giver 0))
-                          (GRENADE_ICON2   (giver 1))           
+                          (GRENADE_ICON2   (giver 1))
                           (GRENADE_ICON10  (giver 1))
 
@@ -229 +229 @@
               T))
         T)
-    (if (touching_bg) 
+    (if (touching_bg)
         (progn
           (play_sound AMMO_SND 127 (x) (y))
@@ -235 +235 @@
                   (MBULLET_ICON5   (giver 0));; these numbers correspond to status bar position
                   (MBULLET_ICON20  (giver 0))
-                  (GRENADE_ICON2   (giver 1))           
+                  (GRENADE_ICON2   (giver 1))
                   (GRENADE_ICON10  (giver 1))
 
@@ -259 +259 @@
 
 (defun make_ammo_icon (symbol icon_name increment)
-  (eval (list 'def_char symbol        
+  (eval (list 'def_char symbol
               '(funs (ai_fun weapon_icon_ai)
                      (get_cache_list_fun ammo_cache)
@@ -282 +282 @@
 
 
-(defun guner_cons () 
+(defun guner_cons ()
   (set_xvel 7)     ;; fire speed
   (set_yvel 50)    ;; speed of bullet
@@ -303 +303 @@
             (progn
               (play_sound BLOWN_UP 127 (x) (y))
-              (add_object EXPLODE1 (- hitx (random 10)) (- hity (random 25)) 0)      
-              (add_object EXPLODE1 (+ hitx (random 10)) (+ hity (random 25)) 1)      
-              (add_object EXPLODE1 (- hitx (random 10)) (- hity (random 10)) 2)      
+              (add_object EXPLODE1 (- hitx (random 10)) (- hity (random 25)) 0)
+              (add_object EXPLODE1 (+ hitx (random 10)) (+ hity (random 25)) 1)
+              (add_object EXPLODE1 (- hitx (random 10)) (- hity (random 10)) 2)
               (add_object EXPLODE1 (+ hitx (random 10)) (+ hity (random 10)) 3) ))))
 )
@@ -313 +313 @@
 
 
-                
+
 (defun shot_ai () (eq (bmove nil) T))
 (defun gun_ai ()
@@ -330 +330 @@
                                    (progn
                                      (with_object (add_object VIS_SHOT
-                                                              (+ (x) (* (cos a) 10)) 
+                                                              (+ (x) (* (cos a) 10))
                                                               (- (y) (+ 10 (* (sin a) 10))))
                                                   (progn
@@ -346 +346 @@
 
 
-(defun rocket_ai ()  
+(defun rocket_ai ()
   (if (not (frame_panic))
       (let ((rand (rand_on)))
-        (with_object (add_object SMALL_LIGHT_CLOUD (+ (x) (random 3)) 
+        (with_object (add_object SMALL_LIGHT_CLOUD (+ (x) (random 3))
                                  (- (y) (random 3) (/ (picture_height) 2)))
                      (set_fade_count 11))
@@ -360 +360 @@
                             (- (aistate) angle)
                           (+ (aistate) (- 360 angle)))))
-        (let ((closest_dist (if (> clock_dist 180) 
+        (let ((closest_dist (if (> clock_dist 180)
                                 (- 360 clock_dist)
                               clock_dist)))
@@ -377 +377 @@
   (set_frame_angle 0 359 (aistate))
   (if (or (eq (hp) 0)
-          (not (eq (bmove (if (> (total_objects) 0) (get_object 0) nil)) T)) 
-          (and (> (total_objects) 1) 
+          (not (eq (bmove (if (> (total_objects) 0) (get_object 0) nil)) T))
+          (and (> (total_objects) 1)
                (< (abs (- (with_object (get_object 1) (x)) (x) )) 10)
                (< (abs (- (- (with_object (get_object 1) (y)) (y)) 15 )) 10)))
@@ -385 +385 @@
         nil)
   T))
-          
-
-(defun rocket_ufun (creator) 
+
+
+(defun rocket_ufun (creator)
   (link_object creator)
   (play_sound ROCKET_SND 127 (x) (y))
 
-  (let ((target (with_object creator (find_object_in_area 
+  (let ((target (with_object creator (find_object_in_area
                                       (- (x) 160) (- (y) 160)
                                       (+ (x) 160) (+ (y) 160) bad_guy_list))))
@@ -406 +406 @@
 (def_char ROCKET
   (funs (ai_fun   rocket_ai)
-        (get_cache_list_fun rocket_cache)       
+        (get_cache_list_fun rocket_cache)
         (get_cache_list_fun grenade_cache)
         (user_fun rocket_ufun))
@@ -423 +423 @@
   (setq sgb_lasty (y))
   (setq sgb_speed (/ (* sgb_speed 6) 5))
-  (set_course sgb_angle sgb_speed)  
+  (set_course sgb_angle sgb_speed)
   (if (eq sgb_lifetime 0)
       nil
@@ -452 +452 @@
 
 
-(defun sgun_ufun (creator) 
+(defun sgun_ufun (creator)
   (set_direction (with_object creator (direction)))
   (set_y (- (y) 4))
@@ -466 +466 @@
                (< (abs (- (y) (with_object target (y)))) 100))
           (setq sgb_angle (site_angle target))
-        (if (> (direction) 0)       
+        (if (> (direction) 0)
             (setq sgb_angle 0)
           (setq sgb_angle 180)))))
@@ -474 +474 @@
 
 (def_char SHOTGUN_BULLET
-  (vars sgb_speed sgb_angle sgb_lastx sgb_lasty 
+  (vars sgb_speed sgb_angle sgb_lastx sgb_lasty
         sgb_bright_color sgb_medium_color sgb_lifetime)
   (funs (ai_fun   sgun_ai)