Deperecated pod_check() in favor of check_collision();
authorlimb <limb@bc5cbbab-a4ec-0310-bb52-ff3d296db539>
Tue, 5 Dec 2006 12:49:07 +0000 (12:49 +0000)
committerlimb <limb@bc5cbbab-a4ec-0310-bb52-ff3d296db539>
Tue, 5 Dec 2006 12:49:07 +0000 (12:49 +0000)
git-svn-id: svn+ssh://svn/var/repos/curfender@561 bc5cbbab-a4ec-0310-bb52-ff3d296db539

CHANGELOG
main.cpp

index 1104d58..76e7071 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+Deprecated pod_check() in favor of check_collision()
 Can shoot pods.
 Started bullet work
 Put pods in a struct array.
index 12220b9..9b8afb7 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -193,16 +193,6 @@ game_object pod_out(game_object pod){
   return pod;
 }
 
-int pod_check(game_object pod, game_object player){
-  int pod_in = 0;
-  
-  if( (pod.x==player.x)&&((abs(player.y-pod.y)<player.speed&&player.speed>0)||(player.y==pod.y))){
-    pod_in = pod.number;
-  };
-  
-  return pod_in;
-}
-
 game_object process_direction(game_object object, int input){
   if(input==65){input=8;};
   if(input==67){input=6;};
@@ -545,7 +535,11 @@ int main(){
     };
 
     //check for / process pod pickup
-    for(int podloop = 0; podloop<8; podloop++){ if((pod_in==0)&&(pods[podloop].active==1)){pod_in = pod_check(pods[podloop], player);}; };
+    for(int podloop = 0; podloop<8; podloop++){ 
+      if((pod_in==0)&&(pods[podloop].active==1)&&(check_collision(pods[podloop], player)==1)){
+       pod_in = pods[podloop].number;
+      };
+    };
     
     if(pod_in>0){
       strcpy (player.line0, "<==x>");