From 83af636a5a24e4690780cbacb7005114150f6169 Mon Sep 17 00:00:00 2001 From: terminx Date: Wed, 17 Sep 2008 22:58:25 +0000 Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@1070 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/astub.c | 48 +++++++++++++++++---------------- polymer/eduke32/source/duke3d.h | 4 +-- polymer/eduke32/source/game.c | 8 +++--- 3 files changed, 31 insertions(+), 29 deletions(-) diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index e7c2c1511..2445fa3de 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -43,7 +43,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #endif -#define BUILDDATE " 20080912" +#define BUILDDATE " 20080917" #define VERSION " 1.2.0devel" static int floor_over_floor; @@ -1546,7 +1546,7 @@ ENDFOR1: inumlines; i++) { Bmemcpy(disptext[i], helppage[curhp]->line[j], 80); - printext16(8,ydim-overridepm16y+28+i*9,12, + printext16(8,ydim-overridepm16y+28+i*9,10, (j==highlightline && curhp==highlighthp && totalclock-lasthighlighttime<120*5)?1:-1, disptext[i],0); @@ -3227,8 +3227,8 @@ void dumpalphabets() void rendertext(short startspr) { char ch, buffer[80], doingspace=0; - short daang, t, alphidx, basetile, linebegspr, curspr; - int i, j, k, dax, day; + short daang = 0, t, alphidx, basetile, linebegspr, curspr; + int i, j, k, dax = 0, day = 0; static unsigned char hgap=0, vgap=4; static unsigned char spcgap[MAX_ALPHABETS], firstrun=1; spritetype *sp; @@ -3288,7 +3288,7 @@ ENDFOR1: sprite[startspr].yoffset = -(((picanm[t])>>16)&255); spritenums = Bmalloc(stackallocsize * sizeof(short)); - if (!spritenums) goto ERROR1; + if (!spritenums) goto ERROR_NOMEMORY; bflushchars(); while (keystatus[0x1] == 0) @@ -3445,7 +3445,7 @@ ENDFOR1: { stackallocsize *= 2; spritenums = Brealloc(spritenums, stackallocsize*sizeof(short)); - if (!spritenums) goto ERROR1; + if (!spritenums) goto ERROR_NOMEMORY; } spritenums[numletters++] = i; } @@ -3485,7 +3485,7 @@ ENDFOR1: } } // --- -ERROR1: +ERROR_NOMEMORY: if (spritenums) Bfree(spritenums); else message("Out of memory!"); @@ -8850,7 +8850,7 @@ static void Keys2d3d(void) if ((!eitherALT && cursectnum >= 0) || (eitherALT && startsectnum >= 0)) { if (tp_lastkeypresstime+120*4 >= totalclock) - message("Please wait while starting Eduke32..."); + message("Please wait while starting EDuke32..."); else { SHELLEXECUTEINFOA sinfo; @@ -8875,7 +8875,7 @@ static void Keys2d3d(void) saveboard("autosave.map",&startposx,&startposy,&startposz,&startang,&startsectnum); else saveboard("autosave.map",&posx,&posy,&posz,&ang,&cursectnum); - message("Board saved to AUTOSAVE.MAP. Starting Eduke32..."); + message("Board saved to AUTOSAVE.MAP. Starting EDuke32..."); Bmemset(&sinfo, 0, sizeof(sinfo)); sinfo.cbSize = sizeof(sinfo); @@ -8886,7 +8886,7 @@ static void Keys2d3d(void) sinfo.nShow = SW_SHOWNORMAL; if (!ShellExecuteExA(&sinfo)) - message("Error launching eduke32!"); + message("Error launching EDuke32!"); Bfree(fullparam); } @@ -9154,13 +9154,14 @@ void faketimerhandler(void) horiz = ((horiz*7+(100-(daang>>1)))>>3); if (horiz < 100) horiz++; if (horiz > 100) horiz--; - +/* if (keystatus[KEYSC_QUOTE] && keystatus[KEYSC_5]) // ' 5 { keystatus[KEYSC_5]=0; editstatus = 1; sidemode = 2; } + */ } extern short brightness; @@ -9965,18 +9966,19 @@ static void EditSpriteData(short spritenum) static char *FuncMenuStrings[] = { - " Replace invalid tiles", - " Delete all spr of tile #", - " Set map sky shade", - " Set map sky height", - " Global Z coord shift", - " Resize selection", - " Global shade divide", - " Global visibility divide " + "Replace invalid tiles", + "Delete all spr of tile #", + "Set map sky shade", + "Set map sky height", + "Global Z coord shift", + "Resize selection", + "Global shade divide", + "Global visibility divide" }; #define MENU_Y_SPACING 8 -#define MENU_BASE_Y 16 +#define MENU_BASE_Y ydim-STATUS2DSIZ+32 + static void FuncMenuOpts(void) { @@ -9991,7 +9993,7 @@ static void FuncMenuOpts(void) do { // x2 = - printext16(x,y,11,2,FuncMenuStrings[i],0); + printext16(x,y,11,0,FuncMenuStrings[i],0); // if (x2 > x2_max) x2_max = x2; y += MENU_Y_SPACING; } @@ -10000,7 +10002,7 @@ static void FuncMenuOpts(void) // drawline16(x-1,MENU_BASE_Y-4,x-1,y,1); // x2 = - printext16(x,MENU_BASE_Y,11,1,"Special functions",0); + printext16(x,MENU_BASE_Y,11,0,"Special functions",0); // drawline16(x-1,MENU_BASE_Y-4,x2+1,MENU_BASE_Y-4,1); // drawline16(x2_max+1,MENU_BASE_Y+16-4,x2_max+1,y-1,1); //drawline16(x2+1,MENU_BASE_Y+16-1,x2_max+1,MENU_BASE_Y+16-1,1); @@ -10009,7 +10011,7 @@ static void FuncMenuOpts(void) static void FuncMenu(void) { char disptext[80]; - int col=0, row=0, rowmax=7, dispwidth = 26, editval = 0, i = -1, j; + int col=0, row=0, rowmax=7, dispwidth = 24, editval = 0, i = -1, j; int xpos = 8, ypos = MENU_BASE_Y+16; disptext[dispwidth] = 0; diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h index c70c42aee..4ccf659ff 100644 --- a/polymer/eduke32/source/duke3d.h +++ b/polymer/eduke32/source/duke3d.h @@ -22,10 +22,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ //------------------------------------------------------------------------- -// this is checked against http://eduke32.com/VERSION -#define BUILDDATE " 20080912" #define APPNAME "EDuke32" #define VERSION " 1.5.0devel" +// this is checked against http://eduke32.com/VERSION +#define BUILDDATE " 20080917" #define HEAD2 APPNAME VERSION BUILDDATE #ifdef __cplusplus diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 17e3fd853..211896eed 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -947,7 +947,7 @@ void getpackets(void) { g_player[(unsigned char)packbuf[2]].gotvote = 1; g_player[(unsigned char)packbuf[2]].vote = packbuf[3]; - Bsprintf(tempbuf,"GOT VOTE FROM %s",g_player[(unsigned char)packbuf[2]].user_name); + Bsprintf(tempbuf,"CONFIRMED VOTE FROM %s",g_player[(unsigned char)packbuf[2]].user_name); adduserquote(tempbuf); } break; @@ -958,7 +958,7 @@ void getpackets(void) vote_map = packbuf[4]; Bsprintf(tempbuf,"%s^00 HAS CALLED A VOTE TO CHANGE MAP TO %s (E%dL%d)",g_player[(unsigned char)packbuf[2]].user_name,map[(unsigned char)(packbuf[3]*MAXLEVELS + packbuf[4])].name,packbuf[3]+1,packbuf[4]+1); adduserquote(tempbuf); - Bsprintf(tempbuf,"PRESS F1 TO VOTE YES, F2 TO VOTE NO"); + Bsprintf(tempbuf,"PRESS F1 TO ACCEPT, F2 TO DECLINE"); adduserquote(tempbuf); for (i=MAXPLAYERS-1;i>=0;i--) { @@ -11334,7 +11334,7 @@ MAIN_LOOP_RESTART: gametext(160,40,tempbuf,0,2+8+16); Bsprintf(tempbuf,"%s (E%dL%d)",map[vote_episode*MAXLEVELS + vote_map].name,vote_episode+1,vote_map+1); gametext(160,48,tempbuf,0,2+8+16); - gametext(160,70,"PRESS F1 TO VOTE YES, F2 TO VOTE NO",0,2+8+16); + gametext(160,70,"PRESS F1 TO ACCEPT, F2 TO DECLINE",0,2+8+16); } if (g_player[myconnectindex].ps->gm&MODE_DEMO) @@ -11657,7 +11657,7 @@ RECHECK: getpackets(); if (g_player[myconnectindex].gotvote == 0 && voting != -1 && voting != myconnectindex) - gametext(160,60,"PRESS F1 TO VOTE YES, F2 TO VOTE NO",0,2+8+16); + gametext(160,60,"PRESS F1 TO ACCEPT, F2 TO DECLINE",0,2+8+16); } if ((g_player[myconnectindex].ps->gm&MODE_MENU) && (g_player[myconnectindex].ps->gm&MODE_EOL))