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

Blar

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@158 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-05-09 23:55:42 +00:00
parent e1fcaa3d40
commit a8abb5e046
5 changed files with 73 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
polymer/build/src/build.c
View file

@ -529,16 +529,18 @@ void editinput(void)
if (mlook == 1)
{
ang += mousx;
horiz -= (mousy>>1)-1;
ang += mousx>>1;
horiz -= (mousy>>2);
if (horiz > 299)
horiz = 299;
if (horiz < -99)
horiz = -99;
if (mousy && !(mousy>>2))
horiz--;
searchx = xdim>>1;
searchy = ydim>>1;
osearchx = searchx-mousx;
osearchy = searchy-(mousy+mouseysurp);
osearchy = searchy-mousy;
}
else
{
@ -7205,8 +7207,8 @@ void keytimerstuff(void)
if (svel > 0) svel = max(svel-2,0);
if (vel < 0) vel = min(vel+2,0);
if (vel > 0) vel = max(vel-2,0);
if(mlook)
posz -= (horiz-101)*(vel/40);
/* if(mlook)
posz -= (horiz-101)*(vel/40); */
}
void _printmessage16(char name[82])

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

@ -887,7 +887,7 @@ short ifhitbyweapon(short sn)
if( j >= 0 &&
sprite[j].picnum == APLAYER &&
(gametype_flags[ud.coop] & GAMETYPE_FLAG_COOP) &&
(gametype_flags[ud.coop] & GAMETYPE_FLAG_PLAYERSFRIENDLY) &&
ud.ffire == 0 )
return -1;
@ -915,6 +915,13 @@ short ifhitbyweapon(short sn)
ps[p].posyv +=
hittype[sn].extra*(sintable[hittype[sn].ang&2047])<<2;
}
else if(checkspriteflagsp(hittype[sn].picnum,SPRITE_FLAG_PROJECTILE))
{
ps[p].posxv +=
hittype[sn].extra*(sintable[(hittype[sn].ang+512)&2047])<<1;
ps[p].posyv +=
hittype[sn].extra*(sintable[hittype[sn].ang&2047])<<1;
}
switch(dynamictostatic[hittype[sn].picnum])
{

69
polymer/eduke32/source/config.c
View file

@ -197,49 +197,50 @@ void CONFIG_SetDefaults( void )
// JBF 20031211
int32 i,f;
FXDevice = 0;
MusicDevice = 0;
NumVoices = 32;
NumChannels = 2;
NumBits = 16;
MixRate = 44100;
SoundToggle = 1;
MusicToggle = 1;
VoiceToggle = 2;
AmbienceToggle = 1;
FXVolume = 220;
MusicVolume = 200;
ReverseStereo = 0;
myaimmode = ps[0].aim_mode = 1;
ud.mouseaiming = 0;
ud.weaponswitch = 3; // new+empty
AutoAim = 1;
ControllerType = 1;
ud.mouseflip = 1;
ud.runkey_mode = 0;
FXDevice = 0;
FXVolume = 220;
MixRate = 44100;
MouseFilter = 0;
MusicDevice = 0;
MusicToggle = 1;
MusicVolume = 200;
myaimmode = ps[0].aim_mode = 1;
NumBits = 16;
NumChannels = 2;
NumVoices = 32;
ReverseStereo = 0;
RunMode = ud.auto_run = 1;
ud.statusbarscale = 100;
ShowOpponentWeapons = 0;
SoundToggle = 1;
ud.automsg = 0;
ud.autovote = 0;
ud.brightness = 16;
ud.color = 0;
ud.crosshair = 2;
ud.democams = 1;
ud.detail = 1;
ud.drawweapon = 1;
ud.idplayers = 1;
ud.levelstats = 0;
ud.lockout = 0;
ud.m_ffire = 1;
ud.m_marker = 1;
ud.mouseaiming = 0;
ud.mouseflip = 1;
ud.msgdisptime = 120;
ud.pwlockout[0] = '\0';
ud.runkey_mode = 0;
ud.screen_size = 4;
ud.screen_tilting = 1;
ud.shadows = 1;
ud.detail = 1;
ud.lockout = 0;
ud.pwlockout[0] = '\0';
ud.crosshair = 2;
ud.m_marker = 1;
ud.m_ffire = 1;
ud.levelstats = 0;
ud.drawweapon = 1;
ud.democams = 1;
ud.color = 0;
ud.msgdisptime = 120;
ud.brightness = 16;
ud.statusbarmode = 0;
ud.autovote = 0;
ud.automsg = 0;
ud.idplayers = 1;
ud.statusbarscale = 100;
ud.weaponswitch = 3; // new+empty
VoiceToggle = 2;
ShowOpponentWeapons = 0;
Bstrcpy(ud.rtsname, "DUKE.RTS");
Bstrcpy(myname, "Duke");

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

@ -3090,9 +3090,22 @@ cheat_for_port_credits:
gametext(c+160-16,46+16-8,tempbuf,MENUHIGHLIGHT(1),2+8+16);
menutext(c,46+16+16,MENUHIGHLIGHT(2),0,"INPUT FILTER");
bar(c+160+40,46+16+16,(short *)&MouseFilter,4,x==2,MENUHIGHLIGHT(2),0);
l = MouseFilter>>1;
bar(c+160+40,46+16+16,(short *)&l,2,x==2,MENUHIGHLIGHT(2),0);
MouseFilter = l<<1;
menutext(c,46+16+16+16+8,/*(MENUHIGHLIGHT(3))+(MENUHIGHLIGHT(4))+(MENUHIGHLIGHT(5))+(MENUHIGHLIGHT(6))-24*/0,0,"DIGITAL AXES ACTIONS");
if(MouseFilter == 0)
Bsprintf(tempbuf," OFF");
else if(MouseFilter < 48)
Bsprintf(tempbuf," LOW");
else if(MouseFilter < 96)
Bsprintf(tempbuf," MED");
else if(MouseFilter < 128)
Bsprintf(tempbuf,"HIGH");
gametext(c+160-16,46+16+16-8,tempbuf,MENUHIGHLIGHT(2),2+8+16);
menutext(c,46+16+16+16+8,(MENUHIGHLIGHT(3))+(MENUHIGHLIGHT(4))+(MENUHIGHLIGHT(5))+(MENUHIGHLIGHT(6))-24,0,"DIGITAL AXES ACTIONS");
gametext(c+10,90+16,"UP:",MENUHIGHLIGHT(3),2+8+16);
if (MouseDigitalFunctions[1][0] < 0)
@ -3101,7 +3114,7 @@ cheat_for_port_credits:
strcpy(tempbuf, CONFIG_FunctionNumToName(MouseDigitalFunctions[1][0]));
for (i=0;tempbuf[i];i++) if (tempbuf[i]=='_') tempbuf[i] = ' ';
minitext(c+10+60,91+16,tempbuf,0,10+16);
minitextshade(c+10+60,91+16,tempbuf,MENUHIGHLIGHT(3),0,10+16);
gametext(c+10,90+16+10,"DOWN:",MENUHIGHLIGHT(4),2+8+16);
if (MouseDigitalFunctions[1][1] < 0)
@ -3110,7 +3123,7 @@ cheat_for_port_credits:
strcpy(tempbuf, CONFIG_FunctionNumToName(MouseDigitalFunctions[1][1]));
for (i=0;tempbuf[i];i++) if (tempbuf[i]=='_') tempbuf[i] = ' ';
minitext(c+10+60,91+16+10,tempbuf,0,10+16);
minitextshade(c+10+60,91+16+10,tempbuf,MENUHIGHLIGHT(4),0,10+16);
gametext(c+10,90+16+10+10,"LEFT:",MENUHIGHLIGHT(5),2+8+16);
if (MouseDigitalFunctions[0][0] < 0)
@ -3119,7 +3132,7 @@ cheat_for_port_credits:
strcpy(tempbuf, CONFIG_FunctionNumToName(MouseDigitalFunctions[0][0]));
for (i=0;tempbuf[i];i++) if (tempbuf[i]=='_') tempbuf[i] = ' ';
minitext(c+10+60,91+16+10+10,tempbuf,0,10+16);
minitextshade(c+10+60,91+16+10+10,tempbuf,MENUHIGHLIGHT(5),0,10+16);
gametext(c+10,90+16+10+10+10,"RIGHT:",MENUHIGHLIGHT(6),2+8+16);
if (MouseDigitalFunctions[0][1] < 0)
@ -3128,7 +3141,7 @@ cheat_for_port_credits:
strcpy(tempbuf, CONFIG_FunctionNumToName(MouseDigitalFunctions[0][1]));
for (i=0;tempbuf[i];i++) if (tempbuf[i]=='_') tempbuf[i] = ' ';
minitext(c+10+60,91+16+10+10+10,tempbuf,0,10+16);
minitextshade(c+10+60,91+16+10+10+10,tempbuf,MENUHIGHLIGHT(6),0,10+16);
break;

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

@ -3453,7 +3453,11 @@ void processinput(short snum)
closedemowrite();
if(s->pal != 1)
{
p->dead_flag = (512-((TRAND&1)<<10)+(TRAND&255)-512)&2047;
if(p->dead_flag == 0)
p->dead_flag++;
}
p->jetpack_on = 0;
p->holoduke_on = -1;