mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-10 14:51:40 +00:00
- Fixed compilation on MinGW.
SVN r1612 (trunk)
This commit is contained in:
parent
4e5d5d0f2e
commit
0a310b9832
4 changed files with 14 additions and 8 deletions
|
@ -1,4 +1,11 @@
|
||||||
May 25, 2009
|
May 26, 2009
|
||||||
|
- Fixed: The Heretic "take weapons" cheat did not remove all the weapons at
|
||||||
|
once. This is because destroying one weapon has a potential to destroy a
|
||||||
|
sister weapon as well. If the sister weapon is the next one in line (as it
|
||||||
|
typically is), it would process that one, not realizing it was no longer
|
||||||
|
part of the inventory, and stop because its Inventory link was NULL.
|
||||||
|
|
||||||
|
May 25, 2009
|
||||||
- Recoverable errors that are caught during the demo loop no longer shut off
|
- Recoverable errors that are caught during the demo loop no longer shut off
|
||||||
the menu.
|
the menu.
|
||||||
- Specifying non-existent directories with -savedir or the save_dir cvar now
|
- Specifying non-existent directories with -savedir or the save_dir cvar now
|
||||||
|
|
|
@ -875,7 +875,7 @@ void P_AutoUseStrifeHealth (player_t *player)
|
||||||
void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage, FName mod, int flags)
|
void P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage, FName mod, int flags)
|
||||||
{
|
{
|
||||||
unsigned ang;
|
unsigned ang;
|
||||||
player_t *player;
|
player_t *player = NULL;
|
||||||
fixed_t thrust;
|
fixed_t thrust;
|
||||||
int temp;
|
int temp;
|
||||||
|
|
||||||
|
|
|
@ -60,9 +60,6 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Compensate for w32api's lack
|
// Compensate for w32api's lack
|
||||||
#ifndef GET_XBUTTON_WPARAM
|
|
||||||
#define GET_XBUTTON_WPARAM(wParam) (HIWORD(wParam))
|
|
||||||
#endif
|
|
||||||
#ifndef WM_WTSSESSION_CHANGE
|
#ifndef WM_WTSSESSION_CHANGE
|
||||||
#define WM_WTSSESSION_CHANGE 0x02B1
|
#define WM_WTSSESSION_CHANGE 0x02B1
|
||||||
#define WTS_CONSOLE_CONNECT 1
|
#define WTS_CONSOLE_CONNECT 1
|
||||||
|
@ -70,9 +67,6 @@
|
||||||
#define WTS_SESSION_LOCK 7
|
#define WTS_SESSION_LOCK 7
|
||||||
#define WTS_SESSION_UNLOCK 8
|
#define WTS_SESSION_UNLOCK 8
|
||||||
#endif
|
#endif
|
||||||
#ifndef SetClassLongPtr
|
|
||||||
#define SetClassLongPtr SetClassLong
|
|
||||||
#endif
|
|
||||||
#ifndef PBT_APMSUSPEND
|
#ifndef PBT_APMSUSPEND
|
||||||
// w32api does not #define the PBT_ macros in winuser.h like the PSDK does
|
// w32api does not #define the PBT_ macros in winuser.h like the PSDK does
|
||||||
#include <pbt.h>
|
#include <pbt.h>
|
||||||
|
|
|
@ -27,6 +27,11 @@
|
||||||
|
|
||||||
#define DINPUT_BUFFERSIZE 32
|
#define DINPUT_BUFFERSIZE 32
|
||||||
|
|
||||||
|
// Compensate for w32api's lack
|
||||||
|
#ifndef GET_XBUTTON_WPARAM
|
||||||
|
#define GET_XBUTTON_WPARAM(wParam) (HIWORD(wParam))
|
||||||
|
#endif
|
||||||
|
|
||||||
// TYPES -------------------------------------------------------------------
|
// TYPES -------------------------------------------------------------------
|
||||||
|
|
||||||
class FRawMouse : public FMouse
|
class FRawMouse : public FMouse
|
||||||
|
|
Loading…
Reference in a new issue