zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-05 21:30:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- palette stuff, input functions corrected.

Browse source
This commit is contained in:
Christoph Oelckers 2020-07-03 16:17:37 +02:00
parent 4fbd476b17
commit 7f96d182b7
9 changed files with 21 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/duke/src/global.h
View file

@ -382,12 +382,12 @@ inline int PlayerInputBits(int pl, int bits)
return (g_player[pl].input->bits & bits); return (g_player[pl].input->bits & bits);
} }
inline bool PlayerInputSideVel(int pl) inline int PlayerInputSideVel(int pl)
{ {
return g_player[pl].input->svel; return g_player[pl].input->svel;
} }
inline bool PlayerInputForwardVel(int pl) inline int PlayerInputForwardVel(int pl)
{ {
return g_player[pl].input->fvel; return g_player[pl].input->fvel;
} }

15
source/games/duke/src/player.cpp
View file

@ -40,18 +40,21 @@ BEGIN_DUKE_NS
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// //
// setpal // why is this such a mess?
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void setpal_(struct player_struct* p) // cannot be activated yet. void setpal(struct player_struct* p)
{ {
int palette;; int palette;
restorepalette = 1;
if (p->DrugMode) palette = DRUGPAL; if (p->DrugMode) palette = DRUGPAL;
else if (p->heat_on || (sector[p->cursectnum].ceilingpicnum >= TILE_FLOORSLIME && sector[p->cursectnum].ceilingpicnum <= TILE_FLOORSLIME+2)) palette = SLIMEPAL; else if (p->heat_on) palette = SLIMEPAL;
else if (sector[p->cursectnum].lotag == 2) palette = WATERPAL; else if (p->cursectnum < 0) palette = BASEPAL; // don't crash if out of range.
else if (sector[p->cursectnum].ceilingpicnum >= TILE_FLOORSLIME && sector[p->cursectnum].ceilingpicnum <= TILE_FLOORSLIME + 2) palette = SLIMEPAL, ++restorepalette;
else if (sector[p->cursectnum].lotag == ST_2_UNDERWATER) palette = WATERPAL, ++restorepalette;
else palette = BASEPAL; else palette = BASEPAL;
videoSetPalette(palette, 0); p->palette = palette;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

7
source/games/duke/src/player.h
View file

@ -413,12 +413,7 @@ void P_UpdatePosWhenViewingCam(DukePlayer_t *pPlayer);
void P_ProcessInput(int playerNum); void P_ProcessInput(int playerNum);
void P_DHProcessInput(int playerNum); void P_DHProcessInput(int playerNum);
void quickkill(DukePlayer_t* pPlayer); void quickkill(DukePlayer_t* pPlayer);
void P_UpdateScreenPal(DukePlayer_t *pPlayer); void setpal(DukePlayer_t* pPlayer);
inline void setpal(DukePlayer_t* pPlayer)
{
P_UpdateScreenPal(pPlayer);
}
void P_EndLevel(void); void P_EndLevel(void);
void P_CheckWeaponI(int playerNum); void P_CheckWeaponI(int playerNum);
int P_GetOverheadPal(const DukePlayer_t *pPlayer); int P_GetOverheadPal(const DukePlayer_t *pPlayer);

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

@ -1541,6 +1541,7 @@ void checksectors_d(int snum)
if (p->newowner >= 0) if (p->newowner >= 0)
{ {
Printf("%d, %d\n", PlayerInputSideVel(snum), PlayerInputForwardVel(snum));
if (abs(PlayerInputSideVel(snum)) > 768 || abs(PlayerInputForwardVel(snum)) > 768) if (abs(PlayerInputSideVel(snum)) > 768 || abs(PlayerInputForwardVel(snum)) > 768)
{ {
i = -1; i = -1;

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

@ -76,7 +76,6 @@ RECHECK:
ud.recstat = 0; ud.recstat = 0;
//fadepal(0,0,0, 0,252,28); //fadepal(0,0,0, 0,252,28);
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0); // JBF 20040308
drawbackground(); drawbackground();
//M_DisplayMenus(); //M_DisplayMenus();
videoNextPage(); videoNextPage();

12
source/games/duke/src/zz_game.cpp
View file

@ -748,7 +748,7 @@ void G_DrawRooms(int32_t playerNum, int32_t smoothRatio)
{ {
pPlayer->drug_aspect = aspect; pPlayer->drug_aspect = aspect;
} }
P_UpdateScreenPal(pPlayer); setpal(pPlayer);
} }
else if (pPlayer->drug_stat[0] == 3) else if (pPlayer->drug_stat[0] == 3)
{ {
@ -766,7 +766,7 @@ void G_DrawRooms(int32_t playerNum, int32_t smoothRatio)
{ {
pPlayer->drug_aspect = aspect; pPlayer->drug_aspect = aspect;
} }
P_UpdateScreenPal(pPlayer); setpal(pPlayer);
} }
else if (pPlayer->drug_stat[0] == 2) else if (pPlayer->drug_stat[0] == 2)
{ {
@ -779,7 +779,7 @@ void G_DrawRooms(int32_t playerNum, int32_t smoothRatio)
pPlayer->drug_stat[2]++; pPlayer->drug_stat[2]++;
aspect = pPlayer->drug_stat[2] * 500 + viewingRange * 3; aspect = pPlayer->drug_stat[2] * 500 + viewingRange * 3;
pPlayer->drug_aspect = aspect; pPlayer->drug_aspect = aspect;
P_UpdateScreenPal(pPlayer); setpal(pPlayer);
} }
} }
else else
@ -796,7 +796,7 @@ void G_DrawRooms(int32_t playerNum, int32_t smoothRatio)
pPlayer->drug_stat[2]--; pPlayer->drug_stat[2]--;
aspect = pPlayer->drug_stat[2] * 500 + viewingRange * 3; aspect = pPlayer->drug_stat[2] * 500 + viewingRange * 3;
pPlayer->drug_aspect = aspect; pPlayer->drug_aspect = aspect;
P_UpdateScreenPal(pPlayer); setpal(pPlayer);
} }
} }
@ -811,7 +811,7 @@ void G_DrawRooms(int32_t playerNum, int32_t smoothRatio)
renderSetAspect(mulscale16(viewingRange, viewingrange), yxaspect); renderSetAspect(mulscale16(viewingRange, viewingrange), yxaspect);
} }
P_UpdateScreenPal(pPlayer); setpal(pPlayer);
} }
if (pPlayer->newowner < 0) if (pPlayer->newowner < 0)
@ -1621,7 +1621,7 @@ static int G_EndOfLevel(void)
{ {
STAT_Update(ud.eog || (currentLevel->flags & MI_FORCEEOG)); STAT_Update(ud.eog || (currentLevel->flags & MI_FORCEEOG));
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0); P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0);
P_UpdateScreenPal(g_player[myconnectindex].ps); setpal(g_player[myconnectindex].ps);
if (g_player[myconnectindex].ps->gm&MODE_EOL) if (g_player[myconnectindex].ps->gm&MODE_EOL)
{ {

26
source/games/duke/src/zz_player.cpp
View file

@ -45,32 +45,6 @@ void P_AddKills(DukePlayer_t * const pPlayer, uint16_t kills)
pPlayer->actors_killed += kills; pPlayer->actors_killed += kills;
} }
void P_UpdateScreenPal(DukePlayer_t * const pPlayer)
{
int inWater = 0;
int const playerSectnum = pPlayer->cursectnum;
if (pPlayer->DrugMode)
pPlayer->palette = DRUGPAL;
else if (pPlayer->heat_on)
pPlayer->palette = SLIMEPAL;
else if (playerSectnum < 0)
pPlayer->palette = BASEPAL;
else if (sector[playerSectnum].ceilingpicnum >= TILE_FLOORSLIME && sector[playerSectnum].ceilingpicnum <= TILE_FLOORSLIME + 2)
{
pPlayer->palette = SLIMEPAL;
inWater = 1;
}
else
{
pPlayer->palette = (sector[pPlayer->cursectnum].lotag == ST_2_UNDERWATER) ? WATERPAL : BASEPAL;
inWater = 1;
}
restorepalette = 1+inWater;
}
int P_GetOverheadPal(DukePlayer_t const * pPlayer) int P_GetOverheadPal(DukePlayer_t const * pPlayer)
{ {
return sprite[pPlayer->i].pal; return sprite[pPlayer->i].pal;

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

@ -510,7 +510,7 @@ int G_EnterLevel(int gameMode)
//g_player[myconnectindex].ps->palette = palette; //g_player[myconnectindex].ps->palette = palette;
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0); // JBF 20040308 P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0); // JBF 20040308
P_UpdateScreenPal(g_player[myconnectindex].ps); setpal(g_player[myconnectindex].ps);
renderFlushPerms(); renderFlushPerms();
everyothertime = 0; everyothertime = 0;

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

@ -1417,7 +1417,7 @@ static void postloadplayer(int32_t savegamep)
} }
//3 //3
P_UpdateScreenPal(g_player[myconnectindex].ps); setpal(g_player[myconnectindex].ps);
restorepalette = -1; restorepalette = -1;
//4 //4