From 8b3c16e6152a527f9aec1a88a9eed74119de7000 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Wed, 22 Aug 2007 07:52:33 +0000 Subject: major engine cleanup. dependency on baselib removed. engine is now C code (not ansi tho). some other cruft removed aswell --- src/game/game.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/game/game.h') diff --git a/src/game/game.h b/src/game/game.h index 855e964b..45a19105 100644 --- a/src/game/game.h +++ b/src/game/game.h @@ -1,20 +1,20 @@ -#include -#include +#include +#include #include #include "../engine/interface.h" #include "mapres_col.h" -inline baselib::vec2 get_direction(int angle) +inline vec2 get_direction(int angle) { float a = angle/256.0f; - return baselib::vec2(cosf(a), sinf(a)); + return vec2(cosf(a), sinf(a)); } -inline float get_angle(baselib::vec2 dir) +inline float get_angle(vec2 dir) { float a = atan(dir.y/dir.x); if(dir.x < 0) - a = a+baselib::pi; + a = a+pi; return a; } @@ -23,7 +23,7 @@ inline float get_angle(baselib::vec2 dir) #define max(a, b) ( a > b ? a : b) inline bool col_check_point(float x, float y) { return col_check_point((int)x, (int)y) != 0; } -inline bool col_check_point(baselib::vec2 p) { return col_check_point(p.x, p.y); } +inline bool col_check_point(vec2 p) { return col_check_point(p.x, p.y); } // Network stuff -- cgit 1.4.1