zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 17:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed the crosshair.

Browse source
This commit is contained in:
Christoph Oelckers 2020-07-24 19:43:33 +02:00
parent c457f1aa8c
commit b9f0e35d4b
11 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/duke/src/animatesprites_d.cpp
View file

@ -96,7 +96,7 @@ void animatesprites_d(int x,int y,int a,int smoothratio)
case BLOODSPLAT2:
case BLOODSPLAT3:
case BLOODSPLAT4:
if(ud.lockout) t->xrepeat = t->yrepeat = 0;
if(adult_lockout) t->xrepeat = t->yrepeat = 0;
else if(t->pal == 6)
{
t->shade = -127;
@ -452,7 +452,7 @@ void animatesprites_d(int x,int y,int a,int smoothratio)
case DUKELEG:
case DUKEGUN:
case DUKETORSO:
if(ud.lockout)
if(adult_lockout)
{
t->xrepeat = t->yrepeat = 0;
continue;

4
source/games/duke/src/animatesprites_r.cpp
View file

@ -75,7 +75,7 @@ void animatesprites_r(int x,int y,int a,int smoothratio)
case BLOODSPLAT2:
case BLOODSPLAT3:
case BLOODSPLAT4:
if(ud.lockout) t->xrepeat = t->yrepeat = 0;
if(adult_lockout) t->xrepeat = t->yrepeat = 0;
else if(t->pal == 6)
{
t->shade = -127;
@ -591,7 +591,7 @@ void animatesprites_r(int x,int y,int a,int smoothratio)
case COOTJIBB:
case COOTJIBC:
stuff:
if(ud.lockout)
if(adult_lockout)
{
t->xrepeat = t->yrepeat = 0;
continue;

4
source/games/duke/src/game_misc.cpp
View file

@ -349,7 +349,7 @@ void displayrest(int smoothratio)
if (isRR()) drawstatusbar_r(screenpeek);
else drawstatusbar_d(screenpeek);
if (ps[myconnectindex].newowner == -1 && ud.overhead_on == 0 && ud.crosshair && ud.camerasprite == -1)
if (ps[myconnectindex].newowner == -1 && ud.overhead_on == 0 && cl_crosshair && ud.camerasprite == -1)
{
int32_t a = TILE_CROSSHAIR;
@ -358,7 +358,7 @@ void displayrest(int smoothratio)
vec2_t crosshairpos = { };
//vec2_t crosshairpos = { ud.returnvar[0], ud.returnvar[1] };
uint32_t crosshair_o = 1 | 2;
double crosshair_scale = cl_crosshairscale * .001;
double crosshair_scale = cl_crosshairscale * .01;
if (isRR()) crosshair_scale *= .5;
DrawTexture(twod, tileGetTexture(a), 160 - (ps[myconnectindex].getlookang() >> 1), 100,

2
source/games/duke/src/input.cpp
View file

@ -270,7 +270,7 @@ void hud_input(int snum)
if (!isRRRA() || sprite[p->i].extra > 0)
{
p->last_pissed_time = 4000;
if (!ud.lockout)
if (!adult_lockout)
spritesound(437, p->i);
if (sprite[p->i].extra <= max_player_health - max_player_health / 10)
{

2
source/games/duke/src/player_r.cpp
View file

@ -1256,7 +1256,7 @@ int doincrements_r(struct player_struct* p)
if (p->drink_amt > 66 && (p->last_pissed_time % 26) == 0)
p->drink_amt--;
if (ud.lockout == 0)
if (adult_lockout == 0)
{
if (p->last_pissed_time == 5662)
spritesound(434, p->i);

1
source/games/duke/src/premap.cpp
View file

@ -950,7 +950,6 @@ int enterlevel(MapRecord *mi, int gamemode)
ud.respawn_inventory = ud.m_respawn_inventory;
ud.monsters_off = ud.m_monsters_off;
ud.coop = ud.m_coop;
ud.marker = ud.m_marker;
ud.ffire = ud.m_ffire;
if ((gamemode & MODE_DEMO) == 0 && ud.recstat == 2)

2
source/games/duke/src/premap_d.cpp
View file

@ -457,7 +457,7 @@ void prelevel_d(int g)
wal->extra = wal->picnum;
animwall[numanimwalls].tag = -1;
if (ud.lockout)
if (adult_lockout)
{
if (wal->picnum == FEMPIC1)
wal->picnum = BLANKSCREEN;

1
source/games/duke/src/savegame.cpp
View file

@ -502,7 +502,6 @@ void GameInterface::SerializeGameState(FSerializer& arc)
ud.m_respawn_inventory = ud.respawn_inventory;
ud.m_monsters_off = ud.monsters_off;
ud.m_coop = ud.coop;
ud.m_marker = ud.marker;
ud.m_ffire = ud.ffire;
if (ps[myconnectindex].over_shoulder_on != 0)
{

2
source/games/duke/src/sectors_d.cpp
View file

@ -1630,7 +1630,7 @@ void checksectors_d(int snum)
case STALL:
if (p->last_pissed_time == 0)
{
if (ud.lockout == 0) spritesound(DUKE_URINATE, p->i);
if (adult_lockout == 0) spritesound(DUKE_URINATE, p->i);
p->last_pissed_time = 26 * 220;
p->transporter_hold = 29 * 2;

2
source/games/duke/src/sectors_r.cpp
View file

@ -2663,7 +2663,7 @@ void checksectors_r(int snum)
case RRTILE2122:
if (p->last_pissed_time == 0)
{
if (ud.lockout == 0) spritesound(435, p->i);
if (adult_lockout == 0) spritesound(435, p->i);
p->last_pissed_time = 26 * 220;
p->transporter_hold = 29 * 2;

6
source/games/duke/src/types.h
View file

@ -69,16 +69,16 @@ struct user_defs
int folfvel, folavel, folx, foly, fola;
int reccnt;
int runkey_mode, statusbarscale, mouseaiming, weaponswitch;
int runkey_mode, statusbarscale, weaponswitch;
int entered_name, shadows, executions, auto_run;
int coords, tickrate, levelstats, m_coop, coop, screen_size, lockout, crosshair;
int coords, tickrate, levelstats, m_coop, coop, screen_size;
int wchoice[MAXPLAYERS][MAX_WEAPONS], playerai;
int respawn_monsters, respawn_items, respawn_inventory, recstat, monsters_off, brightness;
int m_respawn_items, m_respawn_monsters, m_respawn_inventory, m_recstat, m_monsters_off, detail;
int m_ffire, ffire, m_player_skill, multimode;
int player_skill, m_marker, marker, mouseflip;
int player_skill, marker;
int statusbarmode, althud;
MapRecord* nextLevel;