CON command for earthquakes

git-svn-id: https://svn.eduke32.com/eduke32@444 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2007-01-05 22:30:35 +00:00
parent 7c89d81fda
commit fc4bc3ef70
5 changed files with 25 additions and 25 deletions

View file

@ -521,11 +521,9 @@ extern short mirrorwall[64], mirrorsector[64], mirrorcnt;
#define NUMKEYS 19 #define NUMKEYS 19
extern long frameplace, chainplace, chainnumpages;
#include "funct.h" #include "funct.h"
extern char screencapt; extern int screencapt;
extern short soundps[NUM_SOUNDS],soundpe[NUM_SOUNDS],soundvo[NUM_SOUNDS]; extern short soundps[NUM_SOUNDS],soundpe[NUM_SOUNDS],soundvo[NUM_SOUNDS];
extern char soundpr[NUM_SOUNDS],soundm[NUM_SOUNDS]; extern char soundpr[NUM_SOUNDS],soundm[NUM_SOUNDS];
extern long soundsiz[NUM_SOUNDS]; extern long soundsiz[NUM_SOUNDS];
@ -569,7 +567,7 @@ extern char num_volumes;
extern int32 SoundToggle,MusicToggle; extern int32 SoundToggle,MusicToggle;
extern int last_threehundred,lastsavedpos; extern int last_threehundred,lastsavedpos;
extern char restorepalette; extern int restorepalette;
extern int buttonstat; extern int buttonstat;
extern long cachecount; extern long cachecount;

View file

@ -94,10 +94,10 @@ extern char syncstate;
extern int32 numlumps; extern int32 numlumps;
FILE *frecfilep = (FILE *)NULL; FILE *frecfilep = (FILE *)NULL;
void pitch_test(void);
char restorepalette,screencapt,nomorelogohack; int restorepalette,screencapt;
int sendmessagecommand = -1; static int nomorelogohack;
static int sendmessagecommand = -1;
char defaultduke3dgrp[BMAX_PATH] = "duke3d.grp"; char defaultduke3dgrp[BMAX_PATH] = "duke3d.grp";
char *duke3dgrp = defaultduke3dgrp; char *duke3dgrp = defaultduke3dgrp;
@ -105,33 +105,26 @@ static char *duke3ddef = "duke3d.def";
extern long lastvisinc; extern long lastvisinc;
// JBF 20031221: These ought to disappear when things mature static char colstrip[1024];
extern int showmultidiags;
extern int netmode, nethostplayers;
extern char netjoinhost[64];
int startupnetworkgame(void);
int processnetworkrequests(void);
char colstrip[1024];
int shareware = 0; int shareware = 0;
int gametype = 0; int gametype = 0;
#define MAXUSERQUOTES 4 #define MAXUSERQUOTES 4
long quotebot, quotebotgoal; static long quotebot, quotebotgoal;
short user_quote_time[MAXUSERQUOTES]; static int user_quote_time[MAXUSERQUOTES];
char user_quote[MAXUSERQUOTES][178]; static char user_quote[MAXUSERQUOTES][178];
// char typebuflen,typebuf[41]; // char typebuflen,typebuf[41];
#ifdef JFAUD #ifdef JFAUD
int MAXCACHE1DSIZE = (16*1048576); static int MAXCACHE1DSIZE = (16*1048576);
#else #else
int MAXCACHE1DSIZE = (32*1048576); static int MAXCACHE1DSIZE = (32*1048576);
#endif #endif
long tempwallptr; long tempwallptr;
long nonsharedtimer; static long nonsharedtimer;
static void cameratext(short i); static void cameratext(short i);
static int moveloop(void); static int moveloop(void);
@ -7585,7 +7578,7 @@ FOUNDCHEAT:
static void nonsharedkeys(void) static void nonsharedkeys(void)
{ {
short i,ch; int i,ch;
long j; long j;
if (ud.recstat == 2) if (ud.recstat == 2)
@ -8093,8 +8086,8 @@ FAKE_F3:
if (KB_KeyPressed(sc_F11)) if (KB_KeyPressed(sc_F11))
{ {
KB_ClearKeyDown(sc_F11); KB_ClearKeyDown(sc_F11);
if (SHIFTS_IS_PRESSED) ud.brightness-=8; ud.brightness+=8;
else ud.brightness+=8; if (SHIFTS_IS_PRESSED) ud.brightness-=16;
if (ud.brightness > (7<<3)) if (ud.brightness > (7<<3))
ud.brightness = 0; ud.brightness = 0;

View file

@ -427,6 +427,7 @@ static const char *keyw[] = {
"jump", // 298 "jump", // 298
"qstrlen", // 299 "qstrlen", // 299
"getincangle", // 300 "getincangle", // 300
"quake", // 301
"<null>" "<null>"
}; };
@ -2374,6 +2375,7 @@ static int parsecommand(void)
case CON_CLIPDIST: case CON_CLIPDIST:
case CON_LOTSOFGLASS: case CON_LOTSOFGLASS:
case CON_SAVE: case CON_SAVE:
case CON_QUAKE:
if (!CheckEventSync(current_event)) if (!CheckEventSync(current_event))
ReportError(WARNING_EVENTSYNC); ReportError(WARNING_EVENTSYNC);
case CON_ANGOFF: case CON_ANGOFF:
@ -2388,9 +2390,9 @@ static int parsecommand(void)
{ {
if (*(scriptptr-1) == 32767) if (*(scriptptr-1) == 32767)
{ {
*(scriptptr-1) = 32768;
ReportError(-1); ReportError(-1);
initprintf("%s:%ld: warning: tried to set cstat 32767, using 32768 instead.\n",compilefile,line_number); initprintf("%s:%ld: warning: tried to set cstat 32767, using 32768 instead.\n",compilefile,line_number);
*(scriptptr-1) = 32768;
} }
else if ((*(scriptptr-1) & 32) && (*(scriptptr-1) & 16)) else if ((*(scriptptr-1) & 32) && (*(scriptptr-1) & 16))
{ {

View file

@ -775,5 +775,6 @@ enum keywords {
CON_JUMP, // 298 CON_JUMP, // 298
CON_QSTRLEN, // 299 CON_QSTRLEN, // 299
CON_GETINCANGLE, // 300 CON_GETINCANGLE, // 300
CON_QUAKE, // 301
END END
}; };

View file

@ -5033,6 +5033,12 @@ static int parse(void)
break; break;
} }
case CON_QUAKE:
insptr++;
earthquaketime = (char)GetGameVarID(*insptr++,g_i,g_p);
spritesound(EARTHQUAKE,ps[screenpeek].i);
break;
case CON_IFMOVE: case CON_IFMOVE:
insptr++; insptr++;
parseifelse(g_t[1] == *insptr); parseifelse(g_t[1] == *insptr);