Changeset 494 for abuse/trunk/src/collide.cppTweet

Timestamp:

Apr 17, 2011, 11:56:44 PM (11 years ago)

Author:

Sam Hocevar

Message:

style: remove trailing spaces, fix copyright statements.

File:

• abuse/trunk/src/collide.cpp (modified) (8 diffs)

abuse/trunk/src/collide.cpp

@@ -2 +2 @@
  *  Abuse - dark 2D side-scrolling platform game
  *  Copyright (c) 1995 Crack dot Com
+ *  Copyright (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
  *
  *  This software was released into the Public Domain. As with most public
@@ -51 +52 @@
 {
   collide_patch *next;
-  for (collide_patch *p=first;p;p=next)
+  for (collide_patch *p=first; p; p=next)
   {
     next=p->next;
@@ -161 +162 @@
   int32_t sx1,sy1,sx2,sy2,tx1,ty1,tx2,ty2,hitx=0,hity=0,t_centerx;
 
-  for (int l=0;l<attack_total;l++)
+  for (int l=0; l<attack_total; l++)
   {
     subject=attack_list[l];
@@ -168 +169 @@
 
 
-    for (int j=0;j<target_total && !rec;j++)
-    {
-      target=target_list[j];    
+    for (int j=0; j<target_total && !rec; j++)
+    {
+      target=target_list[j];
       target->picture_space(tx1,ty1,tx2,ty2);
       if (!(sx2<tx1 || sy2<ty1 || sx1>tx2 || sy1>ty2))  // check to see if picture spaces collide
@@ -181 +182 @@
       t_centerx=target->x_center();
       point_list *s_hit,*t_damage;
-    
+
       s_hit=subject->current_figure()->hit;
 
@@ -191 +192 @@
       unsigned char *s_dat=s_hit->data,*t_dat;
       int i,j;
-      for (i=(int)s_hit->tot-1;i>0 && !rec;i--)
-      {
-        for (t_dat=t_damage->data,j=(int)t_damage->tot-1;j>0 && !rec;j--)
+      for (i=(int)s_hit->tot-1; i>0 && !rec; i--)
+      {
+        for (t_dat=t_damage->data,j=(int)t_damage->tot-1; j>0 && !rec; j--)
         {
           int32_t x1,y1,x2,y2,          // define the two line segments to check
           xp1,yp1,xp2,yp2;
 
-          xp1=target->x+target->tx(*t_dat);  t_dat++;    
+          xp1=target->x+target->tx(*t_dat);  t_dat++;
           yp1=target->y+target->ty(*t_dat);  t_dat++;
           xp2=target->x+target->tx(*t_dat);
@@ -207 +208 @@
           x2=subject->x+subject->tx(s_dat[2]);
           y2=subject->y+subject->ty(s_dat[3]);
-    
+
 
           // ok, now we know which line segemnts to check for intersection
           // now check to see if (x1,y1-x2,y2) intercest with (xp1,yp1-xp2,yp2)
-          int32_t _x2=x2,_y2=y2;    
+          int32_t _x2=x2,_y2=y2;
           setback_intersect(x1, y1, x2, y2, xp1, yp1, xp2, yp2,0);
 
@@ -223 +224 @@
         }
         s_dat+=2;
-      }        
+      }
     }
       }