zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc crap 

git-svn-id: https://svn.eduke32.com/eduke32@186 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-06-07 00:07:39 +00:00
parent 1bab48f5be
commit 8f73605b8d
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
polymer/eduke32/source/actors.c
View File

@ -3283,7 +3283,7 @@ void movetransports(void)
ps[p].jumping_toggle = 1;
ps[p].jumping_counter = 0;
ps[p].poszv += 1024;
// ps[p].poszv += 1024;
}
if(k == 1)

7
polymer/eduke32/source/game.c
View File

@ -477,7 +477,7 @@ if( !(ps[myconnectindex].gm&MODE_GAME) ) { OSD_DispatchQueued(); }
switch(packbuf[1])
{
case 0:
if(voting == myconnectindex)
if(voting == myconnectindex && gotvote[packbuf[2]] == 0)
{
gotvote[packbuf[2]] = 1;
votes[packbuf[2]] = packbuf[3];
@ -498,7 +498,7 @@ if( !(ps[myconnectindex].gm&MODE_GAME) ) { OSD_DispatchQueued(); }
break;
case 2: // cancel map vote
if(packbuf[2] == voting)
if(voting == packbuf[2])
{
voting = -1;
i = 0;
@ -7097,7 +7097,7 @@ void nonsharedkeys(void)
CONTROL_GetInput( &noshareinfo );
}
if(gotvote[myconnectindex] == 0 && voting != -1)
if(gotvote[myconnectindex] == 0 && voting != -1 && voting != myconnectindex)
{
gametext(160,60,"PRESS F1 TO VOTE YES, F2 TO VOTE NO",0,2);
@ -7117,6 +7117,7 @@ void nonsharedkeys(void)
gotvote[myconnectindex] = 1;
KB_ClearKeyDown(sc_F1);
KB_ClearKeyDown(sc_F2);
voting = -1;
}
}

2
polymer/eduke32/source/sector.c
View File

@ -3372,7 +3372,7 @@ void checksectors(short snum)
if(j >= 0 && wall[j].overpicnum == 0)
if(hittype[neartagsprite].temp_data[0] == 0)
{
if(ud.noexits)
if(ud.noexits && ud.multimode > 1)
{
hittype[p->i].picnum = NUKEBUTTON;
hittype[p->i].extra = 250;

12
polymer/eduke32/source/wrapper.c
View File

@ -1,4 +1,4 @@
// this is a wrapper to launch EDuke32 properly from Dukester X
// this is a wrapper to launch EDuke32 properly from Dukester X 1.5
// gcc -o duke3d_w32.exe wrapper.c
#include <windows.h>
@ -18,6 +18,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
PROCESS_INFORMATION pi;
strcpy(sCmdLine,lpCmdLine);
szFileName[0] = '\0';
while(sCmdLine[i] == ' ') i++;
while(i < (signed)strlen(sCmdLine))
@ -36,15 +37,16 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
}
else CmdLine[i] = sCmdLine[i];
i++;
CmdLine[i] = '\0';
}
if(szFileName[0] && CmdLine[0]) sprintf(sCmdLine,"eduke32.exe %s -rmnet %s",CmdLine,szFileName);
else if(CmdLine[0]) sprintf(sCmdLine,"eduke32.exe %s",CmdLine);
if(szFileName[0] != '\0' && CmdLine[0] != '\0') sprintf(sCmdLine,"eduke32.exe %s -rmnet %s",CmdLine,szFileName);
else if(CmdLine[0] != '\0') sprintf(sCmdLine,"eduke32.exe %s",CmdLine);
else sprintf(sCmdLine,"eduke32.exe");
szCmdLine = sCmdLine;
fprintf(fp,"EDuke32 wrapper for Dukester X v0.01\n");
fprintf(fp,"EDuke32 wrapper for Dukester X v0.02\n");
fprintf(fp,"Copyright (c) 2006 EDuke32 team\n\n");
fprintf(fp,"Args passed to wrapper: %s\n",lpCmdLine);
fprintf(fp,"Final command line: %s",szCmdLine);