From f181a7bec63e2a2a9103b164c7ad80a817c3191e Mon Sep 17 00:00:00 2001 From: Allanis Date: Wed, 27 Feb 2013 23:03:48 +0000 Subject: [PATCH] [Change] Just some standardization --- src/physics.h | 4 ++-- src/pilot.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/physics.h b/src/physics.h index 2f1a189..6e70004 100644 --- a/src/physics.h +++ b/src/physics.h @@ -13,8 +13,6 @@ #define vect_dist(v,u) MOD((v)->x-(u)->x, (v)->y-(u)->y) #define vect_odist(v) MOD((v)->x, (v)->y) -// Misc -double angle_diff(const double ref, double a); // Base of 2D vectors. typedef struct Vec2_ { @@ -22,6 +20,8 @@ typedef struct Vec2_ { double mod, angle; // Polar values. } Vec2; +// Misc +double angle_diff(const double ref, double a); void limit_speed(Vec2* vel, const double speed, const double dt); // Vector manupulation. diff --git a/src/pilot.c b/src/pilot.c index b152202..e2bd618 100644 --- a/src/pilot.c +++ b/src/pilot.c @@ -608,10 +608,10 @@ static Fleet* fleet_parse(const xmlNodePtr parent) { } while((cur = cur->next)); } } while((node = node->next)); -#define MELEMENT(o,s) if((o) == NULL) WARN("Fleet '%s' missing '"s"' element", tmp->name) - MELEMENT(tmp->ai, "ai"); - MELEMENT(tmp->faction, "faction"); - MELEMENT(tmp->pilots, "pilots"); +#define MELEMENT(o,s) if(o) WARN("Fleet '%s' missing '"s"' element", tmp->name) + MELEMENT(tmp->ai==NULL, "ai"); + MELEMENT(tmp->faction==NULL, "faction"); + MELEMENT(tmp->pilots==NULL, "pilots"); #undef MELEMENT return tmp;