diff --git a/polymer/eduke32/rsrc/build.bmp b/polymer/eduke32/rsrc/build.bmp index 3cd536e11..c0fb4396a 100644 Binary files a/polymer/eduke32/rsrc/build.bmp and b/polymer/eduke32/rsrc/build.bmp differ diff --git a/polymer/eduke32/rsrc/game.bmp b/polymer/eduke32/rsrc/game.bmp index 8bf104000..66a792ea7 100644 Binary files a/polymer/eduke32/rsrc/game.bmp and b/polymer/eduke32/rsrc/game.bmp differ diff --git a/polymer/eduke32/rsrc/game2.psd b/polymer/eduke32/rsrc/game2.psd index 3ef02764b..cfbff24b9 100644 Binary files a/polymer/eduke32/rsrc/game2.psd and b/polymer/eduke32/rsrc/game2.psd differ diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h index c9f25e6f9..d26ad9497 100644 --- a/polymer/eduke32/source/duke3d.h +++ b/polymer/eduke32/source/duke3d.h @@ -526,9 +526,7 @@ extern char buf[1024]; //My own generic input buffer extern char *fta_quotes[MAXQUOTES],*redefined_quotes[MAXQUOTES]; extern char ready2send; -// JBF 20040531: adding 16 extra to the script so we have some leeway -// to (hopefully) safely abort when hitting the limit -void scriptinfo(); +void scriptinfo(void); extern intptr_t *script,*scriptptr,*insptr,*labelcode,*labeltype; extern int labelcnt,defaultlabelcnt; extern int g_ScriptSize; diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index dfc9a28a3..0135c1b26 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -10834,10 +10834,12 @@ void app_main(int argc,const char **argv) if (ud.config.CheckForUpdates == 1) { + initprintf("Checking for updates...\n"); if (time(NULL) - ud.config.LastUpdateCheck > UPDATEINTERVAL) { if (getversionfromwebsite(tempbuf)) { + initprintf("Current version is %d",atol(tempbuf)); ud.config.LastUpdateCheck = time(NULL); if (atol(tempbuf) > atol(BUILDDATE)) @@ -10864,6 +10866,7 @@ void app_main(int argc,const char **argv) gameexit(" "); } } + else initprintf("... no upgrade available\n"); } else initprintf("update: failed to check for updates\n"); } diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c index 7c4dbc5dc..4d1427237 100644 --- a/polymer/eduke32/source/gamedef.c +++ b/polymer/eduke32/source/gamedef.c @@ -5573,35 +5573,27 @@ static void AddDefaultDefinitions(void) AddDefinition("PROJ_YREPEAT",PROJ_YREPEAT,LABEL_DEFINE); } - static void InitProjectiles(void) { 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--) { - projectile[i].workslike = 1; - 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(&projectile[i],&DefaultProjectile,sizeof(projectile_t)); } Bmemcpy(&defaultprojectile, &projectile, sizeof(projectile)); } diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c index 8111ceb8e..18d522e2a 100644 --- a/polymer/eduke32/source/gameexec.c +++ b/polymer/eduke32/source/gameexec.c @@ -44,7 +44,7 @@ int g_tw; static int parse(void); -void scriptinfo() +void scriptinfo(void) { if (script) {