git-svn-id: https://svn.eduke32.com/eduke32@1083 1a8010ca-5511-0410-912e-c29ae57300e0

This commit is contained in:
terminx 2008-09-29 07:38:12 +00:00
parent 16cd3c353d
commit 4437919385
7 changed files with 21 additions and 28 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

View file

@ -526,9 +526,7 @@ extern char buf[1024]; //My own generic input buffer
extern char *fta_quotes[MAXQUOTES],*redefined_quotes[MAXQUOTES]; extern char *fta_quotes[MAXQUOTES],*redefined_quotes[MAXQUOTES];
extern char ready2send; extern char ready2send;
// JBF 20040531: adding 16 extra to the script so we have some leeway void scriptinfo(void);
// to (hopefully) safely abort when hitting the limit
void scriptinfo();
extern intptr_t *script,*scriptptr,*insptr,*labelcode,*labeltype; extern intptr_t *script,*scriptptr,*insptr,*labelcode,*labeltype;
extern int labelcnt,defaultlabelcnt; extern int labelcnt,defaultlabelcnt;
extern int g_ScriptSize; extern int g_ScriptSize;

View file

@ -10834,10 +10834,12 @@ void app_main(int argc,const char **argv)
if (ud.config.CheckForUpdates == 1) if (ud.config.CheckForUpdates == 1)
{ {
initprintf("Checking for updates...\n");
if (time(NULL) - ud.config.LastUpdateCheck > UPDATEINTERVAL) if (time(NULL) - ud.config.LastUpdateCheck > UPDATEINTERVAL)
{ {
if (getversionfromwebsite(tempbuf)) if (getversionfromwebsite(tempbuf))
{ {
initprintf("Current version is %d",atol(tempbuf));
ud.config.LastUpdateCheck = time(NULL); ud.config.LastUpdateCheck = time(NULL);
if (atol(tempbuf) > atol(BUILDDATE)) if (atol(tempbuf) > atol(BUILDDATE))
@ -10864,6 +10866,7 @@ void app_main(int argc,const char **argv)
gameexit(" "); gameexit(" ");
} }
} }
else initprintf("... no upgrade available\n");
} }
else initprintf("update: failed to check for updates\n"); else initprintf("update: failed to check for updates\n");
} }

View file

@ -5573,35 +5573,27 @@ static void AddDefaultDefinitions(void)
AddDefinition("PROJ_YREPEAT",PROJ_YREPEAT,LABEL_DEFINE); AddDefinition("PROJ_YREPEAT",PROJ_YREPEAT,LABEL_DEFINE);
} }
static void InitProjectiles(void) static void InitProjectiles(void)
{ {
int i; int i;
struct
{
int workslike, extra, cstat, extra_rand, hitradius, range;
short spawns, sound, isound, vel, decal, trail, tnum, drop, clipdist, offset, bounces, bsound, toffset;
signed char sxrepeat, syrepeat, txrepeat, tyrepeat, shade, xrepeat, yrepeat, pal, velmult;
} DefaultProjectile =
{
1, 100, -1, -1, 2048, 0,
SMALLSMOKE, -1, -1, 600, BULLETHOLE, -1, 0, 0, 32, 448, numfreezebounces, PIPEBOMB_BOUNCE, 1,
-1, -1, -1, -1, -96, 18, 18, 0, 1
};
if (sizeof(projectile_t) != sizeof(DefaultProjectile))
gameexit("ERROR: InitProjectiles() doesn't match projectile_t");
for (i=MAXTILES-1;i>=0;i--) for (i=MAXTILES-1;i>=0;i--)
{ {
projectile[i].workslike = 1; Bmemcpy(&projectile[i],&DefaultProjectile,sizeof(projectile_t));
projectile[i].spawns = SMALLSMOKE;
projectile[i].sxrepeat = projectile[i].syrepeat = -1;
projectile[i].sound = projectile[i].isound = -1;
projectile[i].vel = 600;
projectile[i].extra = 100;
projectile[i].decal = BULLETHOLE;
projectile[i].trail = -1;
projectile[i].tnum = 0;
projectile[i].toffset = 1;
projectile[i].txrepeat = projectile[i].tyrepeat = -1;
projectile[i].drop = projectile[i].range = 0;
projectile[i].cstat = -1;
projectile[i].shade = -96;
projectile[i].xrepeat = projectile[i].yrepeat = 18;
projectile[i].clipdist = 32;
projectile[i].pal = 0;
projectile[i].extra_rand = -1;
projectile[i].hitradius = 2048;
projectile[i].velmult = 1;
projectile[i].offset = 448;
projectile[i].bounces = numfreezebounces;
projectile[i].bsound = PIPEBOMB_BOUNCE;
} }
Bmemcpy(&defaultprojectile, &projectile, sizeof(projectile)); Bmemcpy(&defaultprojectile, &projectile, sizeof(projectile));
} }

View file

@ -44,7 +44,7 @@ int g_tw;
static int parse(void); static int parse(void);
void scriptinfo() void scriptinfo(void)
{ {
if (script) if (script)
{ {