mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-29 13:00:43 +00:00
- got rid of MODE_TYPE since this will be handled in the backend in the future.
This commit is contained in:
parent
61f5247b71
commit
902fbf6f5d
6 changed files with 5 additions and 4 deletions
|
@ -206,3 +206,4 @@ bool UIActive();
|
||||||
void updatePauseStatus();
|
void updatePauseStatus();
|
||||||
void updatePauseStatus(bool state, bool multiplayer);
|
void updatePauseStatus(bool state, bool multiplayer);
|
||||||
extern int paused;
|
extern int paused;
|
||||||
|
extern int chatmodeon;
|
||||||
|
|
|
@ -486,7 +486,6 @@ enum gamemode_t {
|
||||||
MODE_DEMO = 0x00000002,
|
MODE_DEMO = 0x00000002,
|
||||||
MODE_GAME = 0x00000004,
|
MODE_GAME = 0x00000004,
|
||||||
MODE_EOL = 0x00000008,
|
MODE_EOL = 0x00000008,
|
||||||
MODE_TYPE = 0x00000010,
|
|
||||||
MODE_RESTART = 0x00000020,
|
MODE_RESTART = 0x00000020,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -39,6 +39,7 @@ Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
#include "names.h"
|
#include "names.h"
|
||||||
#include "mapinfo.h"
|
#include "mapinfo.h"
|
||||||
|
#include "gamestate.h"
|
||||||
#include "../../glbackend/glbackend.h"
|
#include "../../glbackend/glbackend.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -295,7 +295,7 @@ void setdrugmode(player_struct *p, int oyrepeat)
|
||||||
{
|
{
|
||||||
if (playrunning())
|
if (playrunning())
|
||||||
{
|
{
|
||||||
if (p->DrugMode > 0 && !(p->gm & MODE_TYPE))
|
if (p->DrugMode > 0)
|
||||||
{
|
{
|
||||||
int var_8c;
|
int var_8c;
|
||||||
if (p->drug_stat[0] == 0)
|
if (p->drug_stat[0] == 0)
|
||||||
|
|
|
@ -1518,7 +1518,7 @@ void checksectors_d(int snum)
|
||||||
|
|
||||||
//After this point the the player effects the map with space
|
//After this point the the player effects the map with space
|
||||||
|
|
||||||
if (p->gm & MODE_TYPE || sprite[p->i].extra <= 0) return;
|
if (chatmodeon || sprite[p->i].extra <= 0) return;
|
||||||
|
|
||||||
if (ud.cashman && PlayerInput(snum, SKB_OPEN))
|
if (ud.cashman && PlayerInput(snum, SKB_OPEN))
|
||||||
fi.lotsofmoney(&sprite[p->i], 2);
|
fi.lotsofmoney(&sprite[p->i], 2);
|
||||||
|
|
|
@ -2477,7 +2477,7 @@ void checksectors_r(int snum)
|
||||||
|
|
||||||
//After this point the the player effects the map with space
|
//After this point the the player effects the map with space
|
||||||
|
|
||||||
if (p->gm & MODE_TYPE || sprite[p->i].extra <= 0) return;
|
if (chatmodeon || sprite[p->i].extra <= 0) return;
|
||||||
|
|
||||||
if (ud.cashman && PlayerInput(snum, SKB_OPEN))
|
if (ud.cashman && PlayerInput(snum, SKB_OPEN))
|
||||||
fi.lotsofmoney(&sprite[p->i], 2);
|
fi.lotsofmoney(&sprite[p->i], 2);
|
||||||
|
|
Loading…
Reference in a new issue