weapons.con.sample:

- hud_orientation now uses proper bitwise operations
 - clean up whitespace

git-svn-id: https://svn.eduke32.com/eduke32@2263 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2012-01-17 04:31:23 +00:00
parent ebb3d0a378
commit ff94311f13

View file

@ -67,13 +67,12 @@ state G_DrawTile
ifvarand hud_orientation 4
addvar hud_angle 1024
ifvarand hud_orientation 2 nullop else
addvar hud_orientation 2
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 nullop else
subvar hud_orientation 2
ifvarand hud_orientation 2
xorvar hud_orientation 2
ifvarand hud_orientation 4
subvar hud_angle 1024
@ -83,13 +82,12 @@ state G_DrawTilePal
ifvarand hud_orientation 4
addvar hud_angle 1024
ifvarand hud_orientation 2 nullop else
addvar hud_orientation 2
orvar hud_orientation 2
rotatesprite hud_x hud_y hud_scale hud_angle hud_tilenum hud_shade hud_pal hud_orientation windowx1 windowy1 windowx2 windowy2
ifvarand hud_orientation 2 nullop else
subvar hud_orientation 2
ifvarand hud_orientation 2
xorvar hud_orientation 2
ifvarand hud_orientation 4
subvar hud_angle 1024
@ -107,7 +105,7 @@ state G_DrawTileScaled
ifvarand hud_orientation 262144
{
setvar hud_G_Draw_temp 160
subvar hud_orientation 262144
xorvar hud_orientation 262144
}
break
endswitch
@ -150,13 +148,12 @@ state G_DrawTileScaled
mulvarvar hud_scale weaponscale
divvar hud_scale 100
ifvarand hud_orientation 2 nullop else
addvar hud_orientation 2
orvar hud_orientation 2
rotatesprite hud_x hud_y hud_scale hud_angle hud_tilenum hud_shade hud_pal hud_orientation windowx1 windowy1 windowx2 windowy2
ifvarand hud_orientation 2 nullop else
subvar hud_orientation 2
ifvarand hud_orientation 2
xorvar hud_orientation 2
ifvarand hud_orientation 4
subvar hud_angle 1024
@ -288,7 +285,7 @@ state draw_shrunk_fists // Shrunk Running Fists
addvar hud_y 200
addvarvar hud_y hud_temp4
addvar hud_orientation 4
orvar hud_orientation 4
state G_DrawTile
@ -460,13 +457,12 @@ state draw_tripbomb // TRIPBOMB_WEAPON:
// relative method
addvar hud_x 22
ifvarand hud_orientation 4 nullop else
addvar hud_orientation 4
orvar hud_orientation 4
state G_DrawWeaponTile
ifvarand hud_orientation 4
subvar hud_orientation 4
xorvar hud_orientation 4
guniqhudid 0
ends
@ -487,8 +483,7 @@ state draw_rpg // RPG_WEAPON:
subvarvar hud_x hud_temp
subvarvar hud_y hud_temp
ifvarand hud_orientation 512 nullop else
addvar hud_orientation 512
orvar hud_orientation 512
addvar hud_x 164
@ -509,7 +504,7 @@ state draw_rpg // RPG_WEAPON:
state G_DrawWeaponTile
ifvarand hud_orientation 512
subvar hud_orientation 512
xorvar hud_orientation 512
ends
state draw_shotgun // SHOTGUN_WEAPON:
@ -851,8 +846,7 @@ state draw_pistol // PISTOL_WEAPON:
}
else
{
ifvarand hud_orientation 512 nullop else
addvar hud_orientation 512
orvar hud_orientation 512
subvarvar hud_temp3 weaponcount
@ -1222,13 +1216,12 @@ state draw_devastator // DEVISTATOR_WEAPON:
addvar hud_y 240
ifvarand hud_orientation 4 nullop else
addvar hud_orientation 4
orvar hud_orientation 4
state G_DrawWeaponTile
ifvarand hud_orientation 4
subvar hud_orientation 4
xorvar hud_orientation 4
guniqhudid 0
}
@ -1248,8 +1241,7 @@ state draw_devastator // DEVISTATOR_WEAPON:
setvar hud_shade -32
ifvarand hud_orientation 4 nullop else
addvar hud_orientation 4
orvar hud_orientation 4
state G_DrawWeaponTile
@ -1264,7 +1256,7 @@ state draw_devastator // DEVISTATOR_WEAPON:
subvarvar hud_tilenum hud_temp3
setvarvar hud_shade gs
ifvarand hud_orientation 4
subvar hud_orientation 4
xorvar hud_orientation 4
guniqhudid currentweapon
@ -1299,13 +1291,12 @@ state draw_devastator // DEVISTATOR_WEAPON:
addvar hud_y 240
ifvarand hud_orientation 4 nullop else
addvar hud_orientation 4
orvar hud_orientation 4
state G_DrawWeaponTile
ifvarand hud_orientation 4
subvar hud_orientation 4
xorvar hud_orientation 4
guniqhudid 0
}
@ -1316,8 +1307,7 @@ state draw_freezer // FREEZE_WEAPON:
setvar hud_tilenum FREEZE
ifvarand hud_orientation 512 nullop else
addvar hud_orientation 512
orvar hud_orientation 512
setvar hud_temp3 0
@ -1379,7 +1369,7 @@ state draw_freezer // FREEZE_WEAPON:
}
ifvarand hud_orientation 512
subvar hud_orientation 512
xorvar hud_orientation 512
ends
state draw_expander // GROW_WEAPON: