From c432ba1f5f079fbaad086672f65f8d9f9016bec4 Mon Sep 17 00:00:00 2001 From: Daveo Date: Tue, 9 Jan 2001 20:38:20 +0000 Subject: [PATCH] --- source/level/layertile.cpp | 4 ++-- source/level/layertile.h | 20 ++++---------------- source/level/layertile3d.cpp | 2 +- source/level/layertile3d.h | 2 +- source/level/level.h | 2 +- source/player/player.cpp | 30 ++++++++++++++++++++++++++++++ source/player/player.h | 26 ++++++++++++++++++++++++++ 7 files changed, 65 insertions(+), 21 deletions(-) create mode 100644 source/player/player.cpp create mode 100644 source/player/player.h diff --git a/source/level/layertile.cpp b/source/level/layertile.cpp index 0fb04df25..c2c38caab 100644 --- a/source/level/layertile.cpp +++ b/source/level/layertile.cpp @@ -41,7 +41,7 @@ CLayerTile::~CLayerTile() /*****************************************************************************/ /*****************************************************************************/ /*****************************************************************************/ -void CLayerTile::init(VECTOR &MapPos,int Shift,int Width,int Height) +void CLayerTile::init(DVECTOR &MapPos,int Shift,int Width,int Height) { int Size=Width*Height; @@ -120,7 +120,7 @@ int Pos; /*****************************************************************************/ /*****************************************************************************/ /*****************************************************************************/ -void CLayerTile::think(VECTOR &MapPos) +void CLayerTile::think(DVECTOR &MapPos) { // Update rows and Columns :o) // As these are on the borders, they 'shouldnt' alter any being rendered diff --git a/source/level/layertile.h b/source/level/layertile.h index 8489da7d8..f02df01b1 100644 --- a/source/level/layertile.h +++ b/source/level/layertile.h @@ -6,18 +6,6 @@ #define __LAYER_TILE_H__ -/*****************************************************************************/ -/* -struct sPrimGridElem -{ - TSPRT_16 Prim; -// u16 Tile; -// u16 Flags; - sPrimGridElem *Right; - sPrimGridElem *Down; -}; -*/ - /*****************************************************************************/ struct sPrimGridElem { @@ -49,8 +37,8 @@ public: { TILE_WIDTH=16, TILE_HEIGHT=16, - SCREEN_TILE_WIDTH=32, // fast bits ops :o) - SCREEN_TILE_HEIGHT=16, // fast bits ops :o) + SCREEN_TILE_WIDTH=32, + SCREEN_TILE_HEIGHT=16, SCREEN_TILE_SIZE=SCREEN_TILE_WIDTH*SCREEN_TILE_HEIGHT }; @@ -58,9 +46,9 @@ public: CLayerTile(sLayerHdr *Hdr,sTile *TileList,sTri *TriList,sQuad *QuadList,sVtx *VtxList); virtual ~CLayerTile(); -virtual void init(VECTOR &MapPos,int Shift,int Width=SCREEN_TILE_WIDTH,int Height=SCREEN_TILE_HEIGHT); +virtual void init(DVECTOR &MapPos,int Shift,int Width=SCREEN_TILE_WIDTH,int Height=SCREEN_TILE_HEIGHT); virtual void shutdown(); -virtual void think(VECTOR &MapPos); +virtual void think(DVECTOR &MapPos); virtual void render(); protected: diff --git a/source/level/layertile3d.cpp b/source/level/layertile3d.cpp index 9604c8744..5ea11fa26 100644 --- a/source/level/layertile3d.cpp +++ b/source/level/layertile3d.cpp @@ -28,7 +28,7 @@ CLayerTile3d::~CLayerTile3d() /*****************************************************************************/ /*****************************************************************************/ /*****************************************************************************/ -void CLayerTile3d::init(VECTOR &MapPos,int Shift,int Width,int Height) +void CLayerTile3d::init(DVECTOR &MapPos,int Shift,int Width,int Height) { int Size=Width*Height; diff --git a/source/level/layertile3d.h b/source/level/layertile3d.h index 0b84c51b2..c443ad41f 100644 --- a/source/level/layertile3d.h +++ b/source/level/layertile3d.h @@ -13,7 +13,7 @@ public: CLayerTile3d(sLayerHdr *Hdr,sTile *TileList,sTri *TriList,sQuad *QuadList,sVtx *VtxList); ~CLayerTile3d(); - void init(VECTOR &MapPos,int Shift,int Width,int Height); + void init(DVECTOR &MapPos,int Shift,int Width,int Height); void shutdown(); void render(); diff --git a/source/level/level.h b/source/level/level.h index 15ae7202c..18256d445 100644 --- a/source/level/level.h +++ b/source/level/level.h @@ -25,7 +25,7 @@ private: void initLayers(); sLvlHdr *LevelHdr; - VECTOR MapPos; + DVECTOR MapPos; // Tile Layers diff --git a/source/player/player.cpp b/source/player/player.cpp new file mode 100644 index 000000000..281571a7b --- /dev/null +++ b/source/player/player.cpp @@ -0,0 +1,30 @@ +/**************/ +/*** Player ***/ +/**************/ + +#include "system\global.h" +#include "Game\Thing.h" +#include "Player\Player.h" + +/*****************************************************************************/ +void CPlayer::init() +{ +} + +/*****************************************************************************/ +void CPlayer::shutdown() +{ +} + +/*****************************************************************************/ +void CPlayer::think() +{ +} + +/*****************************************************************************/ +void CPlayer::render() +{ +} + +/*****************************************************************************/ + diff --git a/source/player/player.h b/source/player/player.h new file mode 100644 index 000000000..1d775cf74 --- /dev/null +++ b/source/player/player.h @@ -0,0 +1,26 @@ +/**************/ +/*** Player ***/ +/**************/ + +#ifndef __PLAYER_H__ +#define __PLAYER_H__ + +#include "Game/Thing.h" + +/*****************************************************************************/ +class CPlayer : public CThing +{ +public: + CPlayer(); +virtual ~CPlayer(); + + void init(); + void shutdown(); + void think(); + void render(); + +protected: +}; + +/*****************************************************************************/ +#endif