Assorted trivia.

Make some computer Duke opponent variables in player.c static.

git-svn-id: https://svn.eduke32.com/eduke32@2501 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-03-18 23:18:12 +00:00
parent 359614df70
commit 9628041766
4 changed files with 20 additions and 15 deletions

View file

@ -67,16 +67,17 @@ static void drawpixel_safe(void *s, char a)
#ifdef DEBUGGINGAIDS #ifdef DEBUGGINGAIDS
else else
{ {
static const char *const c = &editorcolors[15]; const char c = editorcolors[15];
drawpixel((intptr_t *)frameplace, *c);
drawpixel((intptr_t *)frameplace+1, *c); drawpixel((intptr_t *)frameplace, c);
drawpixel((intptr_t *)frameplace+2, *c); drawpixel((intptr_t *)frameplace+1, c);
drawpixel((intptr_t *)frameplace+bytesperline, *c); drawpixel((intptr_t *)frameplace+2, c);
drawpixel((intptr_t *)frameplace+bytesperline+1, *c); drawpixel((intptr_t *)frameplace+bytesperline, c);
drawpixel((intptr_t *)frameplace+bytesperline+2, *c); drawpixel((intptr_t *)frameplace+bytesperline+1, c);
drawpixel((intptr_t *)frameplace+2*bytesperline, *c); drawpixel((intptr_t *)frameplace+bytesperline+2, c);
drawpixel((intptr_t *)frameplace+2*bytesperline+1, *c); drawpixel((intptr_t *)frameplace+2*bytesperline, c);
drawpixel((intptr_t *)frameplace+2*bytesperline+2, *c); drawpixel((intptr_t *)frameplace+2*bytesperline+1, c);
drawpixel((intptr_t *)frameplace+2*bytesperline+2, c);
} }
#endif #endif
} }

View file

@ -1693,7 +1693,9 @@ badindex:
{ {
M32_ERROR("Maximum number of sprites reached."); M32_ERROR("Maximum number of sprites reached.");
} }
if (vm.flags&VMFLAG_ERROR) continue;
if (vm.flags&VMFLAG_ERROR)
continue;
if (tw==CON_DUPSPRITE) if (tw==CON_DUPSPRITE)
{ {

View file

@ -5739,8 +5739,10 @@ static int32_t fdmatrix[12][12] =
static int32_t goalx[MAXPLAYERS], goaly[MAXPLAYERS], goalz[MAXPLAYERS]; static int32_t goalx[MAXPLAYERS], goaly[MAXPLAYERS], goalz[MAXPLAYERS];
static int32_t goalsect[MAXPLAYERS], goalwall[MAXPLAYERS], goalsprite[MAXPLAYERS], goalspritescore[MAXPLAYERS]; static int32_t goalsect[MAXPLAYERS], goalwall[MAXPLAYERS], goalsprite[MAXPLAYERS], goalspritescore[MAXPLAYERS];
static int32_t goalplayer[MAXPLAYERS], clipmovecount[MAXPLAYERS]; static int32_t goalplayer[MAXPLAYERS], clipmovecount[MAXPLAYERS];
int16_t searchsect[MAXSECTORS], searchparent[MAXSECTORS];
char dashow2dsector[(MAXSECTORS+7)>>3]; static int16_t searchsect[MAXSECTORS], searchparent[MAXSECTORS];
static char dashow2dsector[(MAXSECTORS+7)>>3];
void computergetinput(int32_t snum, input_t *syn) void computergetinput(int32_t snum, input_t *syn)
{ {
int32_t i, j, k, l, x1, y1, z1, x2, y2, z2, x3, y3, z3, dx, dy; int32_t i, j, k, l, x1, y1, z1, x2, y2, z2, x3, y3, z3, dx, dy;

View file

@ -246,8 +246,8 @@ extern input_t inputfifo[MOVEFIFOSIZ][MAXPLAYERS];
extern playerspawn_t g_playerSpawnPoints[MAXPLAYERS]; extern playerspawn_t g_playerSpawnPoints[MAXPLAYERS];
extern playerdata_t g_player[MAXPLAYERS]; extern playerdata_t g_player[MAXPLAYERS];
#pragma pack(pop) #pragma pack(pop)
extern char dashow2dsector[(MAXSECTORS+7)>>3]; //extern char dashow2dsector[(MAXSECTORS+7)>>3];
extern int16_t searchsect[MAXSECTORS],searchparent[MAXSECTORS]; //extern int16_t searchsect[MAXSECTORS],searchparent[MAXSECTORS];
extern int16_t WeaponPickupSprites[MAX_WEAPONS]; extern int16_t WeaponPickupSprites[MAX_WEAPONS];
extern int32_t g_currentweapon; extern int32_t g_currentweapon;
extern int32_t g_gs; extern int32_t g_gs;