Fix a plethora of issues for MSVC builds
Rename MERGECOPY to MERGECOPYSYNC to prevent clobbering of a windows function named that.master
buginator
parent
1169f20b91
commit
4ececd8e49
|
|
@ -532,6 +532,8 @@
|
|||
# include <stdlib.h>
|
||||
# include <crtdbg.h>
|
||||
# endif /* _DEBUG */
|
||||
// Required for alloca
|
||||
# include <malloc.h>
|
||||
# endif /* WZ_CC_* */
|
||||
|
||||
# define WIN32_LEAN_AND_MEAN
|
||||
|
|
@ -542,7 +544,7 @@
|
|||
|
||||
# if defined(WZ_CC_MSVC)
|
||||
// notify people we are disabling these warning messages.
|
||||
# pragma message (" *** Warnings 4018,4100,4127,4204,4244,4267,4389,4800 have been squelched. ***")
|
||||
# pragma message (" *** Warnings 4018,4100,4127,4204,4244,4267,4389,4512,4800 have been squelched. ***")
|
||||
# pragma warning (disable : 4018) // Shut up: '>' : signed/unsigned mismatch
|
||||
# pragma warning (disable : 4100) // Shut up: unreferenced formal parameter (FIXME)
|
||||
# pragma warning (disable : 4127) // Shut up: conditional expression is constant (eg. "while(0)")
|
||||
|
|
@ -551,6 +553,7 @@
|
|||
# pragma warning (disable : 4267) // Shut up: conversion from 'size_t' to 'type', possible loss of data
|
||||
# pragma warning (disable : 4389) // Shut up: '==' : signed/unsigned mismatch
|
||||
# pragma warning (disable : 4800) // Shut up: 'BOOL' : forcing value to bool 'true' or 'false' (performance warning)
|
||||
# pragma warning (disable : 4512) // Shut up: 'class' : assignment operator could not be generated
|
||||
|
||||
# define strcasecmp _stricmp
|
||||
# define strncasecmp _strnicmp
|
||||
|
|
|
|||
|
|
@ -147,10 +147,6 @@
|
|||
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
|
||||
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\dictionary.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\iniparser.cpp"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -149,18 +149,38 @@
|
|||
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
|
||||
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\bitimage.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\GLee.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\imd.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\imdload.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\ivi.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\jpeg_encoder.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\pieblitfunc.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\pieclip.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\piedraw.cpp"
|
||||
>
|
||||
|
|
@ -185,6 +205,10 @@
|
|||
RelativePath=".\piestate.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\png_util.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\rendmode.cpp"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -371,7 +371,7 @@ BOOL recvDroidCheck(NETQUEUE queue)
|
|||
continue; // Can't synch, since we didn't save data to be able to calculate a delta.
|
||||
}
|
||||
|
||||
#define MERGECOPY(x, y, z) if (pc.y != pc2.y) { debug(LOG_SYNC, "Droid %u out of synch, changing "#x" from %"z" to %"z".", pc.droidID, x, pc.y); x = pc.y; }
|
||||
#define MERGECOPYSYNC(x, y, z) if (pc.y != pc2.y) { debug(LOG_SYNC, "Droid %u out of synch, changing "#x" from %"z" to %"z".", pc.droidID, x, pc.y); x = pc.y; }
|
||||
#define MERGEDELTA(x, y, z) if (pc.y != pc2.y) { debug(LOG_SYNC, "Droid %u out of synch, changing "#x" from %"z" to %"z".", pc.droidID, x, x + pc.y - pc2.y); x += pc.y - pc2.y; }
|
||||
// player not synched here...
|
||||
precPos = droidGetPrecisePosition(pD);
|
||||
|
|
@ -445,8 +445,8 @@ BOOL recvDroidCheck(NETQUEUE queue)
|
|||
break; // Don't know what to do, but at least won't be actively breaking anything.
|
||||
}
|
||||
|
||||
MERGECOPY(pD->secondaryOrder, secondaryOrder, "u"); // The old code set this after changing orders, so doing that in case.
|
||||
#undef MERGECOPY
|
||||
MERGECOPYSYNC(pD->secondaryOrder, secondaryOrder, "u"); // The old code set this after changing orders, so doing that in case.
|
||||
#undef MERGECOPYSYNC
|
||||
#undef MERGEDELTA
|
||||
|
||||
syncDebugDroid(pD, '>');
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Warzone2100", "Warzone2100.
|
|||
{C7698ECE-9255-4A60-8091-A9A76E8BE911} = {C7698ECE-9255-4A60-8091-A9A76E8BE911}
|
||||
{EFE011B6-4C0B-40AA-9F18-5AD599E70D28} = {EFE011B6-4C0B-40AA-9F18-5AD599E70D28}
|
||||
{E538D7A9-0660-4979-95F4-80B0C5C11DA7} = {E538D7A9-0660-4979-95F4-80B0C5C11DA7}
|
||||
{F580F567-CE2A-4C58-A036-C1B71664BF2D} = {F580F567-CE2A-4C58-A036-C1B71664BF2D}
|
||||
{30F5FC4A-31F5-42F5-9581-45309559382F} = {30F5FC4A-31F5-42F5-9581-45309559382F}
|
||||
{4D637147-73F9-4A51-944B-34BF78E6C6DC} = {4D637147-73F9-4A51-944B-34BF78E6C6DC}
|
||||
{32FC4941-5ADF-483F-BD90-CDEBC50BA4AE} = {32FC4941-5ADF-483F-BD90-CDEBC50BA4AE}
|
||||
|
|
@ -29,8 +28,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "netplay", "..\lib\netplay\n
|
|||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ivis_opengl", "..\lib\ivis_opengl\ivis_opengl.vcproj", "{4D637147-73F9-4A51-944B-34BF78E6C6DC}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ivis_common", "..\lib\ivis_common\ivis_common.vcproj", "{F580F567-CE2A-4C58-A036-C1B71664BF2D}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamelib", "..\lib\gamelib\gamelib.vcproj", "{EFE011B6-4C0B-40AA-9F18-5AD599E70D28}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "framework", "..\lib\framework\framework.vcproj", "{33979915-684A-4885-BFEA-2A4CCC5A5FD6}"
|
||||
|
|
@ -80,10 +77,6 @@ Global
|
|||
{4D637147-73F9-4A51-944B-34BF78E6C6DC}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{4D637147-73F9-4A51-944B-34BF78E6C6DC}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{4D637147-73F9-4A51-944B-34BF78E6C6DC}.Release|Win32.Build.0 = Release|Win32
|
||||
{F580F567-CE2A-4C58-A036-C1B71664BF2D}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{F580F567-CE2A-4C58-A036-C1B71664BF2D}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{F580F567-CE2A-4C58-A036-C1B71664BF2D}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{F580F567-CE2A-4C58-A036-C1B71664BF2D}.Release|Win32.Build.0 = Release|Win32
|
||||
{EFE011B6-4C0B-40AA-9F18-5AD599E70D28}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{EFE011B6-4C0B-40AA-9F18-5AD599E70D28}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{EFE011B6-4C0B-40AA-9F18-5AD599E70D28}.Release|Win32.ActiveCfg = Release|Win32
|
||||
|
|
|
|||
|
|
@ -247,10 +247,6 @@
|
|||
RelativePath="..\src\ai.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\aiexperience.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\src\astar.cpp"
|
||||
>
|
||||
|
|
|
|||
Loading…
Reference in New Issue