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

weapons.con.sample: Update to use the hudpal member so that fogpals and custom makepalookup definitions display properly.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5102 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-03-27 12:30:09 +00:00
parent f347a52e24
commit 5c5019d9d8
1 changed files with 9 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
polymer/eduke32/package/sdk/samples/weapons.con.sample
View file

@ -57,27 +57,6 @@ gamevar playerid 0 1
// preliminary functions // preliminary functions
state G_DrawTile
getplayer[THISACTOR].cursectnum hud_G_Draw_temp2
ifvarg hud_G_Draw_temp2 -1
getsector[hud_G_Draw_temp2].floorpal hud_G_Draw_temp2
else
setvar hud_G_Draw_temp2 0
ifvarand hud_orientation 4
addvar hud_angle 1024
orvar hud_orientation 2
rotatesprite hud_x hud_y hud_scale hud_angle hud_tilenum hud_shade hud_G_Draw_temp2 hud_orientation windowx1 windowy1 windowx2 windowy2
ifvarand hud_orientation 2
xorvar hud_orientation 2
ifvarand hud_orientation 4
subvar hud_angle 1024
ends
state G_DrawTilePal state G_DrawTilePal
ifvarand hud_orientation 4 ifvarand hud_orientation 4
addvar hud_angle 1024 addvar hud_angle 1024
@ -283,7 +262,7 @@ state draw_shrunk_fists // Shrunk Running Fists
setvar hud_tilenum FIST setvar hud_tilenum FIST
state G_DrawTile state G_DrawTilePal
// cleanup // cleanup
subvar hud_x 250 subvar hud_x 250
@ -300,7 +279,7 @@ state draw_shrunk_fists // Shrunk Running Fists
orvar hud_orientation 4 orvar hud_orientation 4
state G_DrawTile state G_DrawTilePal
// cleanup // cleanup
setvar hud_orientation 0 setvar hud_orientation 0
@ -317,15 +296,9 @@ state draw_quick_kick // Quick Kick
ifvarn player[THISACTOR].last_quick_kick 0 setvar hud_temp2 1 ifvarn player[THISACTOR].last_quick_kick 0 setvar hud_temp2 1
ifvare hud_temp2 1 ifvare hud_temp2 1
{ {
getactor[playerid].pal hud_pal getplayer[THISACTOR].hudpal hud_pal
ifvarn hud_pal 1
{
getplayer[THISACTOR].cursectnum hud_temp2
ifvarg hud_temp2 -1
getsector[hud_temp2].floorpal hud_pal
ifvare hud_pal 0 ifvare hud_pal 0
getplayer[THISACTOR].palookup hud_pal getplayer[THISACTOR].palookup hud_pal
}
guniqhudid 100 guniqhudid 100
@ -372,15 +345,8 @@ state draw_kick // KNEE_WEAPON:
state reset_hud_weapon_coordinates state reset_hud_weapon_coordinates
getactor[playerid].pal hud_pal
ifvarn hud_pal 1
{
getplayer[THISACTOR].cursectnum hud_temp2
ifvarg hud_temp2 -1
getsector[hud_temp2].floorpal hud_pal
ifvare hud_pal 0 ifvare hud_pal 0
getplayer[THISACTOR].palookup hud_pal getplayer[THISACTOR].palookup hud_pal
}
setvar hud_tilenum KNEE setvar hud_tilenum KNEE
@ -1679,21 +1645,13 @@ onevent EVENT_DISPLAYWEAPON // P_DisplayWeapon
setvar hud_angle 0 setvar hud_angle 0
guniqhudid 0 guniqhudid 0
getplayer[THISACTOR].hudpal hud_pal
getactor[playerid].xrepeat hud_temp getactor[playerid].xrepeat hud_temp
ifvarl hud_temp 40 ifvarl hud_temp 40
state draw_shrunk_fists state draw_shrunk_fists
else else
{ {
getactor[playerid].pal hud_pal
ifvarn hud_pal 1
{
getplayer[THISACTOR].cursectnum hud_temp2
ifvarg hud_temp2 -1
getsector[hud_temp2].floorpal hud_pal
else
setvar hud_pal 0
}
switch currentweapon switch currentweapon
case KNEE_WEAPON case KNEE_WEAPON
setvarvar hud_totaltime WEAPON0_TOTALTIME setvarvar hud_totaltime WEAPON0_TOTALTIME