zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

More fixes

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@919 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2008-07-29 09:57:09 +00:00
parent 92d52d8071
commit 6191c05299
6 changed files with 37 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -962,7 +962,7 @@ void movedummyplayers(void)
p = sprite[OW].yvel; p = sprite[OW].yvel;
if (g_player[p].ps->on_crane >= 0 || sector[g_player[p].ps->cursectnum].lotag != 1 || sprite[g_player[p].ps->i].extra <= 0) if (g_player[p].ps->on_crane >= 0 || (g_player[p].ps->cursectnum > -1 && sector[g_player[p].ps->cursectnum].lotag != 1) || sprite[g_player[p].ps->i].extra <= 0)
{ {
g_player[p].ps->dummyplayersprite = -1; g_player[p].ps->dummyplayersprite = -1;
KILLIT(i); KILLIT(i);

16
polymer/eduke32/source/game.c
View file

@ -3174,8 +3174,8 @@ static void drawoverheadmap(int cposx, int cposy, int czoom, short cang)
if (j < 22000) j = 22000; if (j < 22000) j = 22000;
else if (j > (65536<<1)) j = (65536<<1); else if (j > (65536<<1)) j = (65536<<1);
rotatesprite((x1<<4)+(xdim<<15),(y1<<4)+(ydim<<15),j, rotatesprite((x1<<4)+(xdim<<15),(y1<<4)+(ydim<<15),j,daang,i,sprite[g_player[p].ps->i].shade,
daang,i,sprite[g_player[p].ps->i].shade,/*sprite[g_player[p].ps->i].pal*/sector[g_player[p].ps->cursectnum].floorpal, (g_player[p].ps->cursectnum > -1)?sector[g_player[p].ps->cursectnum].floorpal:0,
(sprite[g_player[p].ps->i].cstat&2)>>1,windowx1,windowy1,windowx2,windowy2); (sprite[g_player[p].ps->i].cstat&2)>>1,windowx1,windowy1,windowx2,windowy2);
} }
} }
@ -3412,11 +3412,14 @@ void displayrest(int smoothratio)
SetGameVarID(g_iReturnVarID,0,g_player[screenpeek].ps->i,screenpeek); SetGameVarID(g_iReturnVarID,0,g_player[screenpeek].ps->i,screenpeek);
OnEvent(EVENT_DISPLAYSBAR, g_player[screenpeek].ps->i, screenpeek, -1); OnEvent(EVENT_DISPLAYSBAR, g_player[screenpeek].ps->i, screenpeek, -1);
i = usehightile;
if (r_downsize > 1)
usehightile = 0;
if (GetGameVarID(g_iReturnVarID,g_player[screenpeek].ps->i,screenpeek) == 0) if (GetGameVarID(g_iReturnVarID,g_player[screenpeek].ps->i,screenpeek) == 0)
coolgaugetext(screenpeek); coolgaugetext(screenpeek);
operatefta(); operatefta();
usehightile = i;
if (KB_KeyPressed(sc_Escape) && ud.overhead_on == 0 if (KB_KeyPressed(sc_Escape) && ud.overhead_on == 0
&& ud.show_help == 0 && ud.show_help == 0
&& g_player[myconnectindex].ps->newowner == -1) && g_player[myconnectindex].ps->newowner == -1)
@ -4266,7 +4269,12 @@ int EGS(int whatsect,int s_x,int s_y,int s_z,int s_pn,int s_s,int s_xr,int s_yr,
s->pal = 0; s->pal = 0;
s->lotag = 0; s->lotag = 0;
if (s_ow > -1 && s_ow < MAXSPRITES)
{
hittype[i].picnum = sprite[s_ow].picnum; hittype[i].picnum = sprite[s_ow].picnum;
hittype[i].floorz = hittype[s_ow].floorz;
hittype[i].ceilingz = hittype[s_ow].ceilingz;
}
hittype[i].lastvx = 0; hittype[i].lastvx = 0;
hittype[i].lastvy = 0; hittype[i].lastvy = 0;
@ -4279,8 +4287,6 @@ int EGS(int whatsect,int s_x,int s_y,int s_z,int s_pn,int s_s,int s_xr,int s_yr,
hittype[i].movflag = 0; hittype[i].movflag = 0;
hittype[i].tempang = 0; hittype[i].tempang = 0;
hittype[i].dispicnum = 0; hittype[i].dispicnum = 0;
hittype[i].floorz = hittype[s_ow].floorz;
hittype[i].ceilingz = hittype[s_ow].ceilingz;
T1=T3=T4=T6=T7=T8=T9=0; T1=T3=T4=T6=T7=T8=T9=0;

3
polymer/eduke32/source/menus.c
View file

@ -2513,12 +2513,13 @@ cheat_for_port_credits:
{ {
i = r_downsize; i = r_downsize;
enabled = usehightile; enabled = usehightile;
_bar(1,d+8,yy+7, &r_downsize,-1,enabled && x==io,MENUHIGHLIGHT(io),!enabled,0,5); _bar(1,d+8,yy+7, &r_downsize,-1,enabled && x==io,MENUHIGHLIGHT(io),!enabled,0,2);
if (r_downsize != i) if (r_downsize != i)
{ {
resetvideomode(); resetvideomode();
if (setgamemode(fullscreen,xdim,ydim,bpp)) if (setgamemode(fullscreen,xdim,ydim,bpp))
OSD_Printf("restartvid: Reset failed...\n"); OSD_Printf("restartvid: Reset failed...\n");
return;
} }
break; break;
} }

7
polymer/eduke32/source/player.c
View file

@ -1743,6 +1743,7 @@ SKIPBULLETHOLE:
k = 0; k = 0;
// RESHOOTGROW: // RESHOOTGROW:
if (sect < 0) break;
s->cstat &= ~257; s->cstat &= ~257;
if (hittype[i].temp_data[9]) zvel = hittype[i].temp_data[9]; if (hittype[i].temp_data[9]) zvel = hittype[i].temp_data[9];
@ -2113,7 +2114,7 @@ void displayweapon(int snum)
{ {
int gun_pos, looking_arc, cw; int gun_pos, looking_arc, cw;
int weapon_xoffset, i, j; int weapon_xoffset, i, j;
int o = 0,pal; int o = 0,pal = 0;
player_struct *p = g_player[snum].ps; player_struct *p = g_player[snum].ps;
short *kb = &p->kickback_pic; short *kb = &p->kickback_pic;
int gs; int gs;
@ -3970,7 +3971,7 @@ void processinput(int snum)
else else
{ {
if (p->footprintcount > 0 && p->on_ground) if (p->footprintcount > 0 && p->on_ground)
if ((sector[p->cursectnum].floorstat&2) != 2) if (p->cursectnum > -1 && (sector[p->cursectnum].floorstat&2) != 2)
{ {
for (j=headspritesect[psect];j>=0;j=nextspritesect[j]) for (j=headspritesect[psect];j>=0;j=nextspritesect[j])
if (sprite[j].picnum == FOOTPRINTS || sprite[j].picnum == FOOTPRINTS2 || sprite[j].picnum == FOOTPRINTS3 || sprite[j].picnum == FOOTPRINTS4) if (sprite[j].picnum == FOOTPRINTS || sprite[j].picnum == FOOTPRINTS2 || sprite[j].picnum == FOOTPRINTS3 || sprite[j].picnum == FOOTPRINTS4)
@ -3980,7 +3981,7 @@ void processinput(int snum)
if (j < 0) if (j < 0)
{ {
p->footprintcount--; p->footprintcount--;
if (sector[p->cursectnum].lotag == 0 && sector[p->cursectnum].hitag == 0) if (p->cursectnum > -1 && sector[p->cursectnum].lotag == 0 && sector[p->cursectnum].hitag == 0)
{ {
switch (TRAND&3) switch (TRAND&3)
{ {

3
polymer/eduke32/source/sector.c
View file

@ -3044,6 +3044,8 @@ CHECKINV1:
{ {
p->inven_icon = 3; p->inven_icon = 3;
if (p->cursectnum > -1)
{
p->holoduke_on = i = p->holoduke_on = i =
EGS(p->cursectnum, EGS(p->cursectnum,
p->posx, p->posx,
@ -3055,6 +3057,7 @@ CHECKINV1:
FTA(47,p); FTA(47,p);
spritesound(TELEPORTER,p->holoduke_on); spritesound(TELEPORTER,p->holoduke_on);
} }
}
else FTA(49,p); else FTA(49,p);
} }
} }

8
polymer/eduke32/source/sounds.c
View file

@ -338,7 +338,7 @@ int xyzsound(int num,int i,int x,int y,int z)
sndist += g_sounds[num].vo; sndist += g_sounds[num].vo;
if (sndist < 0) sndist = 0; if (sndist < 0) sndist = 0;
if (sndist && PN != MUSICANDSFX && !cansee(cx,cy,cz-(24<<8),cs,SX,SY,SZ-(24<<8),SECT)) if (cs > -1 && sndist && PN != MUSICANDSFX && !cansee(cx,cy,cz-(24<<8),cs,SX,SY,SZ-(24<<8),SECT))
sndist += sndist>>5; sndist += sndist>>5;
switch (num) switch (num)
@ -348,11 +348,11 @@ int xyzsound(int num,int i,int x,int y,int z)
case RPG_EXPLODE: case RPG_EXPLODE:
if (sndist > (6144)) if (sndist > (6144))
sndist = 6144; sndist = 6144;
if (sector[g_player[screenpeek].ps->cursectnum].lotag == 2) if (g_player[screenpeek].ps->cursectnum > -1 && sector[g_player[screenpeek].ps->cursectnum].lotag == 2)
pitch -= 1024; pitch -= 1024;
break; break;
default: default:
if (sector[g_player[screenpeek].ps->cursectnum].lotag == 2 && (g_sounds[num].m&4) == 0) if (g_player[screenpeek].ps->cursectnum > -1 && sector[g_player[screenpeek].ps->cursectnum].lotag == 2 && (g_sounds[num].m&4) == 0)
pitch = -768; pitch = -768;
if (sndist > 31444 && PN != MUSICANDSFX) if (sndist > 31444 && PN != MUSICANDSFX)
return -1; return -1;
@ -605,7 +605,7 @@ void pan3dsound(void)
sndist += g_sounds[j].vo; sndist += g_sounds[j].vo;
if (sndist < 0) sndist = 0; if (sndist < 0) sndist = 0;
if (sndist && PN != MUSICANDSFX && !cansee(cx,cy,cz-(24<<8),cs,sx,sy,sz-(24<<8),SECT)) if (cs > -1 && sndist && PN != MUSICANDSFX && !cansee(cx,cy,cz-(24<<8),cs,sx,sy,sz-(24<<8),SECT))
sndist += sndist>>5; sndist += sndist>>5;
if (PN == MUSICANDSFX && SLT < 999) if (PN == MUSICANDSFX && SLT < 999)