OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: cycle_t was still a DWORD and not a QWORD under GCC.

Browse source 
- The stat meters now return an FString instead of sprintfing into a fixed
  output buffer.
- NOASM is now automatically defined when compiling for a non-x86 target.
- Some changes have been made to the integral types in doomtype.h:
  - For consistancy with the other integral types, byte is no longer a
    synonym for BYTE.
  - Most uses of BOOL have been change to the standard C++ bool type. Those
    that weren't were changed to INTBOOL to indicate they may contain values
    other than 0 or 1 but are still used as a boolean.
  - Compiler-provided types with explicit bit sizes are now used. In
    particular, DWORD is no longer a long so it will work with both 64-bit
    Windows and Linux.
  - Since some files need to include Windows headers, uint32 is a synonym
    for the non-Windows version of DWORD.
- Removed d_textur.h. The pic_t struct it defined was used nowhere, and that
  was all it contained.


SVN r326 (trunk)
This commit is contained in:
Randy Heit 2006-09-14 00:02:31 +00:00
commit c412b42703
175 changed files with 1489 additions and 1341 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/m_menu.cpp
View file

@ -120,7 +120,7 @@ static FSaveGameNode *M_RemoveSaveSlot (FSaveGameNode *file);
static void M_ExtractSaveData (const FSaveGameNode *file);
static void M_UnloadSaveData ();
static void M_InsertSaveNode (FSaveGameNode *node);
static BOOL M_SaveLoadResponder (event_t *ev);
static bool M_SaveLoadResponder (event_t *ev);
static void M_DeleteSaveResponse (int choice);
static void M_DrawMainMenu ();
@ -220,7 +220,7 @@ static oldmenu_t *currentMenu; // current menudef
static oldmenu_t *TopLevelMenu; // The main menu everything hangs off of
static DCanvas *FireScreen;
static byte FireRemap[256];
static BYTE FireRemap[256];
static char *genders[3] = { "male", "female", "other" };
static FPlayerClass *PlayerClass;
@ -2297,7 +2297,7 @@ static BYTE smoke[1024] =
static void M_RenderPlayerBackdrop ()
{
byte *from;
BYTE *from;
int width, height, pitch;
width = FireScreen->GetWidth();
@ -2395,7 +2395,7 @@ static void M_DrawPlayerBackdrop (int x, int y)
{
DCanvas *src = FireScreen;
DCanvas *dest = screen;
byte *destline, *srcline;
BYTE *destline, *srcline;
const int destwidth = src->GetWidth() * CleanXfac / 2;
const int destheight = src->GetHeight() * CleanYfac / 2;
const int desty = y;
@ -2688,7 +2688,7 @@ int M_StringHeight (const char *string)
//
// M_Responder
//
BOOL M_Responder (event_t *ev)
bool M_Responder (event_t *ev)
{
int ch;
int i;
@ -2905,7 +2905,7 @@ BOOL M_Responder (event_t *ev)
return (ev->subtype == EV_GUI_KeyDown);
}
BOOL M_SaveLoadResponder (event_t *ev)
bool M_SaveLoadResponder (event_t *ev)
{
char workbuf[512];