- Assembly code is disabled when building with __APPLE__ defined, for now.
- If you aren't targeting x86, m_fixed.h only includes basicinlines.h now. - Moved x64inlines.h into basicinlines.h. - Replaced uses of __int64 with types from doomtype.h. - The stop console command no longer ends single player games, just the demo that was being recorded. - In C mode, the sc_man parser no longer allows multi-line string constants without using the \ character to preface the newline character. This makes it much easier to diagnose errors where you forget the closing quote of a string. - Fixed: V_BreakLines() added the terminating '\0' to the last line of the input string. - Added font as a parameter to V_BreakLines and removed its keepspace parameter, which was never passed as anything other than the default. SVN r331 (trunk)
This commit is contained in:
parent
73032c2f3d
commit
419724dd02
30 changed files with 327 additions and 565 deletions
|
|
@ -832,7 +832,7 @@ int FWadCollection::CheckNumForName (const char *name, int space)
|
|||
|
||||
while (i != NULL_INDEX)
|
||||
{
|
||||
if (*(__int64 *)&LumpInfo[i].name == *(__int64 *)&uname)
|
||||
if (*(QWORD *)&LumpInfo[i].name == *(QWORD *)&uname)
|
||||
{
|
||||
if (LumpInfo[i].namespc == space) break;
|
||||
// If the lump is from one of the special namespaces exclusive to Zips
|
||||
|
|
@ -864,7 +864,7 @@ int FWadCollection::CheckNumForName (const char *name, int space, int wadnum)
|
|||
i = FirstLumpIndex[LumpNameHash (uname) % NumLumps];
|
||||
|
||||
while (i != NULL_INDEX &&
|
||||
(*(__int64 *)&LumpInfo[i].name != *(__int64 *)&uname ||
|
||||
(*(QWORD *)&LumpInfo[i].name != *(QWORD *)&uname ||
|
||||
LumpInfo[i].namespc != space ||
|
||||
LumpInfo[i].wadnum != wadnum))
|
||||
{
|
||||
|
|
@ -1520,7 +1520,7 @@ int FWadCollection::FindLump (const char *name, int *lastlump, bool anyns)
|
|||
while (lump_p < &LumpInfo[NumLumps])
|
||||
{
|
||||
if ((anyns || lump_p->namespc == ns_global) &&
|
||||
*(__int64 *)&lump_p->name == *(__int64 *)&name8)
|
||||
*(QWORD *)&lump_p->name == *(QWORD *)&name8)
|
||||
{
|
||||
int lump = lump_p - &LumpInfo[0];
|
||||
*lastlump = lump + 1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue