From a7254a4af512dd1d2ece095a9e6e40a5a821560c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 10 Feb 2016 14:43:04 +0100 Subject: [PATCH] - removed the conversion operators from the fixedvec structs (again) They must have been accidentally left in by not properly resolving a merge conflict, I guess. --- src/actor.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/actor.h b/src/actor.h index 30e67fa30..7cfee5500 100644 --- a/src/actor.h +++ b/src/actor.h @@ -572,31 +572,11 @@ struct FStrifeDialogueNode; struct fixedvec3 { fixed_t x, y, z; - - operator FVector3() - { - return FVector3(FIXED2FLOAT(x), FIXED2FLOAT(y), FIXED2FLOAT(z)); - } - - operator TVector3() - { - return TVector3(FIXED2DBL(x), FIXED2DBL(y), FIXED2DBL(z)); - } }; struct fixedvec2 { fixed_t x, y; - - operator FVector2() - { - return FVector2(FIXED2FLOAT(x), FIXED2FLOAT(y)); - } - - operator TVector2() - { - return TVector2(FIXED2DBL(x), FIXED2DBL(y)); - } }; class DDropItem : public DObject