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

Fixes 

git-svn-id: https://svn.eduke32.com/eduke32@101 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-04-23 08:23:40 +00:00
parent 0f36d845b5
commit 7563c7ec1f
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
polymer/build/src/engine.c
View File

@ -6173,9 +6173,10 @@ void drawmapview(long dax, long day, long zoome, short ang)
globalorientation = (long)sec->floorstat;
if ((globalorientation&1) != 0) continue;
globalpal = sec->floorpal;
if (palookup[sec->floorpal] != globalpalwritten)
{
globalpal = sec->floorpal;
globalpalwritten = palookup[sec->floorpal];
if (!globalpalwritten) globalpalwritten = palookup[globalpal]; // JBF: fixes null-pointer crash
setpalookupaddress(globalpalwritten);

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

@ -9034,7 +9034,7 @@ RECHECK:
if( (ps[myconnectindex].gm&MODE_MENU) && (ps[myconnectindex].gm&MODE_EOL) )
goto RECHECK;
if (KB_KeyPressed(sc_Escape) && (ps[myconnectindex].gm&MODE_MENU) == 0)
if (KB_KeyPressed(sc_Escape) && (ps[myconnectindex].gm&MODE_MENU) == 0 && (ps[myconnectindex].gm&MODE_TYPE) == 0)
{
KB_ClearKeyDown(sc_Escape);
FX_StopAllSounds();
@ -9054,7 +9054,7 @@ RECHECK:
{
if(ud.recstat != 2)
menus();
if( ud.multimode > 1 )
if( ud.multimode > 1 && current_menu != 20003 && current_menu != 20005)
{
ControlInfo noshareinfo;
CONTROL_GetInput( &noshareinfo );

4
polymer/eduke32/source/menus.c
View File

@ -711,7 +711,9 @@ void menus(void)
x = strget(200,50-9,buf,12,0);
if (x) {
if (x == 1) {
Bstrcpy(myname,buf);
if(buf[0]) {
Bstrcpy(myname,buf);
}
// send name update
}
KB_ClearKeyDown(sc_Enter);

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

@ -1217,7 +1217,7 @@ void resetpspritevars(char g)
{
int k;
for(k=0;k<MAXPLAYERS-1;k++) {
for(k=0;k<MAXPLAYERS;k++) {
if(which_palookup == ps[k].palookup) {
which_palookup++;
if( which_palookup >= 17 )