maj/OpenArena
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Tom Hicks
2006-07-19 00:15:26 -04:00
parent 41ca59b63c
commit fdf996230e
113 changed files with 79565 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Makefile.macosx
View File

@@ -6,7 +6,7 @@ X11INCLUDEDIR = /usr/X11R6/include
X11LIBDIR = /usr/X11R6/lib
INCLUDE_DIRS = -I$(X11INCLUDEDIR)
LIBRARY_DIRS = -L$(X11LIBDIR)
OBJECTS = screen.o bmp.o camera.o ctrls.o level.o mygl.o myglFont.o myglTexture.o physics.o player.o strmanip.o tga.o vector.o window.o keys.o main.o
OBJECTS = screen.o bmp.o camera.o ctrls.o level.o mygl.o myglFont.o myglTexture.o player.o strmanip.o tga.o vector.o window.o keys.o main.o
LIBS = $(LIBRARY_DIRS) -lGL -lGLU -lXxf86vm -lX11
LIBRARIES =
SO_LIBS =
@@ -48,7 +48,7 @@ bmp.o: bmp.cpp bmp.h mygl.h datatypes.h texture.h
camera.o: camera.cpp camera.h vector.h mygl.h screen.h
$(CPP) -c $(INCLUDE_DIRS) -o camera.o camera.cpp
ctrls.o: ctrls.cpp ctrls.h keys.h physics.h datatypes.h list.h
ctrls.o: ctrls.cpp ctrls.h keys.h datatypes.h list.h
$(CPP) -c $(INCLUDE_DIRS) -o ctrls.o ctrls.cpp
level.o: level.cpp level.h version.h
@@ -63,9 +63,6 @@ myglFont.o: myglFont.cpp myglFont.h
myglTexture.o: myglTexture.cpp myglTexture.h
$(CPP) -c $(INCLUDE_DIRS) -o myglTexture.o myglTexture.cpp
physics.o: physics.cpp physics.h
$(CPP) -c $(INCLUDE_DIRS) -o physics.o physics.cpp
player.o: player.cpp player.h
$(CPP) -c $(INCLUDE_DIRS) -o player.o player.cpp

159
src/entities.h
View File

@@ -1,159 +0,0 @@
//Yank/rename these maybe MapEntities
using namespace std;
using OpenArena::Vec3d;
/*!
* \brief
* Write brief comment for LIGHT here.
*
* Write detailed description for LIGHT here.
*
* \remarks
* Write remarks for LIGHT here.
*
* \see
* Separate items with the '|' character.
*/
struct LIGHT
{
GLfloat coords[4];
GLfloat color[4];
};
/*!
* \brief
* Write brief comment for PLAYER_START here.
*
* Write detailed description for PLAYER_START here.
*
* \remarks
* Write remarks for PLAYER_START here.
*
* \see
* Separate items with the '|' character.
*/
struct PLAYER_START
{
Vec3d coords;
Vec3d heading;
};
/*!
* \brief
* Write brief comment for PLAYER_DEATHMATCH_START here.
*
* Write detailed description for PLAYER_DEATHMATCH_START here.
*
* \remarks
* Write remarks for PLAYER_DEATHMATCH_START here.
*
* \see
* Separate items with the '|' character.
*/
struct PLAYER_DEATHMATCH_START
{
Vec3d coords;
Vec3d heading;
};
/*!
* \brief
* Write brief comment for BOT_START here.
*
* Write detailed description for BOT_START here.
*
* \remarks
* Write remarks for BOT_START here.
*
* \see
* Separate items with the '|' character.
*/
struct BOT_START
{
Vec3d coords;
Vec3d heading;
string name;
};
/*!
* \brief
* Write brief comment for GEOMETRY here.
*
* Write detailed description for GEOMETRY here.
*
* \remarks
* Write remarks for GEOMETRY here.
*
* \see
* Separate items with the '|' character.
*/
struct GEOMETRY
{
int x;
};
/*!
* \brief
* Write brief comment for PROJECTILE here.
*
* Write detailed description for PROJECTILE here.
*
* \remarks
* Write remarks for PROJECTILE here.
*
* \see
* Separate items with the '|' character.
*/
struct PROJECTILE
{
Vec3d heading;
Vec3d start;
Vec3d end;
int dammage;
float creation;
};
//const PROJECTILE BULLET = {{0,0,0},{0,0,0},{0,0,0},5};
//const PROJECTILE SPIKE = {{0,0,0},{0,0,0},{0,0,0},10};
/*!
* \brief
* Write brief comment for ENTITY here.
*
* Write detailed description for ENTITY here.
*
* \remarks
* Write remarks for ENTITY here.
*
* \see
* Separate items with the '|' character.
*/
struct ENTITY
{
PLAYER_START* Player_Start;
int numPlayer_Start;
PLAYER_DEATHMATCH_START* Player_Deathmatch_Start;
int numPlayer_Deathmatch_Start;
BOT_START* Bot_Start;
int numBot_Start;
GEOMETRY* Geometry;
int numGeometry;
PROJECTILE* Projectile;
int numProjectile;
/*!
* \brief
* Write brief comment for ENTITY here.
*
* \throws <exception class>
* Description of criteria for throwing this exception.
*
* Write detailed description for ENTITY here.
*
* \remarks
* Write remarks for ENTITY here.
*
* \see
* Separate items with the '|' character.
*/
ENTITY();
};
enum ITEM_TYPE{/*all weapons go first*/WEAPON_LASERPISTOL = 1, WEAPON_SHOTGUN = 2, ITEM_BANDAGES = 4, RUNE_DAMMAGEMULTIPLIER = 8, RUNE_PROTECTION = 16, RUNE_VAMPIRE = 32, RUNE_SPEED = 64, RUNE_DOC = 128};//This semicolon got rid of 107 errors and no warnings