- Fixed: cycle_t was still a DWORD and not a QWORD under GCC.
- 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:
parent
06630b0fee
commit
c412b42703
175 changed files with 1489 additions and 1341 deletions
|
|
@ -354,7 +354,7 @@ bool DCajunMaster::SpawnBot (const char *name, int color)
|
|||
|
||||
void DCajunMaster::DoAddBot (int bnum, char *info)
|
||||
{
|
||||
byte *infob = (byte *)info;
|
||||
BYTE *infob = (BYTE *)info;
|
||||
D_ReadUserInfoStrings (bnum, &infob, false);
|
||||
if (!deathmatch && playerstarts[bnum].type == 0)
|
||||
{
|
||||
|
|
@ -646,10 +646,12 @@ bool DCajunMaster::LoadBots ()
|
|||
return true;
|
||||
}
|
||||
|
||||
ADD_STAT (bots, out)
|
||||
ADD_STAT (bots)
|
||||
{
|
||||
sprintf (out, "think = %04.1f ms support = %04.1f ms wtg = %lu",
|
||||
FString out;
|
||||
out.Format ("think = %04.1f ms support = %04.1f ms wtg = %llu",
|
||||
(double)BotThinkCycles * 1000 * SecondsPerCycle,
|
||||
(double)BotSupportCycles * 1000 * SecondsPerCycle,
|
||||
BotWTG);
|
||||
return out;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue