Commit 3665f119 authored by Steven Fuller's avatar Steven Fuller

Now to find a different bug with the player position

parent f0d81dbd
......@@ -10,9 +10,6 @@
=============================================================================
*/
#define MAXMOUSETURN 10
#define MOVESCALE 150l
#define BACKMOVESCALE 100l
#define ANGLESCALE 20
......@@ -25,8 +22,6 @@
=============================================================================
*/
//
// player state info
//
......@@ -54,9 +49,6 @@ void T_Attack (objtype *ob);
statetype s_player = {false,0,0,T_Player,NULL,NULL};
statetype s_attack = {false,0,0,T_Attack,NULL,NULL};
long playerxmove,playerymove;
struct atkinf
{
char tics,attack,frame; // attack is 1 for gun, 2 for knife
......@@ -69,9 +61,6 @@ struct atkinf
{ {6,0,1},{6,1,2},{6,4,3},{6,-1,4} },
};
int strafeangle[9] = {0,90,180,270,45,135,225,315,0};
void DrawWeapon (void);
void GiveWeapon (int weapon);
void GiveAmmo (int ammo);
......@@ -145,16 +134,11 @@ void CheckWeaponChange (void)
void ControlMovement (objtype *ob)
{
long oldx,oldy;
int angle,maxxmove;
int angleunits;
long speed;
thrustspeed = 0;
oldx = player->x;
oldy = player->y;
//
// side to side move
//
......@@ -213,12 +197,6 @@ void ControlMovement (objtype *ob)
if (gamestate.victoryflag) // watching the BJ actor
return;
//
// calculate total move
//
playerxmove = player->x - oldx;
playerymove = player->y - oldy;
}
/*
......
......@@ -70,6 +70,8 @@
#define PLAYERSIZE MINDIST // player radius
#define MINACTORDIST 0x10000l // minimum dist from player center
// to any actor center
#undef PI
#define PI 3.141592657
#define GLOBAL1 (1l<<16)
......@@ -83,8 +85,8 @@
#define MINDIST (0x5800l)
#define MAXSCALEHEIGHT 256 // largest scale on largest view
/* xwolf code needs max height to double */
#define MAXSCALEHEIGHT 512 /* largest scale on largest view */
#define MAXVIEWWIDTH 320
......@@ -559,7 +561,7 @@ typedef struct statestruct
int tictime;
void (*think) (),(*action) ();
struct statestruct *next;
} statetype;
} PACKED statetype;
//---------------------
......@@ -575,7 +577,7 @@ typedef struct statstruct
int shapenum; /* if shapenum == -1 the obj has been removed */
byte flags;
byte itemnumber;
} statobj_t;
} PACKED statobj_t;
//---------------------
//
......@@ -590,7 +592,7 @@ typedef struct doorstruct
byte lock;
enum {dr_open,dr_closed,dr_opening,dr_closing} action;
int ticcount;
} doorobj_t;
} PACKED doorobj_t;
//--------------------
//
......@@ -624,7 +626,7 @@ typedef struct objstruct
int temp1,temp2,temp3;
struct objstruct *next,*prev;
} objtype;
} PACKED objtype;
#define NUMBUTTONS 8
......@@ -682,7 +684,7 @@ typedef struct
long TimeCount;
long killx,killy;
boolean victoryflag; // set during victory animations
} gametype;
} PACKED gametype;
typedef enum {
......@@ -935,9 +937,7 @@ void ClearScreen (void);
int CalcRotate (objtype *ob);
void DrawScaleds (void);
void CalcTics (void);
void FixOfs (void);
void ThreeDRefresh (void);
void FarScalePost (void);
/*
=============================================================================
......
// WL_DRAW.C
/* wl_draw.c */
#include "wl_def.h"
......
......@@ -556,6 +556,8 @@ void BuildTables (void)
====================
*/
#include <sys/mman.h>
void CalcProjection (long focal)
{
int i;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment